diff --git a/src/_sass/gnome-shell/widgets/_panel.scss b/src/_sass/gnome-shell/widgets/_panel.scss
index 5f76b0a..81771ce 100644
--- a/src/_sass/gnome-shell/widgets/_panel.scss
+++ b/src/_sass/gnome-shell/widgets/_panel.scss
@@ -3,6 +3,7 @@
 
 $panel_transition_duration: 250ms; // same as the overview transition duration
 $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size + 2px);
+$panel_button_hpadding: ($panel_height - 16px) / 2;
 
 #panel {
   font-weight: bold;
@@ -50,15 +51,21 @@ $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size +
   .panel-button {
     font-weight: bold;
     color: on($panel-solid);
-    -natural-hpadding: 6px;
-    -minimum-hpadding: 6px;
+    -natural-hpadding: $panel_button_hpadding;
+    -minimum-hpadding: $panel_button_hpadding;
     transition-duration: 150ms;
     border: $space-size / 2 solid transparent;
     border-radius: if($corner_style == 'circular', $circular-radius, $material-radius + $space-size / 2);
     margin: 0;
 
-    &.clock-display .clock {
-      border-radius: if($corner_style == 'circular', $circular-radius, $material-radius + $space-size / 2);
+    &.clock-display {
+      -natural-hpadding: 0 !important;
+      -minimum-hpadding: 0 !important;
+
+      .clock {
+        border-radius: if($corner_style == 'circular', $circular-radius, $material-radius + $space-size / 2);
+        margin: 0 $space-size * 2 !important;
+      }
     }
 
     &:hover {
@@ -97,54 +104,54 @@ $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size +
     .system-status-icon {
       icon-size: 16px;
       padding: $space-size;
-      margin: 0 3px;
+      margin: 0;
     }
 
-    .system-tray-icons {
-      padding: $space-size * 2;
-    }
+    // .appindicator-trayicons-box {
+    //   margin: 0 3px;
+    // }
 
-    .panel-status-indicators-box .system-status-icon {
-      margin: 0 !important;
-      padding: $space-size !important;
-    }
+    // .appindicator-box {
+    //   margin: 0 3px;
+    // }
 
-    .panel-status-indicators-box {
-      spacing: 0;
-    }
+    // .system-tray-icons {
+    //   padding: $space-size;
+    // }
 
-    .panel-status-menu-box {
-      spacing: $space-size;
-      padding: $space-size;
-
-      .system-status-icon {
-        margin: 0;
-        padding: 0;
-      }
-    }
+    // .panel-status-indicators-box {
+    //   spacing: $space-size;
+    //
+    //   .system-status-icon {
+    //     padding: $space-size / 2;
+    //   }
+    // }
 
     // spacing between power icon and (optional) percentage label
-    .power-status.panel-status-indicators-box {
-      spacing: $space-size / 2;
-      padding: 0 $space-size / 2;
-
-      StLabel { margin-right: $space-size / 2; }
-    }
-
-    .appindicator-trayicons-box {
-      margin: 0 6px;
-    }
-
-    .appindicator-box {
-      margin: 0 3px;
-    }
+    // .power-status.panel-status-indicators-box { }
+
+    // .panel-status-menu-box { // indicators and menubutton icons
+    //   spacing: $space-size;
+    //   padding: 0;
+    //   margin: 0;
+    //
+    //   .system-status-icon {
+    //     padding: 0;
+    //   }
+    // }
 
     // app menu icon
     .app-menu-icon {
       -st-icon-style: symbolic;
-      // dimensions of the icon are hardcoded
     }
 
+    // Gjs_ui_panelAppMenuButton.panel-button {
+    //   .panel-status-menu-box {
+    //     spacing: 0;
+    //     padding: 0;
+    //   }
+    // }
+
     &#panelActivities {
       $size_suffix: if($compact == 'true', '-small', '');
       background-image: url("assets/activities#{$size_suffix}.svg");
@@ -185,6 +192,7 @@ $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size +
     .panel-status-menu-box {
       spacing: 0;
       padding: 0;
+      margin: 0;
     }
   }
 
@@ -192,7 +200,7 @@ $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size +
   Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button {
     .arc-menu-icon {
       border-radius: if($corner_style == 'circular', $circular-radius, $material-radius);
-      width: $panel_height - $space-size;
+      width: $panel_height - $space-size + 1px;
       margin: $space-size / 2 0;
 
       &:hover {
@@ -210,7 +218,7 @@ $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size +
   Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button {
     .arcmenu-menu-button {
       border-radius: if($corner_style == 'circular', $circular-radius, $material-radius);
-      width: $panel_height - $space-size;
+      width: $panel_height - $space-size + 1px;
       margin: $space-size / 2 0;
 
       &:hover {
@@ -225,23 +233,19 @@ $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size +
     }
   }
 
-  Gjs_ui_panel_AggregateMenu.panel-button {
-    .system-status-icon {
-      margin: 0 !important;
-      padding: $space-size !important;
-    }
-  }
+  // Gjs_ui_panel_AggregateMenu.panel-button { }
 
-  Gjs_status_keyboard_InputSourceIndicator.panel-button,
-  Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-    -natural-hpadding: $space-size * 1.5 !important;
-    -minimum-hpadding: $space-size * 1.5 !important;
+  // Input indicators
+  Gjs_status_keyboard_InputSourceIndicator.panel-button, // Ibus
+  Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button { // Fcitx
+    -natural-hpadding: $panel_button_hpadding + $space-size !important;
+    -minimum-hpadding: $panel_button_hpadding + $space-size !important;
   }
 
-  Gjs_status_accessibility_ATIndicator.panel-button {
-    -natural-hpadding: 3px !important;
-    -minimum-hpadding: 3px !important;
-  }
+  // Gjs_status_accessibility_ATIndicator.panel-button {
+  //   -natural-hpadding: 3px !important;
+  //   -minimum-hpadding: 3px !important;
+  // }
 
   // indicator for active
   .screencast-indicator,
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
index 63d32b4..8841ae8 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
@@ -1937,16 +1937,22 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button {
   font-weight: bold;
   color: white;
-  -natural-hpadding: 6px;
-  -minimum-hpadding: 6px;
+  -natural-hpadding: 9px;
+  -minimum-hpadding: 9px;
   transition-duration: 150ms;
   border: 2px solid transparent;
   border-radius: 9999px;
   margin: 0;
 }
 
+#panel .panel-button.clock-display {
+  -natural-hpadding: 0 !important;
+  -minimum-hpadding: 0 !important;
+}
+
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
+  margin: 0 8px !important;
 }
 
 #panel .panel-button:hover {
@@ -1980,47 +1986,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
   padding: 4px;
-  margin: 0 3px;
-}
-
-#panel .panel-button .system-tray-icons {
-  padding: 8px;
-}
-
-#panel .panel-button .panel-status-indicators-box .system-status-icon {
-  margin: 0 !important;
-  padding: 4px !important;
-}
-
-#panel .panel-button .panel-status-indicators-box {
-  spacing: 0;
-}
-
-#panel .panel-button .panel-status-menu-box {
-  spacing: 4px;
-  padding: 4px;
-}
-
-#panel .panel-button .panel-status-menu-box .system-status-icon {
   margin: 0;
