diff --git a/js/ui/panel.js b/js/ui/panel.js
index 289a90b3d..16e8b6ad9 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -858,9 +858,8 @@ const AggregateMenu = new Lang.Class({
 
         this._indicators.add_child(this._network.indicators);
         this._indicators.add_child(this._bluetooth.indicators);
-        this._indicators.add_child(this._power.indicators);
         this._indicators.add_child(this._volume.indicators);
-        this._indicators.add_child(this._system.indicators);
+        this._indicators.add_child(this._power.indicators);
         this._indicators.add_child(new St.Label({ text: '\u25BE',
                                                   y_expand: true,
                                                   y_align: Clutter.ActorAlign.CENTER }));
diff --git a/js/ui/status/power.js b/js/ui/status/power.js
index f38c0bb3d..bfbc40d80 100644
--- a/js/ui/status/power.js
+++ b/js/ui/status/power.js
@@ -109,10 +109,10 @@ const Indicator = new Lang.Class({
         if (icon) {
             let gicon = Gio.icon_new_for_string(icon);
             this._indicator.gicon = gicon;
-            this._indicator.show();
             this._item.icon.gicon = gicon;
         } else {
-            this._indicator.hide();
+            // If there's no battery, then we use the power icon.
+            this._indicator.icon_name = 'system-shutdown-symbolic';
         }
     },
 
diff --git a/js/ui/status/system.js b/js/ui/status/system.js
index 74ab786d9..a6ad411ff 100644
--- a/js/ui/status/system.js
+++ b/js/ui/status/system.js
@@ -47,8 +47,6 @@ const Indicator = new Lang.Class({
     _init: function() {
         this.parent();
 
-        this._indicator = this.addIndicator(new Gio.ThemedIcon({ name: 'system-shutdown-symbolic' }));
-
         this._screenSaverSettings = new Gio.Settings({ schema: SCREENSAVER_SCHEMA });
         this._lockdownSettings = new Gio.Settings({ schema: LOCKDOWN_SCHEMA });
         this._privacySettings = new Gio.Settings({ schema: PRIVACY_SCHEMA });