Re-add some icons, standarize on no spaces between icon and related text
Re-add some icons, standarize on no spaces between icon and related text

Also use last_full_capacity so I know when I need to charge (something I can
control) rather than how old my battery is (something I have less control over).

mikelward/conf,mikelward/conf