diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss
index 8ed25e1..d2b0d66 100644
--- a/common/gtk-3.0/3.16/_common.scss
+++ b/common/gtk-3.0/3.16/_common.scss
@@ -1135,7 +1135,7 @@ GtkComboBox {
 .titlebar {
   padding-left: 7px;
   padding-right: 7px;
-  border-radius: 4px 4px 0 0;
+  border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0);
   color: $header_fg;
   background-color: opacify($header_bg, 1);
   box-shadow: inset 0  1px lighten($header_bg, 3%);
@@ -2675,7 +2675,7 @@ GtkVolumeButton.button { padding: 8px; }
  *********************/
 
 .window-frame {
-  border-radius: 4px 4px 0 0;
+  border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0);
   // lamefun trick to get rounded borders regardless of CSD use
   border-width: 0px;
 
@@ -2696,7 +2696,7 @@ GtkVolumeButton.button { padding: 8px; }
   }
   // server-side decorations as used by mutter
   &.ssd {
-    border-radius: 4px 4px 0 0;
+    border-radius: if($darker=='false' and $variant=='light', 4px 4px 0 0, 3px 3px 0 0);
     box-shadow: 0 0 0 1px if($darker=='true', darken($header_bg, 7%), $_wm_border);
 
     &.maximized { border-radius: 0; }
diff --git a/common/gtk-3.0/3.16/assets.svg b/common/gtk-3.0/3.16/assets.svg
index 260da43..a7f1cde 100644
--- a/common/gtk-3.0/3.16/assets.svg
+++ b/common/gtk-3.0/3.16/assets.svg
@@ -24,9 +24,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="95.047904"
-     inkscape:cy="225.08118"
+     inkscape:zoom="8"
+     inkscape:cx="142.91558"
+     inkscape:cy="42.649419"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -5633,7 +5633,7 @@
          y="-168.63782" />
     </g>
     <rect
-       style="display:inline;fill:#272a30;fill-opacity:1;stroke:#222529;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="display:inline;fill:#2f343b;fill-opacity:1;stroke:#222529;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect11783-3-1"
        width="120.99998"
        height="138"
@@ -5877,7 +5877,7 @@
       <ellipse
          cy="-177.63782"
          cx="595"
-         style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.85;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path4068-7-5-9-6-7-2-47-2"
          rx="6"
          ry="6.0000005" />
@@ -5898,7 +5898,7 @@
            inkscape:connector-curvature="0"
            d="m 1373,254 0,2 6,0 0,-2 z"
            id="rect9057-4-3-8-5"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.8;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
            sodipodi:nodetypes="ccccc" />
       </g>
       <rect
@@ -5909,7 +5909,7 @@
          id="rect17883-32-6-9"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
       <path
-         style="display:inline;opacity:1;fill:#141619;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.95;fill:#181b1f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          d="m 595,-184.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
          id="path4068-7-5-9-6-7-2-5-3-9"
          inkscape:connector-curvature="0" />
@@ -6005,12 +6005,12 @@
       <ellipse
          cy="-177.63782"
          cx="624"
-         style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.85;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path4068-7-5-9-6-7-2-6-0-6"
          rx="6"
          ry="6.0000005" />
       <path
-         style="display:inline;opacity:1;fill:#141619;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.95;fill:#181b1f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          d="m 624,-184.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
          id="path4068-7-5-9-6-7-2-5-2-0-6"
          inkscape:connector-curvature="0" />
@@ -6029,7 +6029,7 @@
         </g>
         <path
            id="path4293-5-95-1-7"
-           style="display:inline;opacity:1;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="display:inline;opacity:0.8;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none"
            d="m 1403.7995,252 3.3818,0 c 0.4503,0 0.8162,0.36847 0.8187,0.8188 l 0,3.3817 z m 2.4074,6.00692 -3.395,0 c -0.4504,0 -0.8188,-0.36842 -0.8188,-0.81875 l 0,-3.39509 4.2138,4.21384"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="csscccsscc" />
@@ -6137,7 +6137,7 @@
         <ellipse
            cy="255"
            cx="1302"
-           style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.9;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path4068-7-5-9-6-7-2-4-6-6"
            rx="6"
            ry="6.0000005" />
@@ -6224,7 +6224,7 @@
         <ellipse
            cy="255"
            cx="1273"
-           style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.9;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path4068-7-5-9-6-7-2-1-6-1"
            rx="6"
            ry="6.0000005" />
@@ -6576,12 +6576,12 @@
         <ellipse
            cy="255"
            cx="1331"
-           style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.9;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path4068-7-5-9-6-7-2-2-3-4"
            rx="6"
            ry="6.0000005" />
         <path
-           style="display:inline;opacity:1;fill:#141619;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.95;fill:#181b1f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 1331,248 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
            id="path4068-7-5-9-6-7-2-5-8-1-4"
            inkscape:connector-curvature="0" />
@@ -6617,7 +6617,7 @@
                    inkscape:connector-curvature="0"
                    d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
                    id="path10839-9-2-8-6"
-                   style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#afb8c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
+                   style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.65;fill:#afb8c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
               </g>
             </g>
           </g>
@@ -6651,12 +6651,12 @@
       <ellipse
          cy="-160.63782"
          cx="624"
-         style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.9;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path4068-7-5-9-6-7-2-84-0-6"
          rx="6"
          ry="6.0000005" />
       <path
-         style="display:inline;opacity:1;fill:#141619;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.95;fill:#181b1f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          d="m 624,-167.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
          id="path4068-7-5-9-6-7-2-5-7-6-7"
          inkscape:connector-curvature="0" />
@@ -6675,7 +6675,7 @@
         </g>
         <path
            id="path4293-5-6-4"
-           style="display:inline;opacity:0.7;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="display:inline;opacity:0.65;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none"
            d="m 1403.7995,252 3.3818,0 c 0.4503,0 0.8162,0.36847 0.8187,0.8188 l 0,3.3817 z m 2.4074,6.00692 -3.395,0 c -0.4504,0 -0.8188,-0.36842 -0.8188,-0.81875 l 0,-3.39509 4.2138,4.21384"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="csscccsscc" />
@@ -6696,12 +6696,12 @@
       <ellipse
          cy="-160.63782"
          cx="595"
-         style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.9;fill:#262a30;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path4068-7-5-9-6-7-2-60-3-2"
          rx="6"
          ry="6.0000005" />
       <path
-         style="display:inline;opacity:1;fill:#141619;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.95;fill:#181b1f;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          d="m 595,-167.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
          id="path4068-7-5-9-6-7-2-5-4-4-4"
          inkscape:connector-curvature="0" />
@@ -6722,7 +6722,7 @@
            inkscape:connector-curvature="0"
            d="m 1373,254 0,2 6,0 0,-2 z"
            id="rect9057-4-09-2"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.65;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
            sodipodi:nodetypes="ccccc" />
       </g>
       <rect
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-darker.png b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-darker.png
index 13f3a92..bf5cba7 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-darker.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-darker.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-darker@2.png b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-darker@2.png
index 49277b2..6c3d5e3 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-darker@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop-darker@2.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-darker.png b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-darker.png
index bfab0e0..d4f7166 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-darker.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-darker.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-darker@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-darker@2.png
index e376a21..1945796 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-darker@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop-darker@2.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-darker.png b/common/gtk-3.0/3.16/assets/titlebutton-max-darker.png
index 1c05063..dccb307 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-darker.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-darker.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-darker@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max-darker@2.png
index def9570..225ca11 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-darker@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-darker@2.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-hover-darker.png b/common/gtk-3.0/3.16/assets/titlebutton-max-hover-darker.png
index b2dabdd..4504709 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-hover-darker.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-hover-darker.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-hover-darker@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max-hover-darker@2.png
index 4bd103d..e910d0b 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-hover-darker@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-hover-darker@2.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-darker.png b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-darker.png
index 51cb3af..751f194 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-darker.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-darker.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-darker@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-darker@2.png
index f93a4a3..20bf7c4 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-darker@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop-darker@2.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-darker.png b/common/gtk-3.0/3.16/assets/titlebutton-min-darker.png
index a772c8f..b4ab5f7 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-darker.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-darker.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-darker@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min-darker@2.png
index 233c1e0..7cc4467 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-darker@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-darker@2.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-hover-darker.png b/common/gtk-3.0/3.16/assets/titlebutton-min-hover-darker.png
index 1ce66fd..a7859cc 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-hover-darker.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-hover-darker.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-hover-darker@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min-hover-darker@2.png
index 04aacc9..57bf18e 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-hover-darker@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-hover-darker@2.png differ
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 3928299..fdb1132 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -859,7 +859,7 @@ GtkComboBox {
 .titlebar {
   padding-left: 7px;
   padding-right: 7px;
-  border-radius: 4px 4px 0 0;
+  border-radius: 3px 3px 0 0;
   color: rgba(207, 218, 231, 0.8);
   background-color: #25282e;
   box-shadow: inset 0 1px rgba(44, 47, 54, 0.96); }
@@ -2175,7 +2175,7 @@ GtkVolumeButton.button {
  * Window Decorations *
  *********************/
 .window-frame {
-  border-radius: 4px 4px 0 0;
+  border-radius: 3px 3px 0 0;
   border-width: 0px;
   box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65), 0 4px 8px 1px rgba(0, 0, 0, 0.65);
   /* this is used for the resize cursor area */
@@ -2185,7 +2185,7 @@ GtkVolumeButton.button {
   .window-frame.tiled {
     border-radius: 0; }
   .window-frame.ssd {
-    border-radius: 4px 4px 0 0;
+    border-radius: 3px 3px 0 0;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); }
     .window-frame.ssd.maximized {
       border-radius: 0; }
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 7e94cdb..faf2afc 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -859,7 +859,7 @@ GtkComboBox {
 .titlebar {
   padding-left: 7px;
   padding-right: 7px;
-  border-radius: 4px 4px 0 0;
+  border-radius: 3px 3px 0 0;
   color: rgba(207, 218, 231, 0.8);
   background-color: #2f343b;
   box-shadow: inset 0 1px rgba(54, 60, 68, 0.95); }
@@ -2176,7 +2176,7 @@ GtkVolumeButton.button {
  * Window Decorations *
  *********************/
 .window-frame {
-  border-radius: 4px 4px 0 0;
+  border-radius: 3px 3px 0 0;
   border-width: 0px;
   box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.95), 0 4px 8px 1px rgba(0, 0, 0, 0.1);
   /* this is used for the resize cursor area */
@@ -2186,7 +2186,7 @@ GtkVolumeButton.button {
   .window-frame.tiled {
     border-radius: 0; }
   .window-frame.ssd {
-    border-radius: 4px 4px 0 0;
+    border-radius: 3px 3px 0 0;
     box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.95); }
     .window-frame.ssd.maximized {
       border-radius: 0; }
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index 31815a3..63b8859 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -859,7 +859,7 @@ GtkComboBox {
 .titlebar {
   padding-left: 7px;
   padding-right: 7px;
-  border-radius: 4px 4px 0 0;
+  border-radius: 3px 3px 0 0;
   color: rgba(207, 218, 231, 0.8);
   background-color: #25282e;
   box-shadow: inset 0 1px #2c2f36; }
@@ -2175,7 +2175,7 @@ GtkVolumeButton.button {
  * Window Decorations *
  *********************/
 .window-frame {
-  border-radius: 4px 4px 0 0;
+  border-radius: 3px 3px 0 0;
   border-width: 0px;
   box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65), 0 4px 8px 1px rgba(0, 0, 0, 0.65);
   /* this is used for the resize cursor area */
@@ -2185,7 +2185,7 @@ GtkVolumeButton.button {
   .window-frame.tiled {
     border-radius: 0; }
   .window-frame.ssd {
-    border-radius: 4px 4px 0 0;
+    border-radius: 3px 3px 0 0;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.65); }
     .window-frame.ssd.maximized {
       border-radius: 0; }