diff --git a/src/gtk-3.0/gtk-compact-dark-alt.css b/src/gtk-3.0/gtk-compact-dark-alt.css
index 548b5a7..3dcf00e 100644
--- a/src/gtk-3.0/gtk-compact-dark-alt.css
+++ b/src/gtk-3.0/gtk-compact-dark-alt.css
@@ -7457,6 +7457,67 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(255, 255, 255, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  color: rgba(225, 219, 219, 0.8);
+  border: none;
+  background-color: rgba(119, 119, 119, 0.58);
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06), inset 0 0 0 1px rgba(255, 255, 255, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  color: rgba(225, 219, 219, 0.8);
+  border: none;
+  background-color: rgba(119, 119, 119, 0.88);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  border: none;
+  background-color: rgba(119, 119, 119, 0.98);
+  background-image: none;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  border: none;
+  background-color: rgba(132, 132, 132, 0.98);
+  background-image: none;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(225, 219, 219, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -5px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   color: rgba(225, 219, 219, 0.8);
   border: none;
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 e9f1fd6..6aaeb1f 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid-alt.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid-alt.css
@@ -7457,6 +7457,67 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(255, 255, 255, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  color: rgba(225, 219, 219, 0.8);
+  border: none;
+  background-color: rgba(119, 119, 119, 0.6);
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06), inset 0 0 0 1px rgba(255, 255, 255, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  color: rgba(225, 219, 219, 0.8);
+  border: none;
+  background-color: rgba(119, 119, 119, 0.9);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  border: none;
+  background-color: #777777;
+  background-image: none;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  border: none;
+  background-color: #848484;
+  background-image: none;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(225, 219, 219, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -5px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   color: rgba(225, 219, 219, 0.8);
   border: none;
diff --git a/src/gtk-3.0/gtk-compact-dark-solid.css b/src/gtk-3.0/gtk-compact-dark-solid.css
index f13db03..ccb29e7 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid.css
@@ -7457,6 +7457,67 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(255, 255, 255, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  color: rgba(225, 219, 219, 0.8);
+  border: none;
+  background-color: rgba(119, 119, 119, 0.6);
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06), inset 0 0 0 1px rgba(255, 255, 255, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  color: rgba(225, 219, 219, 0.8);
+  border: none;
+  background-color: rgba(119, 119, 119, 0.9);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  border: none;
+  background-color: #777777;
+  background-image: none;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  border: none;
+  background-color: #848484;
+  background-image: none;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(225, 219, 219, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -5px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   color: rgba(225, 219, 219, 0.8);
   border: none;
diff --git a/src/gtk-3.0/gtk-compact-dark.css b/src/gtk-3.0/gtk-compact-dark.css
index 3bdd230..e2d3c52 100644
--- a/src/gtk-3.0/gtk-compact-dark.css
+++ b/src/gtk-3.0/gtk-compact-dark.css
@@ -7457,6 +7457,67 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(255, 255, 255, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  color: rgba(225, 219, 219, 0.8);
+  border: none;
+  background-color: rgba(119, 119, 119, 0.58);
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06), inset 0 0 0 1px rgba(255, 255, 255, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  color: rgba(225, 219, 219, 0.8);
+  border: none;
+  background-color: rgba(119, 119, 119, 0.88);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  border: none;
+  background-color: rgba(119, 119, 119, 0.98);
+  background-image: none;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  border: none;
+  background-color: rgba(132, 132, 132, 0.98);
+  background-image: none;
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(225, 219, 219, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -5px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   color: rgba(225, 219, 219, 0.8);
   border: none;
diff --git a/src/gtk-3.0/gtk-compact-light-alt.css b/src/gtk-3.0/gtk-compact-light-alt.css
index bb50d25..4dfc656 100644
--- a/src/gtk-3.0/gtk-compact-light-alt.css
+++ b/src/gtk-3.0/gtk-compact-light-alt.css
@@ -7463,6 +7463,70 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(0, 0, 0, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(40, 32, 32, 0.8);
+  border: none;
+  background-color: white;
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06), inset 0 0 0 1px rgba(0, 0, 0, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  color: rgba(40, 32, 32, 0.8);
+  border: none;
+  background-color: #fafafa;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  border: none;
+  background-color: #afafaf;
+  background-image: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  border: none;
+  background-color: #686868;
+  background-image: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(40, 32, 32, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -6px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   color: rgba(40, 32, 32, 0.8);
   border: none;
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 2368c69..d088b42 100644
--- a/src/gtk-3.0/gtk-compact-light-solid-alt.css
+++ b/src/gtk-3.0/gtk-compact-light-solid-alt.css
@@ -7463,6 +7463,70 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(0, 0, 0, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(40, 32, 32, 0.8);
+  border: none;
+  background-color: white;
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06), inset 0 0 0 1px rgba(0, 0, 0, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  color: rgba(40, 32, 32, 0.8);
+  border: none;
+  background-color: #fafafa;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  border: none;
+  background-color: #afafaf;
+  background-image: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  border: none;
+  background-color: #686868;
+  background-image: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(40, 32, 32, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -6px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   color: rgba(40, 32, 32, 0.8);
   border: none;
diff --git a/src/gtk-3.0/gtk-compact-light-solid.css b/src/gtk-3.0/gtk-compact-light-solid.css
index 1a8e3ed..4f90875 100644
--- a/src/gtk-3.0/gtk-compact-light-solid.css
+++ b/src/gtk-3.0/gtk-compact-light-solid.css
@@ -7463,6 +7463,70 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(0, 0, 0, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(40, 32, 32, 0.8);
+  border: none;
+  background-color: white;
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06), inset 0 0 0 1px rgba(0, 0, 0, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  color: rgba(40, 32, 32, 0.8);
+  border: none;
+  background-color: #fafafa;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  border: none;
+  background-color: #afafaf;
+  background-image: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  border: none;
+  background-color: #686868;
+  background-image: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(40, 32, 32, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -6px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   color: rgba(40, 32, 32, 0.8);
   border: none;
diff --git a/src/gtk-3.0/gtk-compact-light.css b/src/gtk-3.0/gtk-compact-light.css
index 145e467..56a3753 100644
--- a/src/gtk-3.0/gtk-compact-light.css
+++ b/src/gtk-3.0/gtk-compact-light.css
@@ -7463,6 +7463,70 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(0, 0, 0, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(40, 32, 32, 0.8);
+  border: none;
+  background-color: white;
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06), inset 0 0 0 1px rgba(0, 0, 0, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  color: rgba(40, 32, 32, 0.8);
+  border: none;
+  background-color: #fafafa;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  border: none;
+  background-color: #afafaf;
+  background-image: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  border: none;
+  background-color: #686868;
+  background-image: none;
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(40, 32, 32, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -6px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   color: rgba(40, 32, 32, 0.8);
   border: none;
diff --git a/src/gtk-3.0/gtk-dark-alt.css b/src/gtk-3.0/gtk-dark-alt.css
index 581f744..3622b40 100644
--- a/src/gtk-3.0/gtk-dark-alt.css
+++ b/src/gtk-3.0/gtk-dark-alt.css
@@ -7462,6 +7462,71 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(255, 255, 255, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-color: rgba(255, 255, 255, 0.12);
+  color: rgba(225, 219, 219, 0.8);
+  background-color: rgba(119, 119, 119, 0.58);
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
+  border: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  border-color: rgba(255, 255, 255, 0.12);
+  color: rgba(221, 213, 213, 0.8);
+  background-color: rgba(119, 119, 119, 0.88);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  background-color: rgba(119, 119, 119, 0.98);
+  background-image: none;
+  border-color: rgba(255, 255, 255, 0.12);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  background-color: rgba(132, 132, 132, 0.98);
+  background-image: none;
+  border-color: rgba(255, 255, 255, 0.12);
+  border-top-color: rgba(255, 255, 255, 0.12);
+  border-bottom-color: rgba(255, 255, 255, 0.12);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(225, 219, 219, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -5px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   border-color: rgba(255, 255, 255, 0.12);
   color: rgba(225, 219, 219, 0.8);
diff --git a/src/gtk-3.0/gtk-dark-solid-alt.css b/src/gtk-3.0/gtk-dark-solid-alt.css
index f6afc66..e1bf5cc 100644
--- a/src/gtk-3.0/gtk-dark-solid-alt.css
+++ b/src/gtk-3.0/gtk-dark-solid-alt.css
@@ -7450,6 +7450,71 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(255, 255, 255, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-color: rgba(255, 255, 255, 0.12);
+  color: rgba(225, 219, 219, 0.8);
+  background-color: rgba(119, 119, 119, 0.6);
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
+  border: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  border-color: rgba(255, 255, 255, 0.12);
+  color: rgba(221, 213, 213, 0.8);
+  background-color: rgba(119, 119, 119, 0.9);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  background-color: #777777;
+  background-image: none;
+  border-color: rgba(255, 255, 255, 0.12);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  background-color: #848484;
+  background-image: none;
+  border-color: rgba(255, 255, 255, 0.12);
+  border-top-color: rgba(255, 255, 255, 0.12);
+  border-bottom-color: rgba(255, 255, 255, 0.12);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(225, 219, 219, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -5px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   border-color: rgba(255, 255, 255, 0.12);
   color: rgba(225, 219, 219, 0.8);
diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css
index 523589d..193a464 100644
--- a/src/gtk-3.0/gtk-dark-solid.css
+++ b/src/gtk-3.0/gtk-dark-solid.css
@@ -7462,6 +7462,71 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(255, 255, 255, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-color: rgba(255, 255, 255, 0.12);
+  color: rgba(225, 219, 219, 0.8);
+  background-color: rgba(119, 119, 119, 0.6);
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
+  border: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  border-color: rgba(255, 255, 255, 0.12);
+  color: rgba(221, 213, 213, 0.8);
+  background-color: rgba(119, 119, 119, 0.9);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  background-color: #777777;
+  background-image: none;
+  border-color: rgba(255, 255, 255, 0.12);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  background-color: #848484;
+  background-image: none;
+  border-color: rgba(255, 255, 255, 0.12);
+  border-top-color: rgba(255, 255, 255, 0.12);
+  border-bottom-color: rgba(255, 255, 255, 0.12);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(225, 219, 219, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -5px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   border-color: rgba(255, 255, 255, 0.12);
   color: rgba(225, 219, 219, 0.8);
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index 2b5f792..acf1519 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -7462,6 +7462,71 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(255, 255, 255, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-color: rgba(255, 255, 255, 0.12);
+  color: rgba(225, 219, 219, 0.8);
+  background-color: rgba(119, 119, 119, 0.58);
+  background-image: none;
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
+  border: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  border-color: rgba(255, 255, 255, 0.12);
+  color: rgba(221, 213, 213, 0.8);
+  background-color: rgba(119, 119, 119, 0.88);
+  background-image: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  background-color: rgba(119, 119, 119, 0.98);
+  background-image: none;
+  border-color: rgba(255, 255, 255, 0.12);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  background-color: rgba(132, 132, 132, 0.98);
+  background-image: none;
+  border-color: rgba(255, 255, 255, 0.12);
+  border-top-color: rgba(255, 255, 255, 0.12);
+  border-bottom-color: rgba(255, 255, 255, 0.12);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(225, 219, 219, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -5px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   border-color: rgba(255, 255, 255, 0.12);
   color: rgba(225, 219, 219, 0.8);
diff --git a/src/gtk-3.0/gtk-light-alt.css b/src/gtk-3.0/gtk-light-alt.css
index 32982e5..7359053 100644
--- a/src/gtk-3.0/gtk-light-alt.css
+++ b/src/gtk-3.0/gtk-light-alt.css
@@ -7481,6 +7481,73 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(0, 0, 0, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(0, 0, 0, 0.12);
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(40, 32, 32, 0.8);
+  background-color: white;
+  background-image: linear-gradient(0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(34, 28, 28, 0.8);
+  background-color: #fafafa;
+  background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  background-color: #afafaf;
+  background-image: none;
+  border-color: rgba(0, 0, 0, 0.12);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  background-color: #686868;
+  background-image: linear-gradient(0deg, #656565 0%, #707070 100%);
+  border-color: rgba(0, 0, 0, 0.12);
+  border-top-color: rgba(0, 0, 0, 0.12);
+  border-bottom-color: rgba(0, 0, 0, 0.12);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(40, 32, 32, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -6px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   border-color: rgba(0, 0, 0, 0.12);
   color: rgba(40, 32, 32, 0.8);
diff --git a/src/gtk-3.0/gtk-light-solid-alt.css b/src/gtk-3.0/gtk-light-solid-alt.css
index 64eb2e6..9ff0f18 100644
--- a/src/gtk-3.0/gtk-light-solid-alt.css
+++ b/src/gtk-3.0/gtk-light-solid-alt.css
@@ -7481,6 +7481,73 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(0, 0, 0, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(0, 0, 0, 0.12);
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(40, 32, 32, 0.8);
+  background-color: white;
+  background-image: linear-gradient(0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(34, 28, 28, 0.8);
+  background-color: #fafafa;
+  background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  background-color: #afafaf;
+  background-image: none;
+  border-color: rgba(0, 0, 0, 0.12);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  background-color: #686868;
+  background-image: linear-gradient(0deg, #656565 0%, #707070 100%);
+  border-color: rgba(0, 0, 0, 0.12);
+  border-top-color: rgba(0, 0, 0, 0.12);
+  border-bottom-color: rgba(0, 0, 0, 0.12);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(40, 32, 32, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -6px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   border-color: rgba(0, 0, 0, 0.12);
   color: rgba(40, 32, 32, 0.8);
diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css
index 27d541e..d5dd541 100644
--- a/src/gtk-3.0/gtk-light-solid.css
+++ b/src/gtk-3.0/gtk-light-solid.css
@@ -7481,6 +7481,73 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(0, 0, 0, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(0, 0, 0, 0.12);
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(40, 32, 32, 0.8);
+  background-color: white;
+  background-image: linear-gradient(0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(34, 28, 28, 0.8);
+  background-color: #fafafa;
+  background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  background-color: #afafaf;
+  background-image: none;
+  border-color: rgba(0, 0, 0, 0.12);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  background-color: #686868;
+  background-image: linear-gradient(0deg, #656565 0%, #707070 100%);
+  border-color: rgba(0, 0, 0, 0.12);
+  border-top-color: rgba(0, 0, 0, 0.12);
+  border-bottom-color: rgba(0, 0, 0, 0.12);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(40, 32, 32, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -6px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   border-color: rgba(0, 0, 0, 0.12);
   color: rgba(40, 32, 32, 0.8);
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index bf6143c..12223a9 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -7481,6 +7481,73 @@ window.background.csd > paned.horizontal > scrolledwindow > viewport.frame > box
   background-color: rgba(0, 0, 0, 0.1);
 }
 
+headerbar.titlebar > box.horizontal > entry.pathbar {
+  min-height: 0;
+  padding: 2px 10px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher {
+  margin-top: 6px;
+  margin-bottom: 6px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: rgba(0, 0, 0, 0.12);
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(40, 32, 32, 0.8);
+  background-color: white;
+  background-image: linear-gradient(0deg, #f1f1f1 0%, #fdfdfd 95%, #fefefe 100%);
+  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:not(:checked):not(:active), headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:not(:checked):not(:active), .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:not(:checked):not(:active) {
+  background-clip: padding-box;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:hover, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:hover, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:hover {
+  border-color: rgba(0, 0, 0, 0.12);
+  color: rgba(34, 28, 28, 0.8);
+  background-color: #fafafa;
+  background-image: linear-gradient(0deg, #f8f8f8 0%, #ffffff 100%);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:active, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:active, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:active {
+  color: #ffffff;
+  background-color: #afafaf;
+  background-image: none;
+  border-color: rgba(0, 0, 0, 0.12);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:checked, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:checked, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:checked {
+  color: #ffffff;
+  background-color: #686868;
+  background-image: linear-gradient(0deg, #656565 0%, #707070 100%);
+  border-color: rgba(0, 0, 0, 0.12);
+  border-top-color: rgba(0, 0, 0, 0.12);
+  border-bottom-color: rgba(0, 0, 0, 0.12);
+  text-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  -gtk-icon-shadow: 0 0 1px rgba(0, 0, 0, 0.26), 0 1px 2px rgba(0, 0, 0, 0.32), 0 2px 3px rgba(0, 0, 0, 0.12);
+  box-shadow: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:disabled, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:disabled, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:disabled {
+  color: rgba(40, 32, 32, 0.4);
+}
+
+headerbar.titlebar > button.flat.image-button.toggle:backdrop, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher:backdrop, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher:backdrop {
+  opacity: 0.7;
+  background-image: none;
+}
+
+headerbar.titlebar > button.flat.image-button.toggle + button.flat.image-button.toggle, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.flat.image-button.toggle, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.flat.image-button.toggle, headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.budgie-menu-launcher, headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.flat.launcher + button.image-button.toggle.budgie-menu-launcher, .budgie-panel headerbar.titlebar > button.flat.image-button.toggle + button.image-button.toggle.flat.launcher, .budgie-panel headerbar.titlebar > button.image-button.toggle.budgie-menu-launcher + button.image-button.toggle.flat.launcher {
+  margin-right: -6px;
+}
+
 headerbar.titlebar .linked.raised > button.toggle {
   border-color: rgba(0, 0, 0, 0.12);
   color: rgba(40, 32, 32, 0.8);
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index b378a18..64027f4 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -2281,12 +2281,36 @@ window.background.csd {
 }
 
 headerbar.titlebar {
-  // entry.pathbar { min-height: 0; }
+  > box.horizontal > entry.pathbar {
+    min-height: 0;
+    padding: 2px 10px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+  }
 
-  // button.flat.image-button.toggle {
-  //   margin-top: 9px;
-  //   margin-bottom: 10px;
-  // }
+  > button.flat.image-button.toggle {
+    margin-top: 6px;
+    margin-bottom: 6px;
+
+    &:not(:checked):not(:active) {
+      background-clip: if($variant=='light', padding-box, padding-box);
+    }
+
+    @if $variant == 'light' {
+      border-width: 1px;
+      border-style: solid;
+      border-color: $borders_color;
+    }
+
+    @include button(header-normal);
+    &:hover { @include button(header-hover); }
+    &:active { @include button(header-active); }
+    &:checked { @include button(header-checked); }
+    &:disabled { color: transparentize($header_fg, 0.4); }
+    &:backdrop { opacity: 0.7; background-image: none;}
+
+    + button.flat.image-button.toggle { margin-right: if($variant=='light', -6px, -5px); }
+  }
 
   .linked.raised {
     > button.toggle {