diff --git a/src/gtk-3.0/gtk-compact-dark-solid.css b/src/gtk-3.0/gtk-compact-dark-solid.css
index 858e3ce..5aacbd1 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid.css
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .linked.vertical > entry + entry {
@@ -1750,7 +1750,6 @@ headerbar button:checked,
   background-clip: padding-box;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 300ms;
-  box-shadow: none;
 }
 
 paned.titlebar.horizontal headerbar button.flat.toggle.popup:active:not(.image-button), paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:active:not(.image-button), paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:active:not(.image-button), .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:active:not(.image-button),
@@ -1766,7 +1765,6 @@ headerbar button:active,
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 300ms;
   background-clip: padding-box;
-  box-shadow: none;
 }
 
 paned.titlebar.horizontal headerbar button.flat.toggle.popup:disabled:not(.image-button), paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:disabled:not(.image-button), paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:disabled:not(.image-button), .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:disabled:not(.image-button),
@@ -2171,13 +2169,12 @@ headerbar scale trough:disabled, .nemo-window .primary-toolbar scale trough:disa
 }
 
 .path-bar button:active, .path-bar button:checked {
-  color: #ffffff;
-  border: none;
-  background-color: #848484;
   background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0.35);
   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);
+  border-color: rgba(255, 255, 255, 0.12);
 }
 
 .path-bar button.text-button.image-button label {
@@ -5102,7 +5099,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack {
-  border-radius: 0 0 6px 0;
+  border-radius: 0 0 6px 6px;
 }
 
 .nautilus-window.maximized notebook,
@@ -5257,7 +5254,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 }
 
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .caja-notebook {
diff --git a/src/gtk-3.0/gtk-compact-dark.css b/src/gtk-3.0/gtk-compact-dark.css
index 9b5aa2d..c88b1f3 100644
--- a/src/gtk-3.0/gtk-compact-dark.css
+++ b/src/gtk-3.0/gtk-compact-dark.css
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .linked.vertical > entry + entry {
@@ -1750,7 +1750,6 @@ headerbar button:checked,
   background-clip: padding-box;
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 300ms;
-  box-shadow: none;
 }
 
 paned.titlebar.horizontal headerbar button.flat.toggle.popup:active:not(.image-button), paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:active:not(.image-button), paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:active:not(.image-button), .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:active:not(.image-button),
@@ -1766,7 +1765,6 @@ headerbar button:active,
   transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
   transition-duration: 300ms;
   background-clip: padding-box;
-  box-shadow: none;
 }
 
 paned.titlebar.horizontal headerbar button.flat.toggle.popup:disabled:not(.image-button), paned.titlebar.horizontal headerbar button.toggle.popup.budgie-menu-launcher:disabled:not(.image-button), paned.titlebar.horizontal headerbar .budgie-panel .toggle.popup#tasklist-button:disabled:not(.image-button), .budgie-panel paned.titlebar.horizontal headerbar .toggle.popup#tasklist-button:disabled:not(.image-button),
@@ -2171,13 +2169,12 @@ headerbar scale trough:disabled, .nemo-window .primary-toolbar scale trough:disa
 }
 
 .path-bar button:active, .path-bar button:checked {
-  color: #ffffff;
-  border: none;
-  background-color: rgba(132, 132, 132, 0.98);
   background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0.35);
   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);
