diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 9f00960..bb3b564 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -3039,6 +3039,7 @@ GtkBubbleWindow .toolbar {
     border-radius: 2px 2px 0 0;
     background-image: none;
     background-color: @toolbar_bg_color;
+    color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.1);
     text-shadow: none;
 }
 
@@ -3058,6 +3059,7 @@ GtkBubbleWindow .toolbar {
 .titlebar:backdrop {
     background-image: none;
     background-color: @toolbar_bg_color;
+    color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.4);
     text-shadow: none;
 }
 
@@ -3066,6 +3068,7 @@ GtkBubbleWindow .toolbar {
     border-style: none;
     background: none;
     color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.4);
+    icon-shadow: none;
 }
 
 .titlebar .titlebutton:hover,
@@ -3100,14 +3103,20 @@ GtkBubbleWindow .toolbar {
 .titlebar .titlebutton:backdrop {
     background-image: none;
     color: mix(@toolbar_fg_color, @toolbar_bg_color, 0.6);
+    icon-shadow: none;
 }
 
 .window-frame {
     border-style: none;
     border-radius: 2px 2px 0 0;
-    box-shadow: 0 0 0 1px alpha(black, 0.2),
-                0 3px 7px alpha(black, 0.7);
+    box-shadow: 0 3px 7px 1px alpha(black, 0.7),
+                0 0 0 1px mix(shade(@toolbar_bg_color, 0.7), @toolbar_fg_color, 0.21);
 
     /* this is used for the resize cursor area */
     margin: 10px;
 }
+
+.window-frame:backdrop {
+    box-shadow: 0 3px 5px 1px alpha(black, 0.5),
+                0 0 0 1px mix(shade(@toolbar_bg_color, 0.7), @toolbar_fg_color, 0.12);
+}