diff --git a/src/_sass/gnome-shell/_common.scss b/src/_sass/gnome-shell/_common.scss
index da516cb..1c20a63 100644
--- a/src/_sass/gnome-shell/_common.scss
+++ b/src/_sass/gnome-shell/_common.scss
@@ -60,7 +60,7 @@ $bubble_button_radius: if($corner_style == 'circular', $circular-radius, $materi
 }
 
 %osd_panel {
-  color: on(dark);
+  color: on($popover);
   background-color: $popover;
   border: none;
   box-shadow: $shell-shadow-z4;
diff --git a/src/_sass/gnome-shell/widgets/_panel.scss b/src/_sass/gnome-shell/widgets/_panel.scss
index f9a99eb..5f76b0a 100644
--- a/src/_sass/gnome-shell/widgets/_panel.scss
+++ b/src/_sass/gnome-shell/widgets/_panel.scss
@@ -96,7 +96,7 @@ $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size +
     // status area icons
     .system-status-icon {
       icon-size: 16px;
-      padding: $space-size * 1.5;
+      padding: $space-size;
       margin: 0 3px;
     }
 
@@ -104,18 +104,23 @@ $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size +
       padding: $space-size * 2;
     }
 
-    .panel-status-menu-box .system-status-icon {
-      margin: 0;
-    }
-
     .panel-status-indicators-box .system-status-icon {
       margin: 0 !important;
       padding: $space-size !important;
     }
 
-    .panel-status-indicators-box,
+    .panel-status-indicators-box {
+      spacing: 0;
+    }
+
     .panel-status-menu-box {
-      spacing: 2px;
+      spacing: $space-size;
+      padding: $space-size;
+
+      .system-status-icon {
+        margin: 0;
+        padding: 0;
+      }
     }
 
     // spacing between power icon and (optional) percentage label
@@ -176,6 +181,11 @@ $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size +
     padding: 0 !important;
     -natural-hpadding: $space-size / 2 !important;
     -minimum-hpadding: $space-size / 2 !important;
+
+    .panel-status-menu-box {
+      spacing: 0;
+      padding: 0;
+    }
   }
 
   Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button,
@@ -224,8 +234,13 @@ $panel_height: if($panel_style == 'compact', $medium-size - 2px, $medium-size +
 
   Gjs_status_keyboard_InputSourceIndicator.panel-button,
   Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-    -natural-hpadding: $space-size * 2 !important;
-    -minimum-hpadding: $space-size * 2 !important;
+    -natural-hpadding: $space-size * 1.5 !important;
+    -minimum-hpadding: $space-size * 1.5 !important;
+  }
+
+  Gjs_status_accessibility_ATIndicator.panel-button {
+    -natural-hpadding: 3px !important;
+    -minimum-hpadding: 3px !important;
   }
 
   // indicator for active
diff --git a/src/_sass/gnome-shell/widgets/_screenshot.scss b/src/_sass/gnome-shell/widgets/_screenshot.scss
index 58a5401..30ba3c5 100644
--- a/src/_sass/gnome-shell/widgets/_screenshot.scss
+++ b/src/_sass/gnome-shell/widgets/_screenshot.scss
@@ -10,11 +10,13 @@ $screenshot_ui_panel_padding: $space-size * 3;
 $screenshot_ui_shot_cast_margin: 21px;
 $screenshot_ui_panel_border_radius: $material-radius + $screenshot_ui_shot_cast_margin;
 $screenshot_ui_shot_cast_spacing: 3px;
