diff --git a/src/gtk-3.0/gtk-compact-dark-alt.css b/src/gtk-3.0/gtk-compact-dark-alt.css
index daaf314..548b5a7 100644
--- a/src/gtk-3.0/gtk-compact-dark-alt.css
+++ b/src/gtk-3.0/gtk-compact-dark-alt.css
@@ -5287,7 +5287,7 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
 }
 
diff --git a/src/gtk-3.0/gtk-compact-dark-solid-alt.css b/src/gtk-3.0/gtk-compact-dark-solid-alt.css
index a70df6a..e9f1fd6 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid-alt.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid-alt.css
@@ -5287,7 +5287,7 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
 }
 
diff --git a/src/gtk-3.0/gtk-compact-dark-solid.css b/src/gtk-3.0/gtk-compact-dark-solid.css
index f29e918..f13db03 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid.css
@@ -5287,7 +5287,7 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
 }
 
diff --git a/src/gtk-3.0/gtk-compact-dark.css b/src/gtk-3.0/gtk-compact-dark.css
index c12992a..3bdd230 100644
--- a/src/gtk-3.0/gtk-compact-dark.css
+++ b/src/gtk-3.0/gtk-compact-dark.css
@@ -5287,7 +5287,7 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
 }
 
diff --git a/src/gtk-3.0/gtk-compact-light-alt.css b/src/gtk-3.0/gtk-compact-light-alt.css
index 26a5c72..bb50d25 100644
--- a/src/gtk-3.0/gtk-compact-light-alt.css
+++ b/src/gtk-3.0/gtk-compact-light-alt.css
@@ -5297,10 +5297,8 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
-  border-style: solid;
-  border-width: 1px;
 }
 
 
diff --git a/src/gtk-3.0/gtk-compact-light-solid-alt.css b/src/gtk-3.0/gtk-compact-light-solid-alt.css
index 9a6d5f9..2368c69 100644
--- a/src/gtk-3.0/gtk-compact-light-solid-alt.css
+++ b/src/gtk-3.0/gtk-compact-light-solid-alt.css
@@ -5297,10 +5297,8 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
-  border-style: solid;
-  border-width: 1px;
 }
 
 
diff --git a/src/gtk-3.0/gtk-compact-light-solid.css b/src/gtk-3.0/gtk-compact-light-solid.css
index 78f0298..1a8e3ed 100644
--- a/src/gtk-3.0/gtk-compact-light-solid.css
+++ b/src/gtk-3.0/gtk-compact-light-solid.css
@@ -5297,10 +5297,8 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
-  border-style: solid;
-  border-width: 1px;
 }
 
 
diff --git a/src/gtk-3.0/gtk-compact-light.css b/src/gtk-3.0/gtk-compact-light.css
index 5a2678c..145e467 100644
--- a/src/gtk-3.0/gtk-compact-light.css
+++ b/src/gtk-3.0/gtk-compact-light.css
@@ -5297,10 +5297,8 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
-  border-style: solid;
-  border-width: 1px;
 }
 
 
diff --git a/src/gtk-3.0/gtk-dark-alt.css b/src/gtk-3.0/gtk-dark-alt.css
index 4ddb60a..581f744 100644
--- a/src/gtk-3.0/gtk-dark-alt.css
+++ b/src/gtk-3.0/gtk-dark-alt.css
@@ -5290,7 +5290,7 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
 }
 
diff --git a/src/gtk-3.0/gtk-dark-solid-alt.css b/src/gtk-3.0/gtk-dark-solid-alt.css
index db10b00..f6afc66 100644
--- a/src/gtk-3.0/gtk-dark-solid-alt.css
+++ b/src/gtk-3.0/gtk-dark-solid-alt.css
@@ -5278,7 +5278,7 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
 }
 
diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css
index 45b315b..523589d 100644
--- a/src/gtk-3.0/gtk-dark-solid.css
+++ b/src/gtk-3.0/gtk-dark-solid.css
@@ -5290,7 +5290,7 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
 }
 
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index 4bd3671..2b5f792 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -5290,7 +5290,7 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
 }
 
diff --git a/src/gtk-3.0/gtk-light-alt.css b/src/gtk-3.0/gtk-light-alt.css
index 8c4bc9b..32982e5 100644
--- a/src/gtk-3.0/gtk-light-alt.css
+++ b/src/gtk-3.0/gtk-light-alt.css
@@ -5317,10 +5317,11 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
   border-style: solid;
   border-width: 1px;
+  margin: 0 0 0 -6px;
 }
 
 
