Clean up code for picking battery icon from theme
Factor out icon producing in separate class
Added icon preview to batterywatcher config