diff --git a/gtk/gtk-default.css b/gtk/gtk-default.css
index 5f5f65188c..b8e1919974 100644
--- a/gtk/gtk-default.css
+++ b/gtk/gtk-default.css
@@ -746,71 +746,86 @@ GtkCalendar.button:hover {
 }
 
 /* Client side decorations */
-.titlebar > GtkLabel:backdrop {
-  color: darker (@bg_color);
-  text-shadow: none;
-}
-
-.titlebar GtkLabel {
-  font: Sans Bold 10;
+.titlebar {
   text-shadow: 1px 1px lighter (@bg_color);
+  background-image: linear-gradient(to bottom, white, @bg_color);
+  border-radius: 7px 7px 0px 0px;
 }
 
-.titlebar GtkButton:backdrop {
+.maximized .titlebar,
+.tiled .titlebar {
+  border-radius: 0;
+}
+
+.titlebar.default-decoration {
+  border: none;
+  box-shadow: none;
+}
+
+.titlebar .title {
+  font: Bold 10;
+}
+
+.titlebar .subtitle {
+  font: 9;
+}
+
+.titlebar:backdrop {
+  text-shadow: none;
+  background-image: none;
+  background-color: @bg_color;
+}
+
+.titlebar .titlebutton {
+  icon-shadow: 0px 1px #ffff;
+  color: shade(@fg_color, 1.8);
+  background: none;
+  padding: 5px 5px 6px 5px;
+
+  border-radius: 3px;
+  border-width: 1px 1px 2px 1px;
+  border-color: transparent;
+  border-style: solid;
+  border-image: none;
+}
+
+.titlebar .titlebutton:hover {
+  background-image: linear-gradient(to bottom, @bg_color, lighter (@bg_color));
+}
+
+.titlebar .titlebutton:backdrop {
   border-image: none;
   background-image: none;
 }
 
-.titlebar GtkButton GtkLabel:backdrop {
-  text-shadow: none;
-  color: darker (@bg_color);
+.titlebar .titlebutton:active {
+  background-image: linear-gradient(to bottom, #a7aba7, shade(@bg_color, 0.95));
+  color: @selected_fg_color;
+  icon-shadow: none;
 }
 
-.titlebar GtkButton GtkLabel {
-  font: Sans Bold 12;
-  color: white;
-  text-shadow: 0px 1px darker (darker (@bg_color));
-}
-
-.titlebar GtkButton {
-  border-style: none;
-  border-color: darker (@bg_color);
-
-  background-image: -gtk-gradient (linear, center top, center bottom,
-       from (@bg_color),
-       color-stop (0.5, darker (@bg_color)),
-       to (@bg_color));
-}
-
-.titlebar GtkButton:first-child {
-  border-radius: 10px 0px 0px 0px;
-}
-
-.titlebar GtkButton:last-child {
-  border-radius: 0px 10px 0px 0px;
-}
-
-.titlebar:backdrop {
+titlebar .titlebutton:backdrop {
   background-image: none;
+  color: #a7aba7;
+  border-image: none;
+  icon-shadow: none;
 }
 
-.titlebar {
-  background-image: -gtk-gradient (linear, center top, center bottom,
-       from (white),
-       to (@bg_color));
-  border-radius: 10px 10px 0px 0px;
-}
-
-.window-border {
+.window-frame {
   border-color: darker (@bg_color);
-  border-radius: 10px;
-  border-width: 2px;
+  border-radius: 7px 7px 0 0;
+  border-width: 1px;
   border-style: solid;
+
+  box-shadow: 0 2px 8px 3px alpha(black, 0.5);
+  margin: 10px;
 }
 
-.window-outer-border {
-  border-color: transparent;
-  border-radius: 10px;
-  border-width: 10px 10px 10px 10px;
-  border-style: solid;
+.window-frame.tiled {
+  border-radius: 0;
+  background-color: @bg_color;
+}
+
+window-frame:backdrop {
+  box-shadow: 0 2px 5px 1px alpha(black, 0.5);
 }