diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss
index e751a94b6..bc526f0fe 100644
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -72,16 +72,16 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
       }
     }
 
-    // single indicator
-    .single-indicator {
-      margin-left: $base_margin + 3px;
-      margin-right: $base_margin + 3px;
-    }
-
     // status area icons
     .system-status-icon {
       icon-size: $base_icon_size;
       padding: $base_padding - 1px;
+      margin: 0 $base_margin;
+    }
+
+    .panel-status-indicators-box .system-status-icon,
+    .panel-status-menu-box .system-status-icon {
+      margin: 0;
     }
 
     // app menu icon
diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index f5dc77efc..a0513f68c 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -35,7 +35,7 @@ class ATIndicator extends PanelMenu.Button {
         super._init(0.5, _("Accessibility"));
 
         this.add_child(new St.Icon({
-            style_class: 'single-indicator system-status-icon',
+            style_class: 'system-status-icon',
             icon_name: 'preferences-desktop-accessibility-symbolic',
         }));
 
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index f79fc5444..e34b60313 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -829,7 +829,7 @@ class InputSourceIndicator extends PanelMenu.Button {
         this._menuItems = {};
         this._indicatorLabels = {};
 
-        this._container = new InputSourceIndicatorContainer({ style_class: 'single-indicator' });
+        this._container = new InputSourceIndicatorContainer({ style_class: 'system-status-icon' });
         this.add_child(this._container);
 
         this._propSeparator = new PopupMenu.PopupSeparatorMenuItem();