diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss
index f4ec9a3..34feec4 100644
--- a/src/_sass/gtk/_common-3.20.scss
+++ b/src/_sass/gtk/_common-3.20.scss
@@ -1265,7 +1265,7 @@ searchbar > revealer > box {
 
   &.default-decoration {
     min-height: 24px;
-    padding: $container-padding;
+    padding: $container-padding $container-padding / 2;
     box-shadow: inset 0 1px highlight($titlebar);
     border-radius: $corner-radius $corner-radius 0 0;
 
@@ -1279,7 +1279,7 @@ searchbar > revealer > box {
     button.titlebutton {
       min-height: 24px;
       min-width: 24px;
-      margin: 0;
+      margin: 0 $container-padding / 2;
       padding: 0;
     }
 
diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
index bce64b0..b1a9c9f 100644
--- a/src/_sass/gtk/_common-4.0.scss
+++ b/src/_sass/gtk/_common-4.0.scss
@@ -1668,6 +1668,7 @@ popover.background {
     background-color: $surface;
     border: none;
     border-radius: $menu-radius;
+    color: $text;
   }
 
   &:backdrop {
diff --git a/src/_sass/gtk/apps/_gnome-3.22.scss b/src/_sass/gtk/apps/_gnome-3.22.scss
index 8845a5e..62c162e 100644
--- a/src/_sass/gtk/apps/_gnome-3.22.scss
+++ b/src/_sass/gtk/apps/_gnome-3.22.scss
@@ -98,7 +98,7 @@
                 color: $primary;
                 background-color: $base;
                 box-shadow: 4px 0 $base;
-                padding: 0 0 0 14px;
+                padding: 0 24px 0 14px;
                 border-image-width: 10px 10px 10px 18px;
                 border-image-slice: 10 10 10 18;
                 border-image-repeat: stretch;
@@ -113,6 +113,7 @@
               button.sidebar-button {
                 margin-right: 8px;
                 margin-left: -32px;
+                color: $primary;
 
                 @extend %button-flat-simple;
               }
@@ -256,6 +257,28 @@
   }
 }
 
+// >= 42.0
+.windowhandle .linked.nautilus-path-bar {
+  background-color: $titlebar-fill;
+  border-radius: $circular-radius;
+  margin: $container-padding 0;
+
+  button:not(.suggested-action):not(.destructive-action) {
+    margin-top: 0;
+    margin-bottom: 0;
+    border-radius: $circular-radius;
+
+    &.current-dir {
+      color: $titlebar-text;
+
+      &:hover, &:active {
+        background: none;
+        box-shadow: none;
+      }
+    }
+  }
+}
+
 // .nautilus-canvas-item {
 //   border-radius: $corner-radius;
 // }
diff --git a/src/gtk/3.0/gtk-Compact.css b/src/gtk/3.0/gtk-Compact.css
index f1adf88..83d6912 100644
--- a/src/gtk/3.0/gtk-Compact.css
+++ b/src/gtk/3.0/gtk-Compact.css
@@ -2630,7 +2630,7 @@ searchbar > revealer > box {
 
 .titlebar.default-decoration {
   min-height: 24px;
-  padding: 4px;
+  padding: 4px 2px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border-radius: 10px 10px 0 0;
 }
@@ -2643,7 +2643,7 @@ searchbar > revealer > box {
 .titlebar.default-decoration button.titlebutton {
   min-height: 24px;
   min-width: 24px;
-  margin: 0;
+  margin: 0 2px;
   padding: 0;
 }
 
@@ -5289,7 +5289,7 @@ popover.emoji-completion .emoji:hover {
   color: #1A73E8;
   background-color: #FFFFFF;
   box-shadow: 4px 0 #FFFFFF;
-  padding: 0 0 0 14px;
+  padding: 0 24px 0 14px;
   border-image-width: 10px 10px 10px 18px;
   border-image-slice: 10 10 10 18;
   border-image-repeat: stretch;
@@ -5303,6 +5303,7 @@ popover.emoji-completion .emoji:hover {
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:selected button.sidebar-button {
   margin-right: 8px;
   margin-left: -32px;
+  color: #1A73E8;
 }
 
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label {
@@ -5430,6 +5431,27 @@ popover.emoji-completion .emoji:hover {
   margin: 5px;
 }
 
+.windowhandle .linked.nautilus-path-bar {
+  background-color: rgba(255, 255, 255, 0.04);
+  border-radius: 9999px;
+  margin: 4px 0;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action) {
+  margin-top: 0;
+  margin-bottom: 0;
+  border-radius: 9999px;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir {
+  color: white;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:hover, .windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:active {
+  background: none;
+  box-shadow: none;
+}
+
 .nautilus-canvas-item.dim-label,
 .nautilus-list-dim-label {
   color: rgba(0, 0, 0, 0.6);
diff --git a/src/gtk/3.0/gtk-Dark-Compact.css b/src/gtk/3.0/gtk-Dark-Compact.css
index 2f8de94..7648dff 100644
--- a/src/gtk/3.0/gtk-Dark-Compact.css
+++ b/src/gtk/3.0/gtk-Dark-Compact.css
@@ -2630,7 +2630,7 @@ searchbar > revealer > box {
 
 .titlebar.default-decoration {
   min-height: 24px;
-  padding: 4px;
+  padding: 4px 2px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border-radius: 10px 10px 0 0;
 }
@@ -2643,7 +2643,7 @@ searchbar > revealer > box {
 .titlebar.default-decoration button.titlebutton {
   min-height: 24px;
   min-width: 24px;
-  margin: 0;
+  margin: 0 2px;
   padding: 0;
 }
 
@@ -5289,7 +5289,7 @@ popover.emoji-completion .emoji:hover {
   color: #3281ea;
   background-color: #2C2C2C;
   box-shadow: 4px 0 #2C2C2C;
-  padding: 0 0 0 14px;
+  padding: 0 24px 0 14px;
   border-image-width: 10px 10px 10px 18px;
   border-image-slice: 10 10 10 18;
   border-image-repeat: stretch;
@@ -5303,6 +5303,7 @@ popover.emoji-completion .emoji:hover {
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:selected button.sidebar-button {
   margin-right: 8px;
   margin-left: -32px;
+  color: #3281ea;
 }
 
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label {
@@ -5430,6 +5431,27 @@ popover.emoji-completion .emoji:hover {
   margin: 5px;
 }
 
+.windowhandle .linked.nautilus-path-bar {
+  background-color: rgba(255, 255, 255, 0.04);
+  border-radius: 9999px;
+  margin: 4px 0;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action) {
+  margin-top: 0;
+  margin-bottom: 0;
+  border-radius: 9999px;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir {
+  color: white;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:hover, .windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:active {
+  background: none;
+  box-shadow: none;
+}
+
 .nautilus-canvas-item.dim-label,
 .nautilus-list-dim-label {
   color: rgba(255, 255, 255, 0.7);
diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css
index 2d21d6c..ef97da5 100644
--- a/src/gtk/3.0/gtk-Dark.css
+++ b/src/gtk/3.0/gtk-Dark.css
@@ -2630,7 +2630,7 @@ searchbar > revealer > box {
 
 .titlebar.default-decoration {
   min-height: 24px;
-  padding: 6px;
+  padding: 6px 3px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border-radius: 12px 12px 0 0;
 }
@@ -2643,7 +2643,7 @@ searchbar > revealer > box {
 .titlebar.default-decoration button.titlebutton {
   min-height: 24px;
   min-width: 24px;
-  margin: 0;
+  margin: 0 3px;
   padding: 0;
 }
 
@@ -5289,7 +5289,7 @@ popover.emoji-completion .emoji:hover {
   color: #3281ea;
   background-color: #2C2C2C;
   box-shadow: 4px 0 #2C2C2C;
-  padding: 0 0 0 14px;
+  padding: 0 24px 0 14px;
   border-image-width: 10px 10px 10px 18px;
   border-image-slice: 10 10 10 18;
   border-image-repeat: stretch;
@@ -5303,6 +5303,7 @@ popover.emoji-completion .emoji:hover {
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:selected button.sidebar-button {
   margin-right: 8px;
   margin-left: -32px;
+  color: #3281ea;
 }
 
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label {
@@ -5430,6 +5431,27 @@ popover.emoji-completion .emoji:hover {
   margin: 4px;
 }
 
+.windowhandle .linked.nautilus-path-bar {
+  background-color: rgba(255, 255, 255, 0.04);
+  border-radius: 9999px;
+  margin: 6px 0;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action) {
+  margin-top: 0;
+  margin-bottom: 0;
+  border-radius: 9999px;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir {
+  color: white;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:hover, .windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:active {
+  background: none;
+  box-shadow: none;
+}
+
 .nautilus-canvas-item.dim-label,
 .nautilus-list-dim-label {
   color: rgba(255, 255, 255, 0.7);
diff --git a/src/gtk/3.0/gtk-Light-Compact.css b/src/gtk/3.0/gtk-Light-Compact.css
index 03a26f5..1bf6d20 100644
--- a/src/gtk/3.0/gtk-Light-Compact.css
+++ b/src/gtk/3.0/gtk-Light-Compact.css
@@ -2630,7 +2630,7 @@ searchbar > revealer > box {
 
 .titlebar.default-decoration {
   min-height: 24px;
-  padding: 4px;
+  padding: 4px 2px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   border-radius: 10px 10px 0 0;
 }
@@ -2643,7 +2643,7 @@ searchbar > revealer > box {
 .titlebar.default-decoration button.titlebutton {
   min-height: 24px;
   min-width: 24px;
-  margin: 0;
+  margin: 0 2px;
   padding: 0;
 }
 
@@ -5288,7 +5288,7 @@ popover.emoji-completion .emoji:hover {
   color: #1A73E8;
   background-color: #FFFFFF;
   box-shadow: 4px 0 #FFFFFF;
-  padding: 0 0 0 14px;
+  padding: 0 24px 0 14px;
   border-image-width: 10px 10px 10px 18px;
   border-image-slice: 10 10 10 18;
   border-image-repeat: stretch;
@@ -5302,6 +5302,7 @@ popover.emoji-completion .emoji:hover {
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:selected button.sidebar-button {
   margin-right: 8px;
   margin-left: -32px;
+  color: #1A73E8;
 }
 
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label {
@@ -5429,6 +5430,27 @@ popover.emoji-completion .emoji:hover {
   margin: 5px;
 }
 
+.windowhandle .linked.nautilus-path-bar {
+  background-color: rgba(0, 0, 0, 0.04);
+  border-radius: 9999px;
+  margin: 4px 0;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action) {
+  margin-top: 0;
+  margin-bottom: 0;
+  border-radius: 9999px;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir {
+  color: rgba(0, 0, 0, 0.87);
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:hover, .windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:active {
+  background: none;
+  box-shadow: none;
+}
+
 .nautilus-canvas-item.dim-label,
 .nautilus-list-dim-label {
   color: rgba(0, 0, 0, 0.6);
diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css
index bb54ebe..7051b4c 100644
--- a/src/gtk/3.0/gtk-Light.css
+++ b/src/gtk/3.0/gtk-Light.css
@@ -2630,7 +2630,7 @@ searchbar > revealer > box {
 
 .titlebar.default-decoration {
   min-height: 24px;
-  padding: 6px;
+  padding: 6px 3px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   border-radius: 12px 12px 0 0;
 }
@@ -2643,7 +2643,7 @@ searchbar > revealer > box {
 .titlebar.default-decoration button.titlebutton {
   min-height: 24px;
   min-width: 24px;
-  margin: 0;
+  margin: 0 3px;
   padding: 0;
 }
 
@@ -5288,7 +5288,7 @@ popover.emoji-completion .emoji:hover {
   color: #1A73E8;
   background-color: #FFFFFF;
   box-shadow: 4px 0 #FFFFFF;
-  padding: 0 0 0 14px;
+  padding: 0 24px 0 14px;
   border-image-width: 10px 10px 10px 18px;
   border-image-slice: 10 10 10 18;
   border-image-repeat: stretch;
@@ -5302,6 +5302,7 @@ popover.emoji-completion .emoji:hover {
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:selected button.sidebar-button {
   margin-right: 8px;
   margin-left: -32px;
+  color: #1A73E8;
 }
 
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label {
@@ -5429,6 +5430,27 @@ popover.emoji-completion .emoji:hover {
   margin: 4px;
 }
 
+.windowhandle .linked.nautilus-path-bar {
+  background-color: rgba(0, 0, 0, 0.04);
+  border-radius: 9999px;
+  margin: 6px 0;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action) {
+  margin-top: 0;
+  margin-bottom: 0;
+  border-radius: 9999px;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir {
+  color: rgba(0, 0, 0, 0.87);
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:hover, .windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:active {
+  background: none;
+  box-shadow: none;
+}
+
 .nautilus-canvas-item.dim-label,
 .nautilus-list-dim-label {
   color: rgba(0, 0, 0, 0.6);
diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
index 1c84b48..db07f01 100644
--- a/src/gtk/3.0/gtk.css
+++ b/src/gtk/3.0/gtk.css
@@ -2630,7 +2630,7 @@ searchbar > revealer > box {
 
 .titlebar.default-decoration {
   min-height: 24px;
-  padding: 6px;
+  padding: 6px 3px;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   border-radius: 12px 12px 0 0;
 }
@@ -2643,7 +2643,7 @@ searchbar > revealer > box {
 .titlebar.default-decoration button.titlebutton {
   min-height: 24px;
   min-width: 24px;
-  margin: 0;
+  margin: 0 3px;
   padding: 0;
 }
 
@@ -5289,7 +5289,7 @@ popover.emoji-completion .emoji:hover {
   color: #1A73E8;
   background-color: #FFFFFF;
   box-shadow: 4px 0 #FFFFFF;
-  padding: 0 0 0 14px;
+  padding: 0 24px 0 14px;
   border-image-width: 10px 10px 10px 18px;
   border-image-slice: 10 10 10 18;
   border-image-repeat: stretch;
@@ -5303,6 +5303,7 @@ popover.emoji-completion .emoji:hover {
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:selected button.sidebar-button {
   margin-right: 8px;
   margin-left: -32px;
+  color: #1A73E8;
 }
 
 .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled image.sidebar-icon, .nautilus-window.background.csd placessidebar > viewport.frame > list > row.activatable:disabled label.sidebar-label {
@@ -5430,6 +5431,27 @@ popover.emoji-completion .emoji:hover {
   margin: 4px;
 }
 
+.windowhandle .linked.nautilus-path-bar {
+  background-color: rgba(255, 255, 255, 0.04);
+  border-radius: 9999px;
+  margin: 6px 0;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action) {
+  margin-top: 0;
+  margin-bottom: 0;
+  border-radius: 9999px;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir {
+  color: white;
+}
+
+.windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:hover, .windowhandle .linked.nautilus-path-bar button:not(.suggested-action):not(.destructive-action).current-dir:active {
+  background: none;
+  box-shadow: none;
+}
+
 .nautilus-canvas-item.dim-label,
 .nautilus-list-dim-label {
   color: rgba(0, 0, 0, 0.6);
diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css
index 0a12c7d..1f738b9 100644
--- a/src/gtk/4.0/gtk-Compact.css
+++ b/src/gtk/4.0/gtk-Compact.css
@@ -1976,6 +1976,7 @@ popover.background > contents {
   background-color: #FFFFFF;
   border: none;
   border-radius: 9px;
+  color: rgba(0, 0, 0, 0.87);
 }
 
 popover.background:backdrop > arrow,
diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css
index acd541e..300f91b 100644
--- a/src/gtk/4.0/gtk-Dark-Compact.css
+++ b/src/gtk/4.0/gtk-Dark-Compact.css
@@ -1976,6 +1976,7 @@ popover.background > contents {
   background-color: #3C3C3C;
   border: none;
   border-radius: 9px;
+  color: white;
 }
 
 popover.background:backdrop > arrow,
diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css
index a0eadc8..d15fae4 100644
--- a/src/gtk/4.0/gtk-Dark.css
+++ b/src/gtk/4.0/gtk-Dark.css
@@ -1976,6 +1976,7 @@ popover.background > contents {
   background-color: #3C3C3C;
   border: none;
   border-radius: 12px;
+  color: white;
 }
 
 popover.background:backdrop > arrow,
diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css
index 6726dc9..a50a756 100644
--- a/src/gtk/4.0/gtk-Light-Compact.css
+++ b/src/gtk/4.0/gtk-Light-Compact.css
@@ -1976,6 +1976,7 @@ popover.background > contents {
   background-color: #FFFFFF;
   border: none;
   border-radius: 9px;
+  color: rgba(0, 0, 0, 0.87);
 }
 
 popover.background:backdrop > arrow,
diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css
index 76f6d9d..6420666 100644
--- a/src/gtk/4.0/gtk-Light.css
+++ b/src/gtk/4.0/gtk-Light.css
@@ -1976,6 +1976,7 @@ popover.background > contents {
   background-color: #FFFFFF;
   border: none;
   border-radius: 12px;
+  color: rgba(0, 0, 0, 0.87);
 }
 
 popover.background:backdrop > arrow,
diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css
index 1da28df..f513176 100644
--- a/src/gtk/4.0/gtk.css
+++ b/src/gtk/4.0/gtk.css
@@ -1976,6 +1976,7 @@ popover.background > contents {
   background-color: #FFFFFF;
   border: none;
   border-radius: 12px;
+  color: rgba(0, 0, 0, 0.87);
 }
 
 popover.background:backdrop > arrow,