+  border-color: rgba(255, 255, 255, 0.12);
 }
 
 .path-bar button.text-button.image-button label {
@@ -5102,7 +5099,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack {
-  border-radius: 0 0 6px 0;
+  border-radius: 0 0 6px 6px;
 }
 
 .nautilus-window.maximized notebook,
@@ -5257,7 +5254,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 }
 
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .caja-notebook {
diff --git a/src/gtk-3.0/gtk-compact-light-solid.css b/src/gtk-3.0/gtk-compact-light-solid.css
index 71dbc55..6443d9c 100644
--- a/src/gtk-3.0/gtk-compact-light-solid.css
+++ b/src/gtk-3.0/gtk-compact-light-solid.css
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .linked.vertical > entry + entry {
@@ -2173,13 +2173,12 @@ headerbar scale trough:disabled, .nemo-window .primary-toolbar scale trough:disa
 }
 
 .path-bar button:active, .path-bar button:checked {
-  color: #ffffff;
-  border: none;
-  background-color: #686868;
   background-image: none;
+  color: #ffffff;
+  background-color: rgba(0, 0, 0, 0.65);
   text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+  border-color: rgba(0, 0, 0, 0.11);
 }
 
 .path-bar button.text-button.image-button label {
@@ -5110,7 +5109,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack {
-  border-radius: 0 0 6px 0;
+  border-radius: 0 0 6px 6px;
 }
 
 .nautilus-window.maximized notebook,
@@ -5265,7 +5264,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 }
 
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .caja-notebook {
diff --git a/src/gtk-3.0/gtk-compact-light.css b/src/gtk-3.0/gtk-compact-light.css
index 3880e50..9880f26 100644
--- a/src/gtk-3.0/gtk-compact-light.css
+++ b/src/gtk-3.0/gtk-compact-light.css
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .linked.vertical > entry + entry {
@@ -2173,13 +2173,12 @@ headerbar scale trough:disabled, .nemo-window .primary-toolbar scale trough:disa
 }
 
 .path-bar button:active, .path-bar button:checked {
-  color: #ffffff;
-  border: none;
-  background-color: #686868;
   background-image: none;
+  color: #ffffff;
+  background-color: rgba(0, 0, 0, 0.65);
   text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.12), 0px 1px 2px 0px rgba(16, 16, 16, 0.06);
+  border-color: rgba(0, 0, 0, 0.11);
 }
 
 .path-bar button.text-button.image-button label {
@@ -5110,7 +5109,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack {
-  border-radius: 0 0 6px 0;
+  border-radius: 0 0 6px 6px;
 }
 
 .nautilus-window.maximized notebook,
@@ -5265,7 +5264,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 }
 
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .caja-notebook {
diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css
index 8e7e906..e3192ba 100644
--- a/src/gtk-3.0/gtk-dark-solid.css
+++ b/src/gtk-3.0/gtk-dark-solid.css
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .linked.vertical > entry + entry {
@@ -2181,15 +2181,12 @@ headerbar scale trough:disabled, .nemo-window .primary-toolbar scale trough:disa
 }
 
 .path-bar button:active, .path-bar button: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);
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0.35);
   text-shadow: none;
   -gtk-icon-shadow: none;
-  box-shadow: none;
+  border-color: rgba(255, 255, 255, 0.12);
 }
 
 .path-bar button.text-button.image-button label {
@@ -5115,7 +5112,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack {
-  border-radius: 0 0 6px 0;
+  border-radius: 0 0 6px 6px;
 }
 
 .nautilus-window.maximized notebook,
@@ -5271,7 +5268,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 }
 
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .caja-notebook {
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index ab4c7e1..965ac3c 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -926,7 +926,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .linked.vertical > entry + entry {
@@ -2181,15 +2181,12 @@ headerbar scale trough:disabled, .nemo-window .primary-toolbar scale trough:disa
 }
 
 .path-bar button:active, .path-bar button: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);
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0.35);
   text-shadow: none;
   -gtk-icon-shadow: none;