-  padding: 0;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 2px;
-  padding: 0 2px;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box StLabel {
-  margin-right: 2px;
-}
-
-#panel .panel-button .appindicator-trayicons-box {
-  margin: 0 6px;
-}
-
-#panel .panel-button .appindicator-box {
-  margin: 0 3px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2067,12 +2033,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
   spacing: 0;
   padding: 0;
+  margin: 0;
 }
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .arc-menu-icon,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .arc-menu-icon {
   border-radius: 9999px;
-  width: 30px;
+  width: 31px;
   margin: 2px 0;
 }
 
@@ -2093,7 +2060,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .arcmenu-menu-button {
   border-radius: 9999px;
-  width: 30px;
+  width: 31px;
   margin: 2px 0;
 }
 
@@ -2107,20 +2074,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 !important;
-  padding: 4px !important;
-}
-
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 6px !important;
-  -minimum-hpadding: 6px !important;
-}
-
-#panel Gjs_status_accessibility_ATIndicator.panel-button {
-  -natural-hpadding: 3px !important;
-  -minimum-hpadding: 3px !important;
+  -natural-hpadding: 13px !important;
+  -minimum-hpadding: 13px !important;
 }
 
 #panel .screencast-indicator,
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
index b0695c5..584e54d 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
@@ -1937,16 +1937,22 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button {
   font-weight: bold;
   color: white;
-  -natural-hpadding: 6px;
-  -minimum-hpadding: 6px;
+  -natural-hpadding: 9px;
+  -minimum-hpadding: 9px;
   transition-duration: 150ms;
   border: 2px solid transparent;
   border-radius: 9999px;
   margin: 0;
 }
 
