diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index abfac38..184e768 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1669,8 +1669,8 @@ headerbar {
 
   // Headerbar Switches
   switch {
-    margin-top: $container_padding;
-    margin-bottom: $container_padding;
+    margin-top: ($headerbar_size - 24px) / 2;
+    margin-bottom: ($headerbar_size - 24px) / 2;
 
     &:backdrop { opacity: 0.75; }
   }
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index e400dc1..4dcb2d2 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2098,8 +2098,8 @@ headerbar {
 
   // Headerbar Switches
   switch {
-    margin-top: 0;
-    margin-bottom: 0;
+    margin-top: ($headerbar_size - 24px) / 2;
+    margin-bottom: ($headerbar_size - 24px) / 2;
 
     &:backdrop { opacity: 0.75; }
   }