Improve battery icon and show when charging.