-  box-shadow: none;
+  border-color: rgba(255, 255, 255, 0.12);
 }
 
 .path-bar button.text-button.image-button label {
@@ -5115,7 +5112,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack {
-  border-radius: 0 0 6px 0;
+  border-radius: 0 0 6px 6px;
 }
 
 .nautilus-window.maximized notebook,
@@ -5271,7 +5268,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 }
 
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .caja-notebook {
diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css
index c5038d7..c93d17d 100644
--- a/src/gtk-3.0/gtk-light-solid.css
+++ b/src/gtk-3.0/gtk-light-solid.css
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .linked.vertical > entry + entry {
@@ -1937,15 +1937,23 @@ headerbar .linked:not(.vertical).path-bar > button:backdrop,
   box-shadow: none;
 }
 
-headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):active, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):active,
-headerbar .linked:not(.vertical).path-bar > button:not(:last-child):active,
-.nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:not(:last-child):active {
+
+headerbar .linked:not(.vertical).path-bar > button:active,
+.nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:active {
   box-shadow: 1px 0 #afafaf;
 }
 
-headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):checked, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):checked,
-headerbar .linked:not(.vertical).path-bar > button:not(:last-child):checked,
-.nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:not(:last-child):checked {
+
+headerbar .linked:not(.vertical).path-bar > button:checked,
+.nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:checked {
+  box-shadow: 1px 0 #686868;
+}
+
+headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):active, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):active {
+  box-shadow: 1px 0 #afafaf;
+}
+
+headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):checked, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):checked {
   box-shadow: 1px 0 #686868;
 }
 
@@ -2199,15 +2207,12 @@ headerbar scale trough:disabled, .nemo-window .primary-toolbar scale trough:disa
 }
 
 .path-bar button:active, .path-bar button:checked {
+  background-image: none;
   color: #ffffff;
-  background-color: #686868;
-  background-image: linear-gradient(0deg, #656565 0%, #707070 100%);
-  border-color: rgba(0, 0, 0, 0.11);
-  border-top-color: rgba(0, 0, 0, 0.11);
-  border-bottom-color: rgba(0, 0, 0, 0.11);
+  background-color: rgba(0, 0, 0, 0.65);
   text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  box-shadow: none;
+  border-color: rgba(0, 0, 0, 0.11);
 }
 
 .path-bar button.text-button.image-button label {
@@ -5139,7 +5144,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack {
-  border-radius: 0 0 6px 0;
+  border-radius: 0 0 6px 6px;
 }
 
 .nautilus-window.maximized notebook,
@@ -5295,7 +5300,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 }
 
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .caja-notebook {
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index 7195067..346d086 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -928,7 +928,7 @@ button.font separator, button.file separator {
 }
 
 .linked:not(.vertical).path-bar > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .linked.vertical > entry + entry {
@@ -1937,15 +1937,23 @@ headerbar .linked:not(.vertical).path-bar > button:backdrop,
   box-shadow: none;
 }
 
-headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):active, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):active,
-headerbar .linked:not(.vertical).path-bar > button:not(:last-child):active,
-.nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:not(:last-child):active {
+
+headerbar .linked:not(.vertical).path-bar > button:active,
+.nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:active {
   box-shadow: 1px 0 #afafaf;
 }
 
-headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):checked, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):checked,
-headerbar .linked:not(.vertical).path-bar > button:not(:last-child):checked,
-.nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:not(:last-child):checked {
+
+headerbar .linked:not(.vertical).path-bar > button:checked,
+.nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:checked {
+  box-shadow: 1px 0 #686868;
+}
+
+headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):active, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):active {
+  box-shadow: 1px 0 #afafaf;
+}
+
+headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):checked, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:not(:last-child):checked {
   box-shadow: 1px 0 #686868;
 }
 
