diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss
index c0a3fc3..8ed25e1 100644
--- a/common/gtk-3.0/3.16/_common.scss
+++ b/common/gtk-3.0/3.16/_common.scss
@@ -1630,7 +1630,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   &.header {
     // FIXME: double borders in some case, can't fix it w/o a class tho
     // FIXME: doesn't work on dark var
-    background-color: $base_color;
+    background-color: mix($base_color, $bg_color, 50%);
 
     // this is the shading of the header behind the tabs
     &.frame {
@@ -1701,8 +1701,8 @@ column-header.button.dnd { // for treeview-like derive widgets
           border-width: 1px;
           border-#{$_tab}-width: 0;
           border-color: $borders_color;
-          background-color: if($variant == 'light', transparentize(black, 0.98), transparentize(black, 0.9));
-          &:hover { background-color: if($variant == 'light', transparentize(black, 0.98), transparentize(black, 0.9)); }
+          background-color: if($variant == 'light', transparentize(black, 0.965), transparentize(black, 0.9));
+          &:hover { background-color: if($variant == 'light', transparentize(black, 0.965), transparentize(black, 0.9)); }
         }
       }
     }
@@ -2683,13 +2683,13 @@ GtkVolumeButton.button { padding: 8px; }
   // see bug #722563
   $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.35));
 
