diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css
index fd881432..06097ef2 100644
--- a/src/main/gtk-3.0/gtk-dark-solid.css
+++ b/src/main/gtk-3.0/gtk-dark-solid.css
@@ -5165,8 +5165,7 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 .nemo-window .primary-toolbar button {
   padding-top: 0;
   padding-bottom: 0;
-  margin-top: 6px;
-  margin-bottom: 6px;
+  margin: 6px 1px;
 }
 
 .nemo-window .primary-toolbar entry {
@@ -5183,9 +5182,10 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 
 .nemo-window .primary-toolbar .linked.path-bar > button, .nemo-window .primary-toolbar .linked.path-bar > button.image-button {
   min-height: 0;
-  min-width: 20px;
+  min-width: 0;
   padding-top: 0;
   padding-bottom: 0;
+  border-radius: 6px;
 }
 
 .nemo-window .floating-bar {
@@ -9398,10 +9398,6 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   padding: 0 8px 12px 8px;
 }
 
-.raven stackswitcher.linked > button {
-  border-top: 1px solid rgba(255, 255, 255, 0.12);
-}
-
 .raven .raven-header {
   min-height: 36px;
   padding: 2px;
@@ -9441,7 +9437,6 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   margin: 0;
   padding: 0 20px;
   min-height: 20px;
-  border: none;
 }
 
 .raven .raven-header.top > stackswitcher.linked > button:hover {
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index 507e3592..ae63b330 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -5165,8 +5165,7 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 .nemo-window .primary-toolbar button {
   padding-top: 0;
   padding-bottom: 0;
-  margin-top: 6px;
-  margin-bottom: 6px;
+  margin: 6px 1px;
 }
 
 .nemo-window .primary-toolbar entry {
@@ -5183,9 +5182,10 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 
 .nemo-window .primary-toolbar .linked.path-bar > button, .nemo-window .primary-toolbar .linked.path-bar > button.image-button {
   min-height: 0;
-  min-width: 20px;
+  min-width: 0;
   padding-top: 0;
   padding-bottom: 0;
+  border-radius: 6px;
 }
 
 .nemo-window .floating-bar {
@@ -9398,10 +9398,6 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   padding: 0 8px 12px 8px;
 }
 
-.raven stackswitcher.linked > button {
-  border-top: 1px solid rgba(255, 255, 255, 0.12);
-}
-
 .raven .raven-header {
   min-height: 36px;
   padding: 2px;
@@ -9441,7 +9437,6 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   margin: 0;
   padding: 0 20px;
   min-height: 20px;
-  border: none;
 }
 
 .raven .raven-header.top > stackswitcher.linked > button:hover {
diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css
index 9c68aef2..c19943e7 100644
--- a/src/main/gtk-3.0/gtk-light-solid.css
+++ b/src/main/gtk-3.0/gtk-light-solid.css
@@ -5186,8 +5186,7 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 .nemo-window .primary-toolbar button {
   padding-top: 0;
   padding-bottom: 0;
-  margin-top: 6px;
-  margin-bottom: 6px;
+  margin: 6px 1px;
 }
 
 .nemo-window .primary-toolbar entry {
@@ -5204,9 +5203,10 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 
 .nemo-window .primary-toolbar .linked.path-bar > button, .nemo-window .primary-toolbar .linked.path-bar > button.image-button {
   min-height: 0;
-  min-width: 20px;
+  min-width: 0;
   padding-top: 0;
   padding-bottom: 0;
+  border-radius: 6px;
 }
 
 .nemo-window .floating-bar {
@@ -9436,10 +9436,6 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   padding: 0 8px 12px 8px;
 }
 
-.raven stackswitcher.linked > button {
-  border-top: 1px solid rgba(0, 0, 0, 0.12);
-}
-
 .raven .raven-header {
   min-height: 36px;
   padding: 2px;
@@ -9479,7 +9475,6 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   margin: 0;
   padding: 0 20px;
   min-height: 20px;
-  border: none;
 }
 
 .raven .raven-header.top > stackswitcher.linked > button:hover {
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 5310507e..27eac4e8 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -5186,8 +5186,7 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 .nemo-window .primary-toolbar button {
   padding-top: 0;
   padding-bottom: 0;
-  margin-top: 6px;
-  margin-bottom: 6px;
+  margin: 6px 1px;
 }
 
 .nemo-window .primary-toolbar entry {
@@ -5204,9 +5203,10 @@ filechooser box.vertical > paned > separator:dir(rtl) {
 
 .nemo-window .primary-toolbar .linked.path-bar > button, .nemo-window .primary-toolbar .linked.path-bar > button.image-button {
   min-height: 0;
-  min-width: 20px;
+  min-width: 0;
   padding-top: 0;
   padding-bottom: 0;
+  border-radius: 6px;
 }
 
 .nemo-window .floating-bar {
@@ -9436,10 +9436,6 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   padding: 0 8px 12px 8px;
 }
 
-.raven stackswitcher.linked > button {
-  border-top: 1px solid rgba(0, 0, 0, 0.12);
-}
-
 .raven .raven-header {
   min-height: 36px;
   padding: 2px;
@@ -9479,7 +9475,6 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven
   margin: 0;
   padding: 0 20px;
   min-height: 20px;
-  border: none;
 }
 
 .raven .raven-header.top > stackswitcher.linked > button:hover {
diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss
index 668cb641..b3da5991 100644
--- a/src/sass/gtk/_applications.scss
+++ b/src/sass/gtk/_applications.scss
@@ -470,8 +470,7 @@ $disk_space_free: darken($bg_color, 3%);
       @extend %headerbar_buttons;
       padding-top: 0;
       padding-bottom: 0;
-      margin-top: 6px;
-      margin-bottom: 6px;
+      margin: 6px 1px;
     }
 
     entry {
@@ -491,9 +490,10 @@ $disk_space_free: darken($bg_color, 3%);
     .linked.path-bar {
       > button, > button.image-button {
         min-height: 0;
-        min-width: 20px;
+        min-width: 0;
         padding-top: 0;
         padding-bottom: 0;
+        border-radius: $bt_radius;
       }
     }
   }