diff --git a/data/theme/gnome-shell-sass/widgets/_panel.scss b/data/theme/gnome-shell-sass/widgets/_panel.scss
index 0f6647066..e751a94b6 100644
--- a/data/theme/gnome-shell-sass/widgets/_panel.scss
+++ b/data/theme/gnome-shell-sass/widgets/_panel.scss
@@ -72,6 +72,12 @@ $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;
diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index 04406e225..f5dc77efc 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -34,12 +34,10 @@ class ATIndicator extends PanelMenu.Button {
     _init() {
         super._init(0.5, _("Accessibility"));
 
-        this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        this._hbox.add_child(new St.Icon({ style_class: 'system-status-icon',
-                                           icon_name: 'preferences-desktop-accessibility-symbolic' }));
-        this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-
-        this.add_child(this._hbox);
+        this.add_child(new St.Icon({
+            style_class: 'single-indicator system-status-icon',
+            icon_name: 'preferences-desktop-accessibility-symbolic',
+        }));
 
         this._a11ySettings = new Gio.Settings({ schema_id: A11Y_SCHEMA });
         this._a11ySettings.connect('changed::%s'.format(KEY_ALWAYS_SHOW), this._queueSyncMenuVisibility.bind(this));
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
index 74c02056f..f79fc5444 100644
--- a/js/ui/status/keyboard.js
+++ b/js/ui/status/keyboard.js
@@ -829,13 +829,8 @@ class InputSourceIndicator extends PanelMenu.Button {
         this._menuItems = {};
         this._indicatorLabels = {};
 
-        this._container = new InputSourceIndicatorContainer();
-
-        this._hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
-        this._hbox.add_child(this._container);
-        this._hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
-
-        this.add_child(this._hbox);
+        this._container = new InputSourceIndicatorContainer({ style_class: 'single-indicator' });
+        this.add_child(this._container);
 
         this._propSeparator = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(this._propSeparator);