diff --git a/src/gtk-3.0/gtk-compact-dark-alt.css b/src/gtk-3.0/gtk-compact-dark-alt.css
index 4d54864..67e232c 100644
--- a/src/gtk-3.0/gtk-compact-dark-alt.css
+++ b/src/gtk-3.0/gtk-compact-dark-alt.css
@@ -1290,21 +1290,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #686868;
-  background-color: #498dff;
-  background-image: linear-gradient(180deg, #686868 0%, #686868 100%);
+  background-color: #0e6bff;
+  border-color: #0e6bff;
+  background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5320,6 +5331,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #dbe8ff;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
@@ -5328,19 +5344,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #242424;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #242424;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #498dff;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #242424;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5404,35 +5460,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #498dff;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #498dff;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-dark-solid-alt.css b/src/gtk-3.0/gtk-compact-dark-solid-alt.css
index 1dc9de3..a66b9cb 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid-alt.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid-alt.css
@@ -1290,21 +1290,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #686868;
-  background-color: #498dff;
-  background-image: linear-gradient(180deg, #686868 0%, #686868 100%);
+  background-color: #0e6bff;
+  border-color: #0e6bff;
+  background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5320,6 +5331,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #dbe8ff;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
@@ -5328,19 +5344,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #242424;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #242424;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #498dff;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #242424;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5404,35 +5460,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #498dff;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #498dff;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-dark-solid.css b/src/gtk-3.0/gtk-compact-dark-solid.css
index 81bad11..ac78b71 100644
--- a/src/gtk-3.0/gtk-compact-dark-solid.css
+++ b/src/gtk-3.0/gtk-compact-dark-solid.css
@@ -1290,21 +1290,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #686868;
-  background-color: #498dff;
-  background-image: linear-gradient(180deg, #686868 0%, #686868 100%);
+  background-color: #0e6bff;
+  border-color: #0e6bff;
+  background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5320,6 +5331,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #dbe8ff;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
@@ -5328,19 +5344,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #242424;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #242424;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #498dff;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #242424;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5404,35 +5460,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #498dff;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #498dff;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-dark.css b/src/gtk-3.0/gtk-compact-dark.css
index c78930f..a0c7e40 100644
--- a/src/gtk-3.0/gtk-compact-dark.css
+++ b/src/gtk-3.0/gtk-compact-dark.css
@@ -1290,21 +1290,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #686868;
-  background-color: #498dff;
-  background-image: linear-gradient(180deg, #686868 0%, #686868 100%);
+  background-color: #0e6bff;
+  border-color: #0e6bff;
+  background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5320,6 +5331,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #dbe8ff;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
@@ -5328,19 +5344,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #242424;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #242424;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #498dff;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #242424;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5404,35 +5460,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #498dff;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #498dff;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-light-alt.css b/src/gtk-3.0/gtk-compact-light-alt.css
index 533bd63..83daa3c 100644
--- a/src/gtk-3.0/gtk-compact-light-alt.css
+++ b/src/gtk-3.0/gtk-compact-light-alt.css
@@ -1292,21 +1292,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #0e6bff;
-  background-color: #0046DB;
+  background-color: #0e6bff;
+  border-color: #0e6bff;
   background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5332,6 +5343,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #ccdaf8;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -5340,19 +5356,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #ffffff;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #0046DB;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #ffffff;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5416,35 +5472,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #0046DB;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #0046DB;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
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 7f4b4fa..0f5e2a6 100644
--- a/src/gtk-3.0/gtk-compact-light-solid-alt.css
+++ b/src/gtk-3.0/gtk-compact-light-solid-alt.css
@@ -1292,21 +1292,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #0e6bff;
-  background-color: #0046DB;
+  background-color: #0e6bff;
+  border-color: #0e6bff;
   background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5332,6 +5343,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #ccdaf8;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -5340,19 +5356,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #ffffff;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #0046DB;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #ffffff;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5416,35 +5472,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #0046DB;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #0046DB;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-light-solid.css b/src/gtk-3.0/gtk-compact-light-solid.css
index 3c39a33..ce2fdb8 100644
--- a/src/gtk-3.0/gtk-compact-light-solid.css
+++ b/src/gtk-3.0/gtk-compact-light-solid.css
@@ -1292,21 +1292,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #0e6bff;
-  background-color: #0046DB;
+  background-color: #0e6bff;
+  border-color: #0e6bff;
   background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5332,6 +5343,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #ccdaf8;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -5340,19 +5356,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #ffffff;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #0046DB;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #ffffff;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5416,35 +5472,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #0046DB;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #0046DB;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-compact-light.css b/src/gtk-3.0/gtk-compact-light.css
index 64c6764..d19e04c 100644
--- a/src/gtk-3.0/gtk-compact-light.css
+++ b/src/gtk-3.0/gtk-compact-light.css
@@ -1292,21 +1292,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #0e6bff;
-  background-color: #0046DB;
+  background-color: #0e6bff;
+  border-color: #0e6bff;
   background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5332,6 +5343,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #ccdaf8;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -5340,19 +5356,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #ffffff;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #0046DB;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #ffffff;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5416,35 +5472,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #0046DB;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #0046DB;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-dark-alt.css b/src/gtk-3.0/gtk-dark-alt.css
index 556d3cd..e3ecf13 100644
--- a/src/gtk-3.0/gtk-dark-alt.css
+++ b/src/gtk-3.0/gtk-dark-alt.css
@@ -1292,21 +1292,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #686868;
-  background-color: #498dff;
-  background-image: linear-gradient(180deg, #686868 0%, #686868 100%);
+  background-color: #0e6bff;
+  border-color: #0e6bff;
+  background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5323,6 +5334,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #dbe8ff;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
@@ -5331,19 +5347,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #242424;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #242424;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #498dff;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #242424;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5408,35 +5464,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #498dff;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #498dff;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-dark-solid-alt.css b/src/gtk-3.0/gtk-dark-solid-alt.css
index 2c002c7..8889ba5 100644
--- a/src/gtk-3.0/gtk-dark-solid-alt.css
+++ b/src/gtk-3.0/gtk-dark-solid-alt.css
@@ -1292,21 +1292,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #686868;
-  background-color: #498dff;
-  background-image: linear-gradient(180deg, #686868 0%, #686868 100%);
+  background-color: #0e6bff;
+  border-color: #0e6bff;
+  background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5311,6 +5322,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #dbe8ff;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
@@ -5319,19 +5335,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #242424;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #242424;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #498dff;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #242424;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5396,35 +5452,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #498dff;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #498dff;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-dark-solid.css b/src/gtk-3.0/gtk-dark-solid.css
index b913f6f..2f3cd48 100644
--- a/src/gtk-3.0/gtk-dark-solid.css
+++ b/src/gtk-3.0/gtk-dark-solid.css
@@ -1292,21 +1292,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #686868;
-  background-color: #498dff;
-  background-image: linear-gradient(180deg, #686868 0%, #686868 100%);
+  background-color: #0e6bff;
+  border-color: #0e6bff;
+  background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5323,6 +5334,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #dbe8ff;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
@@ -5331,19 +5347,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #242424;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #242424;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #498dff;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #242424;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5408,35 +5464,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #498dff;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #498dff;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index e5c906c..1879400 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -1292,21 +1292,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #686868;
-  background-color: #498dff;
-  background-image: linear-gradient(180deg, #686868 0%, #686868 100%);
+  background-color: #0e6bff;
+  border-color: #0e6bff;
+  background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5323,6 +5334,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #dbe8ff;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(255, 255, 255, 0.12);
 }
@@ -5331,19 +5347,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #242424;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #242424;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #498dff;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #242424;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5408,35 +5464,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #498dff;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #498dff;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-light-alt.css b/src/gtk-3.0/gtk-light-alt.css
index e9edf20..fd15036 100644
--- a/src/gtk-3.0/gtk-light-alt.css
+++ b/src/gtk-3.0/gtk-light-alt.css
@@ -1294,21 +1294,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #0e6bff;
-  background-color: #0046DB;
+  background-color: #0e6bff;
+  border-color: #0e6bff;
   background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5352,6 +5363,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #ccdaf8;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -5360,19 +5376,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #ffffff;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #0046DB;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #ffffff;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5437,35 +5493,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #0046DB;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #0046DB;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-light-solid-alt.css b/src/gtk-3.0/gtk-light-solid-alt.css
index 0c321c3..54e860d 100644
--- a/src/gtk-3.0/gtk-light-solid-alt.css
+++ b/src/gtk-3.0/gtk-light-solid-alt.css
@@ -1294,21 +1294,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #0e6bff;
-  background-color: #0046DB;
+  background-color: #0e6bff;
+  border-color: #0e6bff;
   background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5352,6 +5363,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #ccdaf8;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -5360,19 +5376,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #ffffff;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #0046DB;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #ffffff;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5437,35 +5493,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #0046DB;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #0046DB;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-light-solid.css b/src/gtk-3.0/gtk-light-solid.css
index 794011e..b380fb8 100644
--- a/src/gtk-3.0/gtk-light-solid.css
+++ b/src/gtk-3.0/gtk-light-solid.css
@@ -1294,21 +1294,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #0e6bff;
-  background-color: #0046DB;
+  background-color: #0e6bff;
+  border-color: #0e6bff;
   background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5352,6 +5363,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #ccdaf8;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -5360,19 +5376,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #ffffff;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #0046DB;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #ffffff;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5437,35 +5493,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #0046DB;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #0046DB;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index 868293d..ee30bda 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -1294,21 +1294,32 @@ spinbutton.vertical > entry:drop(active) + button {
 
 combobox button.combo {
   min-width: 0;
+  min-height: 20px;
   padding-left: 12px;
   padding-right: 12px;
 }
 
 combobox arrow {
+  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  min-height: 16px;
+  min-width: 16px;
+}
+
+.background combobox button.combo arrow {
   -gtk-icon-source: -gtk-scaled(url("assets/combobox-arrow.png"), url("assets/combobox-arrow@2.png"));
   min-height: 16px;
-  min-width: 20px;
+  min-width: 16px;
   padding: 0;
   margin: -1px -13px -1px -1px;
   border-radius: 0 5px 5px 0;
+  border-width: 1px;
+  border-style: solid;
+  border-left-style: none;
   color: #ffffff;
-  border: 1px solid #0e6bff;
-  background-color: #0046DB;
+  background-color: #0e6bff;
+  border-color: #0e6bff;
   background-image: linear-gradient(180deg, #4c97fe 0%, #0564e3 100%);
+  box-shadow: none;
 }
 
 .linked:not(.vertical) > combobox > box > button.combo arrow {
@@ -5352,6 +5363,11 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   color: #ccdaf8;
 }
 
+.nautilus-window {
+  background-color: transparent;
+  border-radius: 6px 6px 9px 9px;
+}
+
 .nautilus-window searchbar {
   border-top: 1px solid rgba(0, 0, 0, 0.12);
 }
@@ -5360,19 +5376,59 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   margin-top: -1px;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 6px 6px;
+.nautilus-window notebook {
+  margin-left: -1px;
+  margin-right: -1px;
+  background-color: #ffffff;
 }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
+.nautilus-window notebook tab {
+  margin-left: -1px;
+}
+
+.nautilus-window notebook scrolledwindow .view:not(:hover):not(:active):not(:selected) {
+  background-color: transparent;
+}
+
+.nautilus-window notebook, .nautilus-window notebook > stack {
+  border-radius: 0 0 9px 9px;
+}
+
+.nautilus-window notebook > stack:not(:only-child) searchbar {
+  background-color: #ffffff;
+}
+
+.nautilus-window .floating-bar {
+  padding: 1px;
+  background-color: #0046DB;
+  color: #ffffff;
+  border-radius: 3px 0 6px 0;
+}
+
+.nautilus-window .floating-bar.bottom.left {
+  border-top-left-radius: 0;
+}
+
+.nautilus-window .floating-bar.bottom.right {
+  border-top-right-radius: 0;
+}
+
+.nautilus-window .floating-bar button {
+  border: none;
+  border-radius: 100px;
+  min-height: 0;
+  min-width: 0;
+  padding: 0;
+  margin-right: 6px;
+  -gtk-icon-shadow: none;
+}
+
+.nautilus-window.maximized notebook, .nautilus-window.maximized notebook > stack {
   border-radius: 0 0 0 0;
 }
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: #ffffff;
+.nautilus-window.maximized .floating-bar {
+  border-radius: 3px 0 0 0;
 }
 
 .disk-space-display {
@@ -5437,35 +5493,6 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
   background-color: #0046DB;
 }
 
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: #0046DB;
-  color: #ffffff;
-  border-radius: 3px 0 4px 0;
-}
-
-.nautilus-window .floating-bar.bottom.left {
-  border-top-left-radius: 0;
-}
-
-.nautilus-window .floating-bar.bottom.right {
-  border-top-right-radius: 0;
-}
-
-.nautilus-window .floating-bar button {
-  border: none;
-  border-radius: 100px;
-  min-height: 0;
-  min-width: 0;
-  padding: 0;
-  margin-right: 6px;
-  -gtk-icon-shadow: none;
-}
-
-.nautilus-window.maximized .floating-bar {
-  border-radius: 3px 0 0 0;
-}
-
 .nemo-window .nemo-places-sidebar.frame {
   border-width: 0;
 }
diff --git a/src/gtk-3.0/sass/_applications.scss b/src/gtk-3.0/sass/_applications.scss
index f1d6773..a68c305 100644
--- a/src/gtk-3.0/sass/_applications.scss
+++ b/src/gtk-3.0/sass/_applications.scss
@@ -118,29 +118,76 @@ terminal-window,
   }
 }
 
+$nautilus_radius: $wm_radius + 3px;
+
 .nautilus-window {
+  background-color: transparent;
+  border-radius: $wm_radius $wm_radius $nautilus_radius $nautilus_radius;
+
   // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=724096
-  searchbar {
-    border-top: 1px solid $borders_color;
+  searchbar { border-top: 1px solid $borders_color; }
+  .searchbar-container { margin-top: -1px; }
+
+  notebook {
+    margin-left: -1px;
+    margin-right: -1px;
+    background-color: $base_color;
+
+    tab { margin-left: -1px; }
+
+    scrolledwindow {
+      .view:not(:hover):not(:active):not(:selected) {
+        background-color: transparent;
+        // @extend %view;
+      }
+    }
+
+    &, > stack {
+      border-radius: 0 0 $nautilus_radius $nautilus_radius;
+    }
+
+    > stack:not(:only-child) {
+      searchbar { background-color: $base_color; }
+    }
   }
-  .searchbar-container {
-    margin-top: -1px;
+
+  // Floating Bar
+  .floating-bar {
+    padding: 1px;
+    background-color: $selected_bg_color;
+    color: $selected_fg_color;
+    border-radius: 3px 0 $wm_radius 0;
+
+    &.bottom.left {
+      border-top-left-radius: 0;
+    }
+
+    &.bottom.right {
+      border-top-right-radius: 0;
+    }
+
+    button {
+      border: none;
+      border-radius: 100px;
+      min-height: 0;
+      min-width: 0;
+      padding: 0;
+      margin-right: 6px;
+      -gtk-icon-shadow: none;
+      @extend %selected-button;
+    }
   }
-}
 
-.nautilus-window notebook,
-.nautilus-window notebook > stack {
-  border-radius: 0 0 $wm_radius $wm_radius;
-}
+  // Reset maximized nautilus-window border-radius
+  &.maximized {
+    notebook {
+      &, > stack {
+        border-radius: 0 0 0 0;
+      }
+    }
 
-.nautilus-window.maximized notebook,
-.nautilus-window.maximized notebook > stack {
-  border-radius: 0 0 0 0;
-}
-
-.nautilus-window notebook,
-.nautilus-window notebook > stack:not(:only-child) searchbar {
-  background-color: $base_color;
+    .floating-bar { border-radius: 3px 0 0 0; }
+  }
 }
 
 button.nautilus-circular-button.image-button {
@@ -205,35 +252,6 @@ $disk_space_free: darken($bg_color, 3%);
   }
 }
 
-// Floating Bar
-.nautilus-window .floating-bar {
-  padding: 1px;
-  background-color: $selected_bg_color;
-  color: $selected_fg_color;
-  border-radius: 3px 0 $wm_radius - 2px 0;
-
-  &.bottom.left {
-    border-top-left-radius: 0;
-  }
-  &.bottom.right {
-    border-top-right-radius: 0;
-  }
-
-  button {
-    border: none;
-    border-radius: 100px;
-    min-height: 0;
-    min-width: 0;
-    padding: 0;
-    margin-right: 6px;
-    -gtk-icon-shadow: none;
-    @extend %selected-button;
-  }
-}
-
-// Reset maximized nautilus-window floating-bar border-radius
-.nautilus-window.maximized .floating-bar { border-radius: 3px 0 0 0; }
-
 //
 // Nemo
 //
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index 088be5a..8a9ec55 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -966,24 +966,31 @@ combobox {
   @extend %outline_dashed;
   button.combo {
     min-width: 0;       // otherwise the arrow placement is unsymmetric
+    min-height: 20px;
 //    margin: 0;
     padding-left: 12px;
     padding-right: 12px;
   }
+
   arrow {
+    -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
+    min-height: 16px;
+    min-width: 16px;
+  }
+
+  .background & button.combo arrow {
     -gtk-icon-source: -gtk-scaled(
                        url("assets/combobox-arrow.png"),
                        url("assets/combobox-arrow@2.png"));
     min-height: 16px;
-    min-width: 20px;
+    min-width: 16px;
     padding: 0;
     margin: -1px -13px -1px -1px;
     border-radius: 0 $bt_radius $bt_radius 0;
-    color: $selected_fg_color;
-    border: 1px solid if($variant=='light', $selection_mode_bg, #686868);
-    background-color: $selected_bg_color;
-    background-image: if($variant=='light', linear-gradient( 180deg, #4c97fe 0%, #0564e3 100%),
-                                            linear-gradient( 180deg, #686868 0%, #686868 100%));
+    border-width: 1px;
+    border-style: solid;
+    border-left-style: none;
+    @include button(active);
   }
 
   &:drop(active) button.combo { @extend button:drop(active); }