diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index 8aecea9..2e22d63 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -26,8 +26,6 @@ $panel_height: $menuitem_size;
 
         .clock {
           border-radius: $bt_radius * 2 !important;
-          padding: 0 $base_padding * 6 !important;
-          spacing: $base_padding * 2 !important;
         }
       }
 
@@ -168,16 +166,26 @@ $panel_height: $menuitem_size;
     .system-status-icon {
       icon-size: $base_icon_size;
       padding: $base_padding;
-      margin: 0 $base_padding;
+      margin: 0;
     }
 
-    .panel-status-menu-box .system-status-icon { margin: 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; }
+    // .appindicator-trayicons-box { margin: 0 $base_padding; }
 
     // .appindicator-box { margin: 0 0; }
 
+    // .panel-status-indicators-box,
+    // .panel-status-menu-box {
+    //   spacing: 2px;
+    // }
+
+    // spacing between power icon and (optional) percentage label
+    // .power-status.panel-status-indicators-box {
+    //   spacing: 0;
+    // }
+
     // app menu icon
     .app-menu-icon {
       -st-icon-style: symbolic;
@@ -216,7 +224,8 @@ $panel_height: $menuitem_size;
   }
 
   Gjs_AggregateMenu.panel-button,
-  Gjs_ui_panel_AggregateMenu.panel-button {
+  Gjs_ui_panel_AggregateMenu.panel-button,
+  Gjs_ui_panel_QuickSettings.panel-button {
     .system-status-icon {
       margin: 0 $base_padding / 2 !important;
     }
@@ -228,6 +237,13 @@ $panel_height: $menuitem_size;
     font-weight: bold !important;
   }
 
+  // Input indicators
+  Gjs_status_keyboard_InputSourceIndicator.panel-button, // Ibus
+  Gjs_appindicatorsupport_rgcjonas_gmail_com_indicatorStatusIcon_AppIndicatorsIndicatorStatusIcon.panel-button { // Fcitx
+    -natural-hpadding: 12px + $base_padding !important;
+    -minimum-hpadding: 12px + $base_padding !important;
+  }
+
   // transparent panel on lock & login screens
   &:overview,
   &.unlock-screen,
@@ -283,16 +299,6 @@ $panel_height: $menuitem_size;
     }
   }
 
-  .panel-status-indicators-box,
-  .panel-status-menu-box {
-    spacing: 2px;
-  }
-
-  // spacing between power icon and (optional) percentage label
-  .power-status.panel-status-indicators-box {
-    spacing: 0;
-  }
-
   // indicator for active
   .screencast-indicator,
   .remote-access-indicator { color: $warning_color; }
diff --git a/src/sass/gtk/apps/_budgie.scss b/src/sass/gtk/apps/_budgie.scss
index 0e8c0c9..38a430d 100644
--- a/src/sass/gtk/apps/_budgie.scss
+++ b/src/sass/gtk/apps/_budgie.scss
@@ -111,7 +111,7 @@ $raven_padding: 8px;
     border: none;
   }
 
-  separator { margin: $container_padding / 2 0; }
+  widget > separator { margin: $container_padding / 2 0; }
 
   border { border: none; }