+#panel .panel-button.clock-display {
+  -natural-hpadding: 0 !important;
+  -minimum-hpadding: 0 !important;
+}
+
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
+  margin: 0 8px !important;
 }
 
 #panel .panel-button:hover {
@@ -1980,47 +1986,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
   padding: 4px;
-  margin: 0 3px;
-}
-
-#panel .panel-button .system-tray-icons {
-  padding: 8px;
-}
-
-#panel .panel-button .panel-status-indicators-box .system-status-icon {
-  margin: 0 !important;
-  padding: 4px !important;
-}
-
-#panel .panel-button .panel-status-indicators-box {
-  spacing: 0;
-}
-
-#panel .panel-button .panel-status-menu-box {
-  spacing: 4px;
-  padding: 4px;
-}
-
-#panel .panel-button .panel-status-menu-box .system-status-icon {
   margin: 0;
-  padding: 0;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 2px;
-  padding: 0 2px;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box StLabel {
-  margin-right: 2px;
-}
-
-#panel .panel-button .appindicator-trayicons-box {
-  margin: 0 6px;
-}
-
-#panel .panel-button .appindicator-box {
-  margin: 0 3px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2067,12 +2033,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
   spacing: 0;
   padding: 0;
+  margin: 0;
 }
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .arc-menu-icon,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .arc-menu-icon {
   border-radius: 9999px;
-  width: 30px;
+  width: 31px;
   margin: 2px 0;
 }
 
@@ -2093,7 +2060,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .arcmenu-menu-button {
   border-radius: 9999px;
-  width: 30px;
+  width: 31px;
   margin: 2px 0;
 }
 
@@ -2107,20 +2074,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 !important;
-  padding: 4px !important;
-}
-
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 6px !important;
-  -minimum-hpadding: 6px !important;
-}
-
-#panel Gjs_status_accessibility_ATIndicator.panel-button {
-  -natural-hpadding: 3px !important;
-  -minimum-hpadding: 3px !important;
+  -natural-hpadding: 13px !important;
+  -minimum-hpadding: 13px !important;
 }
 
 #panel .screencast-indicator,
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
index 931b92c..b019c11 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
@@ -1937,16 +1937,22 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button {
   font-weight: bold;
   color: white;
-  -natural-hpadding: 6px;
-  -minimum-hpadding: 6px;
+  -natural-hpadding: 11px;
+  -minimum-hpadding: 11px;
   transition-duration: 150ms;
   border: 3px solid transparent;
   border-radius: 9999px;
   margin: 0;
 }
 
+#panel .panel-button.clock-display {
+  -natural-hpadding: 0 !important;
+  -minimum-hpadding: 0 !important;
+}
+
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
+  margin: 0 12px !important;
 }
 
 #panel .panel-button:hover {
@@ -1980,47 +1986,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
   padding: 6px;
-  margin: 0 3px;
-}
-
-#panel .panel-button .system-tray-icons {
-  padding: 12px;
-}
-
-#panel .panel-button .panel-status-indicators-box .system-status-icon {
-  margin: 0 !important;
-  padding: 6px !important;
-}
-
-#panel .panel-button .panel-status-indicators-box {
-  spacing: 0;
-}
-
-#panel .panel-button .panel-status-menu-box {
-  spacing: 6px;
-  padding: 6px;
-}
-
-#panel .panel-button .panel-status-menu-box .system-status-icon {
   margin: 0;
-  padding: 0;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 3px;
-  padding: 0 3px;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box StLabel {
-  margin-right: 3px;
-}
-
-#panel .panel-button .appindicator-trayicons-box {
-  margin: 0 6px;
-}
-
-#panel .panel-button .appindicator-box {
-  margin: 0 3px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2067,12 +2033,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
   spacing: 0;
   padding: 0;
+  margin: 0;
 }
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .arc-menu-icon,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .arc-menu-icon {
   border-radius: 9999px;
-  width: 32px;
+  width: 33px;
   margin: 3px 0;
 }
 
@@ -2093,7 +2060,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .arcmenu-menu-button {
   border-radius: 9999px;
-  width: 32px;
+  width: 33px;
   margin: 3px 0;
 }
 
@@ -2107,20 +2074,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 !important;
-  padding: 6px !important;
-}
-
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 9px !important;
-  -minimum-hpadding: 9px !important;
-}
-
-#panel Gjs_status_accessibility_ATIndicator.panel-button {
-  -natural-hpadding: 3px !important;
-  -minimum-hpadding: 3px !important;
+  -natural-hpadding: 17px !important;
+  -minimum-hpadding: 17px !important;
 }
 
 #panel .screencast-indicator,
diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css
index 08b0f67..3a61a94 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -1937,16 +1937,22 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button {
   font-weight: bold;
   color: white;
-  -natural-hpadding: 6px;
-  -minimum-hpadding: 6px;
+  -natural-hpadding: 11px;
+  -minimum-hpadding: 11px;
   transition-duration: 150ms;
   border: 3px solid transparent;
   border-radius: 9999px;
   margin: 0;
 }
 
+#panel .panel-button.clock-display {
+  -natural-hpadding: 0 !important;
+  -minimum-hpadding: 0 !important;
+}
+
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
+  margin: 0 12px !important;
 }
 
 #panel .panel-button:hover {
@@ -1980,47 +1986,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
   padding: 6px;
-  margin: 0 3px;
-}
-
-#panel .panel-button .system-tray-icons {
-  padding: 12px;
-}
-
-#panel .panel-button .panel-status-indicators-box .system-status-icon {
-  margin: 0 !important;
-  padding: 6px !important;
-}
-
-#panel .panel-button .panel-status-indicators-box {
-  spacing: 0;
-}
-
-#panel .panel-button .panel-status-menu-box {
-  spacing: 6px;
-  padding: 6px;
-}
-
-#panel .panel-button .panel-status-menu-box .system-status-icon {
   margin: 0;
-  padding: 0;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 3px;
-  padding: 0 3px;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box StLabel {
-  margin-right: 3px;
-}
-
-#panel .panel-button .appindicator-trayicons-box {
-  margin: 0 6px;
-}
-
-#panel .panel-button .appindicator-box {
-  margin: 0 3px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2067,12 +2033,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
   spacing: 0;
   padding: 0;
+  margin: 0;
 }
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .arc-menu-icon,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .arc-menu-icon {
   border-radius: 9999px;
-  width: 32px;
+  width: 33px;
   margin: 3px 0;
 }
 
@@ -2093,7 +2060,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .arcmenu-menu-button {
   border-radius: 9999px;
-  width: 32px;
+  width: 33px;
   margin: 3px 0;
 }
 
@@ -2107,20 +2074,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 !important;
-  padding: 6px !important;
-}
-
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 9px !important;
-  -minimum-hpadding: 9px !important;
-}
-
-#panel Gjs_status_accessibility_ATIndicator.panel-button {
-  -natural-hpadding: 3px !important;
-  -minimum-hpadding: 3px !important;
+  -natural-hpadding: 17px !important;
+  -minimum-hpadding: 17px !important;
 }
 
 #panel .screencast-indicator,
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
index 5b96b99..4f5b93d 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
@@ -2301,16 +2301,22 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button {
   font-weight: bold;
   color: white;
-  -natural-hpadding: 6px;
-  -minimum-hpadding: 6px;
+  -natural-hpadding: 9px;
+  -minimum-hpadding: 9px;
   transition-duration: 150ms;
   border: 2px solid transparent;
   border-radius: 9999px;
   margin: 0;
 }
 
+#panel .panel-button.clock-display {
+  -natural-hpadding: 0 !important;
+  -minimum-hpadding: 0 !important;
+}
+
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
+  margin: 0 8px !important;
 }
 
 #panel .panel-button:hover {
@@ -2344,47 +2350,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
   padding: 4px;
-  margin: 0 3px;
-}
-
-#panel .panel-button .system-tray-icons {
-  padding: 8px;
-}
-
-#panel .panel-button .panel-status-indicators-box .system-status-icon {
-  margin: 0 !important;
-  padding: 4px !important;
-}
-
-#panel .panel-button .panel-status-indicators-box {
-  spacing: 0;
-}
-
-#panel .panel-button .panel-status-menu-box {
-  spacing: 4px;
-  padding: 4px;
-}
-
-#panel .panel-button .panel-status-menu-box .system-status-icon {
   margin: 0;
-  padding: 0;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 2px;
-  padding: 0 2px;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box StLabel {
-  margin-right: 2px;
-}
-
-#panel .panel-button .appindicator-trayicons-box {
-  margin: 0 6px;
-}
-
-#panel .panel-button .appindicator-box {
-  margin: 0 3px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2431,12 +2397,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
   spacing: 0;
   padding: 0;