diff --git a/src/gtk-3.0/gtk-light-solid-alt.css b/src/gtk-3.0/gtk-light-solid-alt.css
index dd6aa63..64eb2e6 100644
--- a/src/gtk-3.0/gtk-light-solid-alt.css
+++ b/src/gtk-3.0/gtk-light-solid-alt.css
@@ -5317,10 +5317,11 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
   border-style: solid;
   border-width: 1px;
+  margin: 0 0 0 -6px;
 }
 
 
diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css
index d395c84..27d541e 100644
--- a/src/gtk-3.0/gtk-light-solid.css
+++ b/src/gtk-3.0/gtk-light-solid.css
@@ -5317,10 +5317,11 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
   border-style: solid;
   border-width: 1px;
+  margin: 0 0 0 -6px;
 }
 
 
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index 13537e5..bf6143c 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -5317,10 +5317,11 @@ terminal-window notebook > header.top button,
 .nautilus-window headerbar .path-bar-box .path-bar button.image-button.text-button.toggle.budgie-menu-launcher {
   padding-top: 0;
   padding-bottom: 0;
-  margin: 0 0 0 -6px;
+  margin: 0 0 0 -4px;
   border-radius: 0;
   border-style: solid;
   border-width: 1px;
+  margin: 0 0 0 -6px;
 }
 
 
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index a68c305..b378a18 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -34,7 +34,6 @@ terminal-window,
 
 %pathbar_box_button {
   @include button(header-normal);
-
   &:hover { @include button(header-hover); }
   &:active { @include button(header-active); }
   &:checked {
@@ -59,12 +58,13 @@ terminal-window,
         @extend %pathbar_box_button;
         padding-top: 0;
         padding-bottom: 0;
-        margin: 0 0 0 -6px;
+        margin: 0 0 0 -4px;
         border-radius: 0;
 
-        @if $variant == 'light' {
+        @if $variant == 'light' and $compact == 'false' {
           border-style: solid;
           border-width: 1px;
+          margin: 0 0 0 -6px;
         }
       }
 
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index 9850055..1880255 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -1413,10 +1413,12 @@ window.background:not(.csd) > box.vertical > headerbar:not(.titlebar) { // reset
     &.circular-button { @extend button.circular; }
 
     &:backdrop { opacity: 0.7; background-image: none; @if $compact == 'false' { box-shadow: none; } }
+
     &:hover {
       @include button(header-hover);
       transition: $button_transition;
-      }
+    }
+
     &:checked {
       @include button(header-checked);
       background-clip: if($darker=='false' and $variant=='light', border-box, padding-box);
@@ -1424,6 +1426,7 @@ window.background:not(.csd) > box.vertical > headerbar:not(.titlebar) { // reset
       transition-duration: 300ms;
       @if $variant=='light' and $compact == 'true' { box-shadow: none; }
     }
+
     &:active {
       @include button(header-active);
       transition: $button_transition;
@@ -1431,8 +1434,11 @@ window.background:not(.csd) > box.vertical > headerbar:not(.titlebar) { // reset
       background-clip: if($darker=='false' and $variant=='light', border-box, padding-box);
       @if $variant=='light' and $compact == 'true' { box-shadow: none; }
     }
+
     &:disabled { @include button(header-insensitive); }
+
     &:disabled:active, &:disabled:checked { @include button(header-insensitive-active); }
+
 //    &.text-button.image-button label { padding-left: 6px; padding-right: 6px; }
 
     &.flat {
@@ -1449,7 +1455,9 @@ window.background:not(.csd) > box.vertical > headerbar:not(.titlebar) { // reset
       color: $selection_mode_fg;
       background-color: transparentize($selection_mode_fg, 1);
     }
+
     &:hover { background-color: transparentize($selected_fg_color, 0.75); }
+
     &:active, &:checked { @extend %selected-button:active; text-shadow: none; }
 
     &:disabled {
@@ -1470,15 +1478,18 @@ window.background:not(.csd) > box.vertical > headerbar:not(.titlebar) { // reset
 
   %linked_header {
     @extend %linked_header_middle;
+
     &:first-child {
       border-top-left-radius: $bt_radius;
       border-bottom-left-radius: $bt_radius;
     }
+
     &:last-child {
       border-top-right-radius: $bt_radius;
       border-bottom-right-radius: $bt_radius;
       border-right-style: none;
     }
+
     &:only-child {
       border-radius: $bt_radius;
       border-style: none;
@@ -1548,7 +1559,6 @@ window.background:not(.csd) > box.vertical > headerbar:not(.titlebar) { // reset
   // special case for path-bars and stack-switchers
   .linked:not(.vertical):not(.path-bar).stack-switcher,
   .linked:not(.vertical).path-bar {
-
     > button {
       @include button(header-normal);
       &:hover { @include button(header-hover); }