-  box-shadow: 0 0 0 1px if($darker=='true', transparentize(black, 0.4), $_wm_border), 0 4px 8px 1px $_wm_border;
+  box-shadow: 0 0 0 1px if($darker=='true', darken($header_bg, 7%), $_wm_border), 0 4px 8px 1px $_wm_border;
 
   /* this is used for the resize cursor area */
   margin: 10px;
 
   &:backdrop {
-    box-shadow: 0 0 0 1px if($darker=='true', transparentize(black, 0.4), $_wm_border), 0 4px 5px 2px $_wm_border;
+    box-shadow: 0 0 0 1px if($darker=='true', darken($header_bg, 7%), $_wm_border), 0 4px 5px 2px $_wm_border;
   }
   &.tiled {
     border-radius: 0;
@@ -2697,7 +2697,7 @@ GtkVolumeButton.button { padding: 8px; }
   // server-side decorations as used by mutter
   &.ssd {
     border-radius: 4px 4px 0 0;
-    box-shadow: 0 0 0 1px if($darker=='true', transparentize(black, 0.4), $_wm_border);
+    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 7eb6e73..260da43 100644
--- a/common/gtk-3.0/3.16/assets.svg
+++ b/common/gtk-3.0/3.16/assets.svg
@@ -25,8 +25,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="2.8284271"
-     inkscape:cx="210.11124"
-     inkscape:cy="175.74821"
+     inkscape:cx="95.047904"
+     inkscape:cy="225.08118"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -2266,7 +2266,7 @@
            inkscape:connector-curvature="0"
            d="m 1373,254 0,2 6,0 0,-2 z"
            id="rect9057-4-3"
-           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.5;fill:#525d76;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:#70788d;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
            sodipodi:nodetypes="ccccc" />
       </g>
       <rect
@@ -2695,7 +2695,7 @@
         </g>
         <path
            id="path4293-5-95"
-           style="display:inline;opacity:0.5;fill:#525d76;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="display:inline;opacity:0.8;fill:#70788d;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" />
@@ -2863,7 +2863,7 @@
                sodipodi:nodetypes="csscccsscc"
                inkscape:connector-curvature="0"
                d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384"
-               style="opacity:0.8;fill:#525d76;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               style="opacity:0.99999999;fill:#70788d;fill-opacity:1;fill-rule:evenodd;stroke:none"
                id="path4293-6" />
           </g>
         </g>
@@ -2947,7 +2947,7 @@
              id="layer12-45-6">
             <path
                sodipodi:nodetypes="ccccc"
-               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:#525d76;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.99999999;fill:#70788d;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
                id="rect9057-8"
                d="m 86.0002,974 0,2 6,0 0,-2 z"
                inkscape:connector-curvature="0" />
@@ -3277,7 +3277,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"
-                   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.5;fill:#525d76;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:#70788d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
               </g>
             </g>
           </g>
@@ -3335,7 +3335,7 @@
         </g>
         <path
            id="path4293-5"
-           style="display:inline;opacity:0.5;fill:#525d76;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="display:inline;opacity:0.65;fill:#70788d;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" />
@@ -3382,7 +3382,7 @@
            inkscape:connector-curvature="0"
            d="m 1373,254 0,2 6,0 0,-2 z"
            id="rect9057-4"
-           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.5;fill:#525d76;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:#70788d;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
            sodipodi:nodetypes="ccccc" />
       </g>
       <rect
@@ -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: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:1;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
            sodipodi:nodetypes="ccccc" />
       </g>
       <rect
@@ -6029,7 +6029,7 @@
         </g>
         <path
            id="path4293-5-95-1-7"
-           style="display:inline;opacity:0.7;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="display:inline;opacity:1;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" />
@@ -6199,7 +6199,7 @@
                sodipodi:nodetypes="csscccsscc"
                inkscape:connector-curvature="0"
                d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384"
-               style="opacity:0.8;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               style="opacity:1;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none"
                id="path4293-6-7-1" />
           </g>
         </g>
@@ -6284,7 +6284,7 @@
              id="layer12-45-6-2-7">
             <path
                sodipodi:nodetypes="ccccc"
-               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"
+               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"
                id="rect9057-8-2-3"
                d="m 86.0002,974 0,2 6,0 0,-2 z"
                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.6;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.7;fill:#afb8c5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
               </g>
             </g>
           </g>
@@ -6675,7 +6675,7 @@
         </g>
         <path
            id="path4293-5-6-4"
-           style="display:inline;opacity:0.6;fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="display:inline;opacity:0.7;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" />
@@ -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.6;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.7;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 1533220..13f3a92 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 7886f3d..49277b2 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-close-backdrop.png b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop.png
index e0e5654..54690f3 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop@2.png b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop@2.png
index dfe5e61..01f61f0 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-close-backdrop@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 60acb6d..bfab0e0 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 507b1d3..e376a21 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-backdrop.png b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop.png
index fc40744..9440671 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop@2.png
index 88e3fb5..523fffc 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-backdrop@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 3824664..1c05063 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 8a933df..def9570 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 186ad3f..b2dabdd 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 fa908c5..4bd103d 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-max-hover.png b/common/gtk-3.0/3.16/assets/titlebutton-max-hover.png
index 3362698..1610b34 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-hover.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-hover.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max-hover@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max-hover@2.png
index 7b8cb1b..6a467da 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max-hover@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max-hover@2.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max.png b/common/gtk-3.0/3.16/assets/titlebutton-max.png
index 6bb22ed..d54043f 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max.png and b/common/gtk-3.0/3.16/assets/titlebutton-max.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-max@2.png b/common/gtk-3.0/3.16/assets/titlebutton-max@2.png
index 13d1e73..3e9373e 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-max@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-max@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 63982df..51cb3af 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 6c38f1d..f93a4a3 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-backdrop.png b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop.png
index a83a5e5..de62aa1 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop@2.png
index 20a41a4..434b817 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-backdrop@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 ceb6ba4..a772c8f 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 6299121..233c1e0 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 208588e..1ce66fd 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 e1c3147..04aacc9 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/assets/titlebutton-min-hover.png b/common/gtk-3.0/3.16/assets/titlebutton-min-hover.png
index 24ee141..8d6b6c3 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-hover.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-hover.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min-hover@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min-hover@2.png
index f6c8c3d..f122bb3 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min-hover@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min-hover@2.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min.png b/common/gtk-3.0/3.16/assets/titlebutton-min.png
index f4afc8c..029627d 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min.png and b/common/gtk-3.0/3.16/assets/titlebutton-min.png differ
diff --git a/common/gtk-3.0/3.16/assets/titlebutton-min@2.png b/common/gtk-3.0/3.16/assets/titlebutton-min@2.png
index 8d683d4..2febb1e 100644
Binary files a/common/gtk-3.0/3.16/assets/titlebutton-min@2.png and b/common/gtk-3.0/3.16/assets/titlebutton-min@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 d310b2f..f47ab43 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -1290,7 +1290,7 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #292D33; }
+    background-color: #2c3037; }
     .notebook.header.frame {
       border: 1px solid #1d2024; }
       .notebook.header.frame.top {
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 97ea110..7b8fac4 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -1291,7 +1291,7 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #ffffff; }
+    background-color: #fcfcfd; }
     .notebook.header.frame {
       border: 1px solid #dde3e9; }
       .notebook.header.frame.top {
@@ -1335,9 +1335,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-top-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.bottom, .notebook tab.bottom {
       border-color: transparent; }
       .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page {
@@ -1349,9 +1349,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-bottom-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.right, .notebook tab.right {
       border-color: transparent; }
       .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page {
@@ -1363,9 +1363,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-right-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.left, .notebook tab.left {
       border-color: transparent; }
       .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page {
@@ -1377,9 +1377,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-left-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab GtkLabel {
       padding: 0 2px;
       color: rgba(92, 97, 108, 0.55); }
@@ -2178,16 +2178,16 @@ GtkVolumeButton.button {
 .window-frame {
   border-radius: 4px 4px 0 0;
   border-width: 0px;
-  box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.6), 0 4px 8px 1px rgba(0, 0, 0, 0.1);
+  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 */
   margin: 10px; }
   .window-frame:backdrop {
-    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.6), 0 4px 5px 2px rgba(0, 0, 0, 0.1); }
+    box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.95), 0 4px 5px 2px rgba(0, 0, 0, 0.1); }
   .window-frame.tiled {
     border-radius: 0; }
   .window-frame.ssd {
     border-radius: 4px 4px 0 0;
-    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.6); }
+    box-shadow: 0 0 0 1px rgba(31, 34, 39, 0.95); }
     .window-frame.ssd.maximized {
       border-radius: 0; }
   .window-frame.csd.popup, .window-frame.csd.menu {
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 ac4a391..2ec8dc4 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
@@ -1290,7 +1290,7 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #292D33; }
+    background-color: #2c3037; }
     .notebook.header.frame {
       border: 1px solid #1d2024; }
       .notebook.header.frame.top {
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index e674005..60f2847 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -1290,7 +1290,7 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #ffffff; }
+    background-color: #fcfcfd; }
     .notebook.header.frame {
       border: 1px solid #dde3e9; }
       .notebook.header.frame.top {
@@ -1334,9 +1334,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-top-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.bottom, .notebook tab.bottom {
       border-color: transparent; }
       .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page {
@@ -1348,9 +1348,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-bottom-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.right, .notebook tab.right {
       border-color: transparent; }
       .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page {
@@ -1362,9 +1362,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-right-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.left, .notebook tab.left {
       border-color: transparent; }
       .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page {
@@ -1376,9 +1376,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-left-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab GtkLabel {
       padding: 0 2px;
       color: rgba(92, 97, 108, 0.55); }
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 4f38aa1..49793e9 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -1290,7 +1290,7 @@ column-header .button, column-header .button:hover, column-header .button:active
     .notebook.frame.left {
       border-left-width: 0; }
   .notebook.header {
-    background-color: #ffffff; }
+    background-color: #fcfcfd; }
     .notebook.header.frame {
       border: 1px solid #dde3e9; }
       .notebook.header.frame.top {
@@ -1334,9 +1334,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-top-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.top:active:hover, .notebook tab.reorderable-page.top.active-page:hover, .notebook tab.reorderable-page.top.active-page:hover:hover, .notebook tab.top:active:hover, .notebook tab.top.active-page:hover, .notebook tab.top.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.bottom, .notebook tab.bottom {
       border-color: transparent; }
       .notebook tab.reorderable-page.bottom:hover, .notebook tab.reorderable-page.bottom.prelight-page, .notebook tab.bottom:hover, .notebook tab.bottom.prelight-page {
@@ -1348,9 +1348,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-bottom-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.bottom:active:hover, .notebook tab.reorderable-page.bottom.active-page:hover, .notebook tab.reorderable-page.bottom.active-page:hover:hover, .notebook tab.bottom:active:hover, .notebook tab.bottom.active-page:hover, .notebook tab.bottom.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.right, .notebook tab.right {
       border-color: transparent; }
       .notebook tab.reorderable-page.right:hover, .notebook tab.reorderable-page.right.prelight-page, .notebook tab.right:hover, .notebook tab.right.prelight-page {
@@ -1362,9 +1362,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-right-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.right:active:hover, .notebook tab.reorderable-page.right.active-page:hover, .notebook tab.reorderable-page.right.active-page:hover:hover, .notebook tab.right:active:hover, .notebook tab.right.active-page:hover, .notebook tab.right.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab.reorderable-page.left, .notebook tab.left {
       border-color: transparent; }
       .notebook tab.reorderable-page.left:hover, .notebook tab.reorderable-page.left.prelight-page, .notebook tab.left:hover, .notebook tab.left.prelight-page {
@@ -1376,9 +1376,9 @@ column-header .button, column-header .button:hover, column-header .button:active
         border-width: 1px;
         border-left-width: 0;
         border-color: #dde3e9;
-        background-color: rgba(0, 0, 0, 0.02); }
+        background-color: rgba(0, 0, 0, 0.035); }
         .notebook tab.reorderable-page.left:active:hover, .notebook tab.reorderable-page.left.active-page:hover, .notebook tab.reorderable-page.left.active-page:hover:hover, .notebook tab.left:active:hover, .notebook tab.left.active-page:hover, .notebook tab.left.active-page:hover:hover {
-          background-color: rgba(0, 0, 0, 0.02); }
+          background-color: rgba(0, 0, 0, 0.035); }
     .notebook tab GtkLabel {
       padding: 0 2px;
       color: rgba(92, 97, 108, 0.55); }