diff --git a/screenshots/theme-clearlooks-gtk3-page1.png b/screenshots/theme-clearlooks-gtk3-page1.png
index b79dcb642..fea779631 100644
Binary files a/screenshots/theme-clearlooks-gtk3-page1.png and b/screenshots/theme-clearlooks-gtk3-page1.png differ
diff --git a/screenshots/theme-clearlooks-gtk3-page2.png b/screenshots/theme-clearlooks-gtk3-page2.png
index 48eedab82..86cba683f 100644
Binary files a/screenshots/theme-clearlooks-gtk3-page2.png and b/screenshots/theme-clearlooks-gtk3-page2.png differ
diff --git a/screenshots/theme-clearlooks-gtk3-page3.png b/screenshots/theme-clearlooks-gtk3-page3.png
index c0195be47..d8e80149e 100644
Binary files a/screenshots/theme-clearlooks-gtk3-page3.png and b/screenshots/theme-clearlooks-gtk3-page3.png differ
diff --git a/screenshots/theme-clearlooks_hidpi-gtk3-page1.png b/screenshots/theme-clearlooks_hidpi-gtk3-page1.png
index 531865247..2db3b5eaa 100644
Binary files a/screenshots/theme-clearlooks_hidpi-gtk3-page1.png and b/screenshots/theme-clearlooks_hidpi-gtk3-page1.png differ
diff --git a/screenshots/theme-clearlooks_hidpi-gtk3-page2.png b/screenshots/theme-clearlooks_hidpi-gtk3-page2.png
index f940d43e4..86f52d8f2 100644
Binary files a/screenshots/theme-clearlooks_hidpi-gtk3-page2.png and b/screenshots/theme-clearlooks_hidpi-gtk3-page2.png differ
diff --git a/screenshots/theme-clearlooks_hidpi-gtk3-page3.png b/screenshots/theme-clearlooks_hidpi-gtk3-page3.png
index 91ac43b17..e7fc9bc17 100644
Binary files a/screenshots/theme-clearlooks_hidpi-gtk3-page3.png and b/screenshots/theme-clearlooks_hidpi-gtk3-page3.png differ
diff --git a/screenshots/theme-lavender-gtk3-page1.png b/screenshots/theme-lavender-gtk3-page1.png
index f759b81c8..b82c10292 100644
Binary files a/screenshots/theme-lavender-gtk3-page1.png and b/screenshots/theme-lavender-gtk3-page1.png differ
diff --git a/screenshots/theme-lavender-gtk3-page2.png b/screenshots/theme-lavender-gtk3-page2.png
index cd0729991..0a4c7eeb3 100644
Binary files a/screenshots/theme-lavender-gtk3-page2.png and b/screenshots/theme-lavender-gtk3-page2.png differ
diff --git a/screenshots/theme-lavender-gtk3-page3.png b/screenshots/theme-lavender-gtk3-page3.png
index 43597ae86..2f859e94a 100644
Binary files a/screenshots/theme-lavender-gtk3-page3.png and b/screenshots/theme-lavender-gtk3-page3.png differ
diff --git a/screenshots/theme-lavender_hidpi-gtk3-page1.png b/screenshots/theme-lavender_hidpi-gtk3-page1.png
index 08b35f775..b4445b66e 100644
Binary files a/screenshots/theme-lavender_hidpi-gtk3-page1.png and b/screenshots/theme-lavender_hidpi-gtk3-page1.png differ
diff --git a/screenshots/theme-lavender_hidpi-gtk3-page2.png b/screenshots/theme-lavender_hidpi-gtk3-page2.png
index be81b7dc7..835ecc8d4 100644
Binary files a/screenshots/theme-lavender_hidpi-gtk3-page2.png and b/screenshots/theme-lavender_hidpi-gtk3-page2.png differ
diff --git a/screenshots/theme-lavender_hidpi-gtk3-page3.png b/screenshots/theme-lavender_hidpi-gtk3-page3.png
index cec4e5aed..0a166d556 100644
Binary files a/screenshots/theme-lavender_hidpi-gtk3-page3.png and b/screenshots/theme-lavender_hidpi-gtk3-page3.png differ
diff --git a/screenshots/theme-monovedek_lcars-gtk3-page1.png b/screenshots/theme-monovedek_lcars-gtk3-page1.png
index 386161f2d..f265cf40b 100644
Binary files a/screenshots/theme-monovedek_lcars-gtk3-page1.png and b/screenshots/theme-monovedek_lcars-gtk3-page1.png differ
diff --git a/screenshots/theme-monovedek_lcars-gtk3-page2.png b/screenshots/theme-monovedek_lcars-gtk3-page2.png
index 4e606b4e9..d61cd69cc 100644
Binary files a/screenshots/theme-monovedek_lcars-gtk3-page2.png and b/screenshots/theme-monovedek_lcars-gtk3-page2.png differ
diff --git a/screenshots/theme-monovedek_lcars-gtk3-page3.png b/screenshots/theme-monovedek_lcars-gtk3-page3.png
index 18ec81920..6ae524db2 100644
Binary files a/screenshots/theme-monovedek_lcars-gtk3-page3.png and b/screenshots/theme-monovedek_lcars-gtk3-page3.png differ
diff --git a/screenshots/theme-monovedek_lcars_hidpi-gtk3-page1.png b/screenshots/theme-monovedek_lcars_hidpi-gtk3-page1.png
index 9123a066e..84a813d89 100644
Binary files a/screenshots/theme-monovedek_lcars_hidpi-gtk3-page1.png and b/screenshots/theme-monovedek_lcars_hidpi-gtk3-page1.png differ
diff --git a/screenshots/theme-monovedek_lcars_hidpi-gtk3-page2.png b/screenshots/theme-monovedek_lcars_hidpi-gtk3-page2.png
index 618891b66..dd7488474 100644
Binary files a/screenshots/theme-monovedek_lcars_hidpi-gtk3-page2.png and b/screenshots/theme-monovedek_lcars_hidpi-gtk3-page2.png differ
diff --git a/screenshots/theme-monovedek_lcars_hidpi-gtk3-page3.png b/screenshots/theme-monovedek_lcars_hidpi-gtk3-page3.png
index 28cad29c7..ca340e773 100644
Binary files a/screenshots/theme-monovedek_lcars_hidpi-gtk3-page3.png and b/screenshots/theme-monovedek_lcars_hidpi-gtk3-page3.png differ
diff --git a/src/gtk-3.20/scss/widgets/_button.scss b/src/gtk-3.20/scss/widgets/_button.scss
index e070bcc3f..c6b71f8bf 100644
--- a/src/gtk-3.20/scss/widgets/_button.scss
+++ b/src/gtk-3.20/scss/widgets/_button.scss
@@ -463,6 +463,10 @@ $button_sidepadding: $spacing + ($roundness / 14px * if($spacing > 0, $spacing,
         &:disabled { color: alpha($bg, .85); }
     }
 
+    separator {
+        background-image: image(mix($fg, $bg, .9));
+    }
+
 }
 
 @include exports("button") {
diff --git a/src/gtk-3.20/scss/widgets/_overshoot.scss b/src/gtk-3.20/scss/widgets/_overshoot.scss
index a46fc0743..47b3debab 100644
--- a/src/gtk-3.20/scss/widgets/_overshoot.scss
+++ b/src/gtk-3.20/scss/widgets/_overshoot.scss
@@ -92,6 +92,10 @@
 scrolledwindow {
     viewport.frame { // avoid double borders when viewport inside scrolled window
         border-style: none;
+
+        separator {
+            background-image: image(mix($text_color, $base_color, .9));
+        }
     }
 
     // This is used by GtkScrolledWindow, when content is touch-dragged past boundaries.
diff --git a/src/gtk-3.20/scss/widgets/_toolbar.scss b/src/gtk-3.20/scss/widgets/_toolbar.scss
index dd1d96acd..5ae723101 100644
--- a/src/gtk-3.20/scss/widgets/_toolbar.scss
+++ b/src/gtk-3.20/scss/widgets/_toolbar.scss
@@ -140,6 +140,10 @@
         padding: 0 6px;
         min-height: 42px;
 
+        separator {
+            background-image: image(mix($titlebar_fg_focused, $titlebar_bg_focused, .9));
+        }
+
         &:backdrop {
             @include linear-gradient($titlebar_bg_unfocused);
 
diff --git a/src/gtk-3.20/scss/widgets/_view.scss b/src/gtk-3.20/scss/widgets/_view.scss
index 8a93d4e25..f37263637 100644
--- a/src/gtk-3.20/scss/widgets/_view.scss
+++ b/src/gtk-3.20/scss/widgets/_view.scss
@@ -22,6 +22,10 @@
                 //border-radius: $roundness;
             }
         }
+
+        separator { // vbox and hbox separators
+            background-image: image(mix($text_color, $base_color, .9));
+        }
     }
 
     .view,
@@ -52,7 +56,7 @@
 @include exports("treeview") {
     .rubberband,
     rubberband {
-        border: 1px solid darken($selected_bg_color, .1);
+        border: 1px solid mix($selected_bg_color, $selected_fg_color, .1);
         background-color: transparentize(darken($selected_bg_color, .1), .8);
     }
 
@@ -105,8 +109,8 @@
         -GtkTreeView-tree-line-width: 1;
         -GtkTreeView-tree-line-pattern: "";
 
-        border-left-color: mix($fg_color, $base_color, .5); // this is actually the tree lines color,
-        border-top-color: $bg_color;                        // while this is the grid lines color, better then nothing
+        border-left-color: mix($fg_color, $base_color, .7); // this is actually the tree lines color,
+        border-top-color: mix($fg_color, $base_color, .9);                        // while this is the grid lines color
 
         rubberband { @extend rubberband; } // to avoid borders being overridden by the previously set props
 
@@ -306,7 +310,7 @@
 
 @include exports("separator") {
     separator { // vbox and hbox separators
-        background: transparentize($black, .9);
+        background-image: image(mix($fg_color, $bg_color, .9));
         min-width: 1px;
         min-height: 1px;
     }