+  margin: 0;
 }
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .arc-menu-icon,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .arc-menu-icon {
   border-radius: 9999px;
-  width: 30px;
+  width: 31px;
   margin: 2px 0;
 }
 
@@ -2457,7 +2424,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .arcmenu-menu-button {
   border-radius: 9999px;
-  width: 30px;
+  width: 31px;
   margin: 2px 0;
 }
 
@@ -2471,20 +2438,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 !important;
-  padding: 4px !important;
-}
-
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 6px !important;
-  -minimum-hpadding: 6px !important;
-}
-
-#panel Gjs_status_accessibility_ATIndicator.panel-button {
-  -natural-hpadding: 3px !important;
-  -minimum-hpadding: 3px !important;
+  -natural-hpadding: 13px !important;
+  -minimum-hpadding: 13px !important;
 }
 
 #panel .screencast-indicator,
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
index 923d5bc..f9e9e62 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
@@ -2305,16 +2305,22 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button {
   font-weight: bold;
   color: white;
-  -natural-hpadding: 6px;
-  -minimum-hpadding: 6px;
+  -natural-hpadding: 9px;
+  -minimum-hpadding: 9px;
   transition-duration: 150ms;
   border: 2px solid transparent;
   border-radius: 9999px;
   margin: 0;
 }
 
+#panel .panel-button.clock-display {
+  -natural-hpadding: 0 !important;
+  -minimum-hpadding: 0 !important;
+}
+
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
+  margin: 0 8px !important;
 }
 
 #panel .panel-button:hover {
@@ -2348,47 +2354,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
   padding: 4px;
-  margin: 0 3px;
-}
-
-#panel .panel-button .system-tray-icons {
-  padding: 8px;
-}
-
-#panel .panel-button .panel-status-indicators-box .system-status-icon {
-  margin: 0 !important;
-  padding: 4px !important;
-}
-
-#panel .panel-button .panel-status-indicators-box {
-  spacing: 0;
-}
-
-#panel .panel-button .panel-status-menu-box {
-  spacing: 4px;
-  padding: 4px;
-}
-
-#panel .panel-button .panel-status-menu-box .system-status-icon {
   margin: 0;
-  padding: 0;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 2px;
-  padding: 0 2px;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box StLabel {
-  margin-right: 2px;
-}
-
-#panel .panel-button .appindicator-trayicons-box {
-  margin: 0 6px;
-}
-
-#panel .panel-button .appindicator-box {
-  margin: 0 3px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2435,12 +2401,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
   spacing: 0;
   padding: 0;
+  margin: 0;
 }
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .arc-menu-icon,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .arc-menu-icon {
   border-radius: 9999px;
-  width: 30px;
+  width: 31px;
   margin: 2px 0;
 }
 
@@ -2461,7 +2428,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .arcmenu-menu-button {
   border-radius: 9999px;
-  width: 30px;
+  width: 31px;
   margin: 2px 0;
 }
 
@@ -2475,20 +2442,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 !important;
-  padding: 4px !important;
-}
-
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 6px !important;
-  -minimum-hpadding: 6px !important;
-}
-
-#panel Gjs_status_accessibility_ATIndicator.panel-button {
-  -natural-hpadding: 3px !important;
-  -minimum-hpadding: 3px !important;
+  -natural-hpadding: 13px !important;
+  -minimum-hpadding: 13px !important;
 }
 
 #panel .screencast-indicator,
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
index 8b617a2..2480ff6 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
@@ -2305,16 +2305,22 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button {
   font-weight: bold;
   color: white;
-  -natural-hpadding: 6px;
-  -minimum-hpadding: 6px;
+  -natural-hpadding: 11px;
+  -minimum-hpadding: 11px;
   transition-duration: 150ms;
   border: 3px solid transparent;
   border-radius: 9999px;
   margin: 0;
 }
 
+#panel .panel-button.clock-display {
+  -natural-hpadding: 0 !important;
+  -minimum-hpadding: 0 !important;
+}
+
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
+  margin: 0 12px !important;
 }
 
 #panel .panel-button:hover {
@@ -2348,47 +2354,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
   padding: 6px;
-  margin: 0 3px;
-}
-
-#panel .panel-button .system-tray-icons {
-  padding: 12px;
-}
-
-#panel .panel-button .panel-status-indicators-box .system-status-icon {
-  margin: 0 !important;
-  padding: 6px !important;
-}
-
-#panel .panel-button .panel-status-indicators-box {
-  spacing: 0;
-}
-
-#panel .panel-button .panel-status-menu-box {
-  spacing: 6px;
-  padding: 6px;
-}
-
-#panel .panel-button .panel-status-menu-box .system-status-icon {
   margin: 0;