-
 $screenshot_ui_button_red: $error;
 
 .screenshot-ui-panel {
-  @extend %osd_panel;
+  color: on($osd);
+  background-color: $osd;
+  border: none;
+  box-shadow: $shell-shadow-z4;
   border-radius: $screenshot_ui_panel_border_radius;
   padding: $screenshot_ui_panel_padding;
   // Reduce the bottom padding a little to accommodate the large capture button.
@@ -192,7 +194,7 @@ $screenshot_ui_button_red: $error;
 }
 
 .screenshot-ui-tooltip {
-  color: on(dark);
+  color: on($system);
   background-color: $system;
   border-radius: $circular-radius;
   padding: $space-size $space-size * 2;
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 246c655..63d32b4 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
@@ -84,7 +84,7 @@ stage {
 }
 
 .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window {
-  color: white;
+  color: rgba(0, 0, 0, 0.87);
   background-color: #FFFFFF;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
@@ -1979,7 +1979,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
-  padding: 6px;
+  padding: 4px;
   margin: 0 3px;
 }
 
@@ -1987,18 +1987,23 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 8px;
 }
 
-#panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0;
-}
-
 #panel .panel-button .panel-status-indicators-box .system-status-icon {
   margin: 0 !important;
   padding: 4px !important;
 }
 
-#panel .panel-button .panel-status-indicators-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 0;
+}
+
 #panel .panel-button .panel-status-menu-box {
-  spacing: 2px;
+  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 {
@@ -2057,6 +2062,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 2px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
+  spacing: 0;
+  padding: 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;
@@ -2102,8 +2114,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 8px !important;
-  -minimum-hpadding: 8px !important;
+  -natural-hpadding: 6px !important;
+  -minimum-hpadding: 6px !important;
+}
+
+#panel Gjs_status_accessibility_ATIndicator.panel-button {
+  -natural-hpadding: 3px !important;
+  -minimum-hpadding: 3px !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 9bae02c..b0695c5 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
@@ -1979,7 +1979,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
-  padding: 6px;
+  padding: 4px;
   margin: 0 3px;
 }
 
@@ -1987,18 +1987,23 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 8px;
 }
 
-#panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0;
-}
-
 #panel .panel-button .panel-status-indicators-box .system-status-icon {
   margin: 0 !important;
   padding: 4px !important;
 }
 
-#panel .panel-button .panel-status-indicators-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 0;
+}
+
 #panel .panel-button .panel-status-menu-box {
-  spacing: 2px;
+  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 {
@@ -2057,6 +2062,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 2px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
+  spacing: 0;
+  padding: 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;
@@ -2102,8 +2114,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 8px !important;
-  -minimum-hpadding: 8px !important;
+  -natural-hpadding: 6px !important;
+  -minimum-hpadding: 6px !important;
+}
+
+#panel Gjs_status_accessibility_ATIndicator.panel-button {
+  -natural-hpadding: 3px !important;
+  -minimum-hpadding: 3px !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 3337554..931b92c 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
@@ -1979,7 +1979,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
-  padding: 9px;
+  padding: 6px;
   margin: 0 3px;
 }
 
@@ -1987,18 +1987,23 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 12px;
 }
 
-#panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0;
-}
-
 #panel .panel-button .panel-status-indicators-box .system-status-icon {
   margin: 0 !important;
   padding: 6px !important;
 }
 
-#panel .panel-button .panel-status-indicators-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 0;
+}
+
 #panel .panel-button .panel-status-menu-box {
-  spacing: 2px;
+  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 {
@@ -2057,6 +2062,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 3px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
+  spacing: 0;
+  padding: 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;
@@ -2102,8 +2114,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 12px !important;
-  -minimum-hpadding: 12px !important;
+  -natural-hpadding: 9px !important;
+  -minimum-hpadding: 9px !important;
+}
+
+#panel Gjs_status_accessibility_ATIndicator.panel-button {
+  -natural-hpadding: 3px !important;
+  -minimum-hpadding: 3px !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 02ffbf8..08b0f67 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -84,7 +84,7 @@ stage {
 }
 
 .workspace-switcher-container, .switcher-list, .resize-popup, .osd-window {
-  color: white;
+  color: rgba(0, 0, 0, 0.87);
   background-color: #FFFFFF;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
@@ -1979,7 +1979,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
-  padding: 9px;
+  padding: 6px;
   margin: 0 3px;
 }
 
