PowerSwitch percentage and icon tweaks
Locker tweaks