[VP, TP] BatteryIndicator refactored