@@ -1987,18 +1987,23 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 12px;
 }
 
-#panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0;
-}
-
 #panel .panel-button .panel-status-indicators-box .system-status-icon {
   margin: 0 !important;
   padding: 6px !important;
 }
 
-#panel .panel-button .panel-status-indicators-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 0;
+}
+
 #panel .panel-button .panel-status-menu-box {
-  spacing: 2px;
+  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 {
@@ -2057,6 +2062,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 3px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
+  spacing: 0;
+  padding: 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;
@@ -2102,8 +2114,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 12px !important;
-  -minimum-hpadding: 12px !important;
+  -natural-hpadding: 9px !important;
+  -minimum-hpadding: 9px !important;
+}
+
+#panel Gjs_status_accessibility_ATIndicator.panel-button {
+  -natural-hpadding: 3px !important;
+  -minimum-hpadding: 3px !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 5acb25c..5b96b99 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
@@ -137,8 +137,8 @@ stage {
   icon-shadow: none;
 }
 
-.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window {
-  color: white;
+.workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window {
+  color: rgba(0, 0, 0, 0.87);
   background-color: #FFFFFF;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
@@ -2343,7 +2343,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
-  padding: 6px;
+  padding: 4px;
   margin: 0 3px;
 }
 
@@ -2351,18 +2351,23 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 8px;
 }
 
-#panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0;
-}
-
 #panel .panel-button .panel-status-indicators-box .system-status-icon {
   margin: 0 !important;
   padding: 4px !important;
 }
 
-#panel .panel-button .panel-status-indicators-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 0;
+}
+
 #panel .panel-button .panel-status-menu-box {
-  spacing: 2px;
+  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 {
@@ -2421,6 +2426,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 2px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
+  spacing: 0;
+  padding: 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;
@@ -2466,8 +2478,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 8px !important;
-  -minimum-hpadding: 8px !important;
+  -natural-hpadding: 6px !important;
+  -minimum-hpadding: 6px !important;
+}
+
+#panel Gjs_status_accessibility_ATIndicator.panel-button {
+  -natural-hpadding: 3px !important;
+  -minimum-hpadding: 3px !important;
 }
 
 #panel .screencast-indicator,
@@ -3524,6 +3541,10 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .screenshot-ui-panel {
+  color: white;
+  background-color: #212121;
+  border: none;
+  box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
   border-radius: 31px;
   padding: 12px;
   padding-bottom: 6px;
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 455ba46..923d5bc 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
@@ -137,7 +137,7 @@ stage {
   icon-shadow: none;
 }
 
-.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window {
+.workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window {
   color: white;
   background-color: #212121;
   border: none;
@@ -2347,7 +2347,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
-  padding: 6px;
+  padding: 4px;
   margin: 0 3px;
 }
 
@@ -2355,18 +2355,23 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 8px;
 }
 
-#panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0;
-}
-
 #panel .panel-button .panel-status-indicators-box .system-status-icon {
   margin: 0 !important;
   padding: 4px !important;
 }
 
-#panel .panel-button .panel-status-indicators-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 0;
+}
+
 #panel .panel-button .panel-status-menu-box {
-  spacing: 2px;
+  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 {
@@ -2425,6 +2430,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 2px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
+  spacing: 0;
+  padding: 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;
@@ -2470,8 +2482,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 8px !important;
-  -minimum-hpadding: 8px !important;
+  -natural-hpadding: 6px !important;
+  -minimum-hpadding: 6px !important;
+}
+
+#panel Gjs_status_accessibility_ATIndicator.panel-button {
+  -natural-hpadding: 3px !important;
+  -minimum-hpadding: 3px !important;
 }
 
 #panel .screencast-indicator,
