[VP, TP] refactored BatteryIndicator