diff --git a/containments/panel/package/contents/ui/main.qml b/containments/panel/package/contents/ui/main.qml
index 00df23b0..4b8086d8 100644
--- a/containments/panel/package/contents/ui/main.qml
+++ b/containments/panel/package/contents/ui/main.qml
@@ -137,6 +137,14 @@ Item {
     // indicator providers
     IndicatorProviders.BatteryProvider {
         id: batteryProvider
+
+        readonly property var setting: HomeScreenComponents.QuickSetting {
+            text: i18n("Battery")
+            icon: "battery-full" + (batteryProvider.pluggedIn ? "-charging" : "")
+            enabled: false
+            settingsCommand: "plasma-settings -m kcm_mobile_power"
+        }
+        Component.onCompleted: quickSettings.quickSettingsModel.include(setting)
     }
     IndicatorProviders.BluetoothProvider {
         id: bluetoothProvider
diff --git a/containments/panel/package/contents/ui/quicksettings/SettingsModel.qml b/containments/panel/package/contents/ui/quicksettings/SettingsModel.qml
index 46e7506d..1749ae6a 100644
--- a/containments/panel/package/contents/ui/quicksettings/SettingsModel.qml
+++ b/containments/panel/package/contents/ui/quicksettings/SettingsModel.qml
@@ -79,12 +79,6 @@ HomeScreenComponents.QuickSettingsModel
             nmHandler.enableWwan(!enabledConnections.wwanEnabled)
         }
     }
-    HomeScreenComponents.QuickSetting {
-        text: i18n("Battery")
-        icon: "battery-full"
-        enabled: false
-        settingsCommand: "plasma-settings -m kcm_mobile_power"
-    }
     HomeScreenComponents.QuickSetting {
         text: i18n("Flashlight")
         icon: "flashlight-on"