Fix __getIconForBatteryLevel and Tweaks option

Fix __getIconForBatteryLevel that didn't return a normalizedLevel while charging in all cases. Added initial work for Battery & Percentage option