@@ -3528,6 +3545,10 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .screenshot-ui-panel {
+  color: white;
+  background-color: #212121;
+  border: none;
+  box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
   border-radius: 31px;
   padding: 12px;
   padding-bottom: 6px;
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 98ccc35..8b617a2 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
@@ -137,7 +137,7 @@ stage {
   icon-shadow: none;
 }
 
-.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window {
+.workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window {
   color: white;
   background-color: #212121;
   border: none;
@@ -2347,7 +2347,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
-  padding: 9px;
+  padding: 6px;
   margin: 0 3px;
 }
 
@@ -2355,18 +2355,23 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 12px;
 }
 
-#panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0;
-}
-
 #panel .panel-button .panel-status-indicators-box .system-status-icon {
   margin: 0 !important;
   padding: 6px !important;
 }
 
-#panel .panel-button .panel-status-indicators-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 0;
+}
+
 #panel .panel-button .panel-status-menu-box {
-  spacing: 2px;
+  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 {
@@ -2425,6 +2430,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 3px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
+  spacing: 0;
+  padding: 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;
@@ -2470,8 +2482,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 12px !important;
-  -minimum-hpadding: 12px !important;
+  -natural-hpadding: 9px !important;
+  -minimum-hpadding: 9px !important;
+}
+
+#panel Gjs_status_accessibility_ATIndicator.panel-button {
+  -natural-hpadding: 3px !important;
+  -minimum-hpadding: 3px !important;
 }
 
 #panel .screencast-indicator,
@@ -3528,6 +3545,10 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .screenshot-ui-panel {
+  color: white;
+  background-color: #212121;
+  border: none;
+  box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
   border-radius: 31px;
   padding: 18px;
   padding-bottom: 12px;
diff --git a/src/gnome-shell/shell-42-0/gnome-shell.css b/src/gnome-shell/shell-42-0/gnome-shell.css
index 8ab896a..c088b18 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell.css
@@ -137,8 +137,8 @@ stage {
   icon-shadow: none;
 }
 
-.screenshot-ui-panel, .workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window {
-  color: white;
+.workspace-switcher-container, .switcher-list, .resize-popup, .osd-monitor-label, .osd-window {
+  color: rgba(0, 0, 0, 0.87);
   background-color: #FFFFFF;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
@@ -2343,7 +2343,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel .panel-button .system-status-icon {
   icon-size: 16px;
-  padding: 9px;
+  padding: 6px;
   margin: 0 3px;
 }
 
@@ -2351,18 +2351,23 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 12px;
 }
 
-#panel .panel-button .panel-status-menu-box .system-status-icon {
-  margin: 0;
-}
-
 #panel .panel-button .panel-status-indicators-box .system-status-icon {
   margin: 0 !important;
   padding: 6px !important;
 }
 
-#panel .panel-button .panel-status-indicators-box,
+#panel .panel-button .panel-status-indicators-box {
+  spacing: 0;
+}
+
 #panel .panel-button .panel-status-menu-box {
-  spacing: 2px;
+  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 {
@@ -2421,6 +2426,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   -minimum-hpadding: 3px !important;
 }
 
+#panel Gjs_arcmenu_arcmenu_com_menuButton_Arc_Menu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button .panel-status-menu-box,
+#panel Gjs_arcmenu_arcmenu_com_menuButton_ArcMenuMenuButton.panel-button .panel-status-menu-box {
+  spacing: 0;
+  padding: 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;
@@ -2466,8 +2478,13 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 
 #panel Gjs_status_keyboard_InputSourceIndicator.panel-button,
 #panel Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button {
-  -natural-hpadding: 12px !important;
-  -minimum-hpadding: 12px !important;
+  -natural-hpadding: 9px !important;
+  -minimum-hpadding: 9px !important;
+}
+
+#panel Gjs_status_accessibility_ATIndicator.panel-button {
+  -natural-hpadding: 3px !important;
+  -minimum-hpadding: 3px !important;
 }
 
 #panel .screencast-indicator,
@@ -3524,6 +3541,10 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .screenshot-ui-panel {
+  color: white;
+  background-color: #212121;
+  border: none;
+  box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
   border-radius: 31px;
   padding: 18px;
   padding-bottom: 12px;