diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index 1e13f64..d1084b8 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -64,6 +64,8 @@ $shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
 
     StLabel { padding: 0 2px; }
 
+    .popup-menu-arrow { width: 0; height: 0; } // Remove arrow on panel button
+
     &, &:hover, &:active, &:overview, &:focus, &:checked {
       text-shadow: $panel_asset_shadow;
 
@@ -121,11 +123,11 @@ $shell_panel_bg: if($trans == 'true', $panel_bg, rgba($panel_bg, 0.95));
     // status area icons
     .system-status-icon {
       icon-size: $base_icon_size;
-      padding: $base_padding - 1px;
-      margin: 0 $base_margin;
+      padding: $base_padding $base_padding/2;
+      margin: 0 ($base_margin - 2px);
     }
 
-    .panel-status-indicators-box .system-status-icon,
+    // .panel-status-indicators-box .system-status-icon,
     .panel-status-menu-box .system-status-icon {
       margin: 0;
     }
diff --git a/src/sass/gnome-shell/widgets-3-28/_panel.scss b/src/sass/gnome-shell/widgets-3-28/_panel.scss
index 45bfac1..19a4c04 100644
--- a/src/sass/gnome-shell/widgets-3-28/_panel.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_panel.scss
@@ -4,10 +4,6 @@
     spacing: 0;
   }
 
-  .panel-button {
-    .popup-menu-arrow { width: 0; height: 0; } // Remove arrow on panel button
-  }
-
   .panel-status-indicators-box,
   .panel-status-menu-box {
     spacing: 2px;