diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index c3e86aa..3adf8fa 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -168,8 +168,7 @@ $panel_height: $menuitem_size;
       margin: 0 $base_padding;
     }
 
-    // .panel-status-indicators-box .system-status-icon,
-    .panel-status-menu-box .system-status-icon { margin: 0 0; }
+    .panel-status-menu-box .system-status-icon { margin: 0; }
     .panel-status-menu-box StLabel { padding: 0 0 0 $base_padding / 2; }
 
     .appindicator-trayicons-box { margin: 0 $base_padding; }
@@ -190,7 +189,7 @@ $panel_height: $menuitem_size;
   Gjs_AggregateMenu.panel-button,
   Gjs_ui_panel_AggregateMenu.panel-button {
     .system-status-icon {
-      margin: 0 0 !important;
+      margin: 0 $base_padding / 2 !important;
     }
   }
 
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 20b1d51..c8115c3 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1381,19 +1381,27 @@ modelbutton.flat {
 
   check:first-child,
   radio:first-child { margin-right: 8px; }
-}
 
-modelbutton.flat arrow {
-  background: none;
-  min-width: 16px;
-  min-height: 16px;
-  opacity: 0.3; //dim icon
+  arrow.left, arrow.right {
+    background-color: transparent;
+    background-image: none;
+    min-width: 16px;
+    min-height: 16px;
+    transition: none;
+    color: $alt_fg_color;
+    opacity: 1;
 
-  &:hover, &:selected, &:focus { background: none; }
+    &:hover, &:selected, &:focus {
+      background-color: transparent;
+      background-image: none;
+      transition: none;
+      color: $selected_fg_color;
+    }
 
-  &.left { -gtk-icon-source: -gtk-icontheme("go-previous-symbolic"); }
+    &.left { -gtk-icon-source: -gtk-icontheme("go-previous-symbolic"); }
 
-  &.right { -gtk-icon-source: -gtk-icontheme("go-next-symbolic"); }
+    &.right { -gtk-icon-source: -gtk-icontheme("go-next-symbolic"); }
+  }
 }
 
 %list_button,