7 files changed, 28 insertions, 15 deletions
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 76d3b65..bbc4fee 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -2785,8 +2785,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: #dceaf9; }
 
 .nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #2b2e39; }
+  border-top: 1px solid #2b2e39; }
+
+.nautilus-window .searchbar-container {
+  margin-top: -1px; }
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 3105645..230f506 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -2784,8 +2784,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: #dceaf9; }
 
 .nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #dcdfe3; }
+  border-top: 1px solid #dcdfe3; }
+
+.nautilus-window .searchbar-container {
+  margin-top: -1px; }
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index fe9e4c5..11d3756 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -2785,8 +2785,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: #dceaf9; }
 
 .nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #2b2e39; }
+  border-top: 1px solid #2b2e39; }
+
+.nautilus-window .searchbar-container {
+  margin-top: -1px; }
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index da77e21..cf53a35 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -2784,8 +2784,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: #dceaf9; }
 
 .nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #dcdfe3; }
+  border-top: 1px solid #dcdfe3; }
+
+.nautilus-window .searchbar-container {
+  margin-top: -1px; }
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 512312a..e717f54 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -2788,8 +2788,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: #dceaf9; }
 
 .nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #dcdfe3; }
+  border-top: 1px solid #dcdfe3; }
+
+.nautilus-window .searchbar-container {
+  margin-top: -1px; }
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 4547d7b..4aacb66 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -2788,8 +2788,10 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
     color: #dceaf9; }
 
 .nautilus-window searchbar {
-  border-color: transparent;
-  box-shadow: inset 0 -1px #dcdfe3; }
+  border-top: 1px solid #dcdfe3; }
+
+.nautilus-window .searchbar-container {
+  margin-top: -1px; }
 
 .nautilus-window notebook,
 .nautilus-window notebook > stack:not(:only-child) searchbar {
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 01315ce..90c29e0 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -88,10 +88,11 @@
   &:selected, &:selected:focus { color: mix($selected_fg_color, $selected_bg_color, 80%); }
 }
 
-.nautilus-window searchbar {
+.nautilus-window {
   // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=724096
-  border-color: transparent;
-  box-shadow: inset 0 -1px $borders_color;
+
+  searchbar { border-top: 1px solid $borders_color; }
+  .searchbar-container { margin-top: -1px; }
 }
 
 .nautilus-window notebook,