diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 12db562..6f07f8c 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -1827,11 +1827,11 @@ GtkColorButton.button {
 }
 
 .header-bar .button.text-button {
-    padding: 2px 4px;
+    padding: 4px;
 }
 
 .header-bar .button.image-button {
-    padding: 4px 3px 3px 4px;
+    padding: 6px;
 }
 
 .header-bar .title {
@@ -3014,11 +3014,8 @@ GtkBubbleWindow .toolbar {
 }
 
 .titlebar .titlebutton {
-    border-width: 1px 1px 2px 1px;
-    border-style: solid;
-    border-color: transparent;
-    border-radius: 2px;
-    padding: 4px 4px 5px 4px;
+    border-style: none;
+    padding: 4px;
     background: none;
     color: @theme_fg_color;
 }
@@ -3028,9 +3025,11 @@ GtkBubbleWindow .toolbar {
     color: @theme_selected_bg_color;
 }
 
-.titlebar .titlebutton:active {
+.titlebar .titlebutton:active,
+.titlebar .titlebutton:active:hover {
     background: none;
     color: shade(@theme_selected_bg_color, 0.9);
+    box-shadow: none;
 }
 
 /*
@@ -3055,16 +3054,16 @@ GtkBubbleWindow .toolbar {
 }
 
 .window-frame {
-    border-width: 1px;
-    border-style: solid;
-    border-color: darker(@theme_bg_color);
+    border-style: none;
     border-radius: 2px 2px 0 0;
-    box-shadow: 0 2px 8px 3px alpha(black, 0.7);
+    box-shadow: 0 0 0 1px alpha(black, 0.2),
+                0 3px 6px alpha(black, 0.7);
 
     /* this is used for the resize cursor area */
     margin: 10px;
 }
 
 .window-frame:backdrop {
-    box-shadow: 0 2px 5px 1px alpha(black, 0.7);
+    box-shadow: 0 0 0 1px alpha(black, 0.2),
+                0 3px 4px alpha(black, 0.5);
 }