-  padding: 0;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 3px;
-  padding: 0 3px;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box StLabel {
-  margin-right: 3px;
-}
-
-#panel .panel-button .appindicator-trayicons-box {
-  margin: 0 6px;
-}
-
-#panel .panel-button .appindicator-box {
-  margin: 0 3px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2435,12 +2401,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
   spacing: 0;
   padding: 0;
+  margin: 0;
 }
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .arc-menu-icon,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .arc-menu-icon {
   border-radius: 9999px;
-  width: 32px;
+  width: 33px;
   margin: 3px 0;
 }
 
@@ -2461,7 +2428,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .arcmenu-menu-button {
   border-radius: 9999px;
-  width: 32px;
+  width: 33px;
   margin: 3px 0;
 }
 
@@ -2475,20 +2442,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 !important;
-  padding: 6px !important;
-}
-
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 9px !important;
-  -minimum-hpadding: 9px !important;
-}
-
-#panel Gjs_status_accessibility_ATIndicator.panel-button {
-  -natural-hpadding: 3px !important;
-  -minimum-hpadding: 3px !important;
+  -natural-hpadding: 17px !important;
+  -minimum-hpadding: 17px !important;
 }
 
 #panel .screencast-indicator,
diff --git a/src/gnome-shell/shell-42-0/gnome-shell.css b/src/gnome-shell/shell-42-0/gnome-shell.css
index c088b18..0e32cb8 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell.css
@@ -2301,16 +2301,22 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button {
   font-weight: bold;
   color: white;
-  -natural-hpadding: 6px;
-  -minimum-hpadding: 6px;
+  -natural-hpadding: 11px;
+  -minimum-hpadding: 11px;
   transition-duration: 150ms;
   border: 3px solid transparent;
   border-radius: 9999px;
   margin: 0;
 }
 
+#panel .panel-button.clock-display {
+  -natural-hpadding: 0 !important;
+  -minimum-hpadding: 0 !important;
+}
+
 #panel .panel-button.clock-display .clock {
   border-radius: 9999px;
+  margin: 0 12px !important;
 }
 
 #panel .panel-button:hover {
@@ -2344,47 +2350,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
   padding: 6px;
-  margin: 0 3px;
-}
-
-#panel .panel-button .system-tray-icons {
-  padding: 12px;
-}
-
-#panel .panel-button .panel-status-indicators-box .system-status-icon {
-  margin: 0 !important;
-  padding: 6px !important;
-}
-
-#panel .panel-button .panel-status-indicators-box {
-  spacing: 0;
-}
-
-#panel .panel-button .panel-status-menu-box {
-  spacing: 6px;
-  padding: 6px;
-}
-
-#panel .panel-button .panel-status-menu-box .system-status-icon {
   margin: 0;
-  padding: 0;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box {
-  spacing: 3px;
-  padding: 0 3px;
-}
-
-#panel .panel-button .power-status.panel-status-indicators-box StLabel {
-  margin-right: 3px;
-}
-
-#panel .panel-button .appindicator-trayicons-box {
-  margin: 0 6px;
-}
-
-#panel .panel-button .appindicator-box {
-  margin: 0 3px;
 }
 
 #panel .panel-button .app-menu-icon {
@@ -2431,12 +2397,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
   spacing: 0;
   padding: 0;
+  margin: 0;
 }
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .arc-menu-icon,
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .arc-menu-icon {
   border-radius: 9999px;
-  width: 32px;
+  width: 33px;
   margin: 3px 0;
 }
 
@@ -2457,7 +2424,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .arcmenu-menu-button {
   border-radius: 9999px;
-  width: 32px;
+  width: 33px;
   margin: 3px 0;
 }
 
@@ -2471,20 +2438,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   box-shadow: none;
 }
 
-#panel Gjs_ui_panel_AggregateMenu.panel-button .system-status-icon {
-  margin: 0 !important;
-  padding: 6px !important;
-}
-
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 9px !important;
-  -minimum-hpadding: 9px !important;
-}
-
-#panel Gjs_status_accessibility_ATIndicator.panel-button {
-  -natural-hpadding: 3px !important;
-  -minimum-hpadding: 3px !important;
+  -natural-hpadding: 17px !important;
+  -minimum-hpadding: 17px !important;
 }
 
 #panel .screencast-indicator,