@@ -2199,15 +2207,12 @@ headerbar scale trough:disabled, .nemo-window .primary-toolbar scale trough:disa
 }
 
 .path-bar button:active, .path-bar button:checked {
+  background-image: none;
   color: #ffffff;
-  background-color: #686868;
-  background-image: linear-gradient(0deg, #656565 0%, #707070 100%);
-  border-color: rgba(0, 0, 0, 0.11);
-  border-top-color: rgba(0, 0, 0, 0.11);
-  border-bottom-color: rgba(0, 0, 0, 0.11);
+  background-color: rgba(0, 0, 0, 0.65);
   text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
   -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05);
-  box-shadow: none;
+  border-color: rgba(0, 0, 0, 0.11);
 }
 
 .path-bar button.text-button.image-button label {
@@ -5139,7 +5144,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack {
-  border-radius: 0 0 6px 0;
+  border-radius: 0 0 6px 6px;
 }
 
 .nautilus-window.maximized notebook,
@@ -5295,7 +5300,7 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 }
 
 .nemo-window .primary-toolbar widget.raised.linked:not(.vertical):not(.path-bar) > button + button {
-  border-left-style: none;
+  border-left-style: solid;
 }
 
 .caja-notebook {
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index fdf5d6f..cacadec 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -74,7 +74,7 @@ terminal-window,
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack {
-    border-radius: 0 0 $wm_radius 0;
+    border-radius: 0 0 $wm_radius $wm_radius;
 }
 
 .nautilus-window.maximized notebook,
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index 00d1002..7037a71 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -729,7 +729,7 @@ toolbar.inline-toolbar toolbutton {
 // special case, because path-bars are bugged
 @mixin pathbar_linking_rules($sep_color:if($variant=='light', transparentize($button_border, 0.6), transparentize($button_border, 0.5))) {
 
-  > button + button { border-left-style: none; }
+  > button + button { border-left-style: solid; }
 
   > button:hover:not(:checked):not(:active):not(:only-child) {
 
@@ -1364,14 +1364,14 @@ headerbar {
       background-clip: if($darker=='false' and $variant=='light', border-box, padding-box);
       transition: $button_transition;
       transition-duration: 300ms;
-      @if $compact == 'true' { box-shadow: none; }
+      @if $variant=='light' and $compact == 'true' { box-shadow: none; }
     }
     &:active {
       @include button(header-active);
       transition: $button_transition;
       transition-duration: 300ms;
       background-clip: if($darker=='false' and $variant=='light', border-box, padding-box);
-      @if $compact == 'true' { box-shadow: none; }
+      @if $variant=='light' and $compact == 'true' { box-shadow: none; }
     }
     &:disabled { @include button(header-insensitive); }
     &:disabled:active, &:disabled:checked { @include button(header-insensitive-active); }
@@ -1501,13 +1501,25 @@ headerbar {
       &, &:hover, &:active, &:checked, &:disabled { @extend %linked; }
     }
 
+    // @include pathbar_linking_rules($sep_color: $button_border);
+  }
+
+  .linked:not(.vertical).path-bar {
+
     // fixed ugly border color
-    > button:not(:last-child) {
-      &:active { @if $variant=='light'and $compact == 'false' { box-shadow: 1px 0 $header_button_active_bg; } }
+    > button {
+      &:active { @if $variant=='light' and $compact == 'false' { box-shadow: 1px 0 $header_button_active_bg; } }
       &:checked { @if $variant=='light' and $compact == 'false' { box-shadow: 1px 0 $header_button_checked_bg; } }
     }
+  }
 
-    // @include pathbar_linking_rules($sep_color: $button_border);
+  .linked:not(.vertical):not(.path-bar).stack-switcher {
+
+    // fixed ugly border color
+    > button:not(:last-child) {
+      &:active { @if $variant=='light' and $compact == 'false' { box-shadow: 1px 0 $header_button_active_bg; } }
+      &:checked { @if $variant=='light' and $compact == 'false' { box-shadow: 1px 0 $header_button_checked_bg; } }
+    }
   }
 
   // Headerbar Suggested and Destructive Action buttons
@@ -1664,7 +1676,7 @@ headerbar {
   }
 
   &:hover { box-shadow: none; }
-  &:active, &:checked { @include button(header-checked); }
+  &:active, &:checked { @include button(flat-checked); border-color: $borders_color; }
 
   &.text-button.image-button label { padding-left: 0; padding-right: 0; }