41 files changed, 90 insertions, 99 deletions

diff --git a/common/gtk-3.0/3.18/assets.svg b/common/gtk-3.0/3.18/assets.svg
index b1ca40c..db616b6 100644
--- a/common/gtk-3.0/3.18/assets.svg
+++ b/common/gtk-3.0/3.18/assets.svg
@@ -24,9 +24,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="176.38504"
-     inkscape:cy="151.27384"
+     inkscape:zoom="4"
+     inkscape:cx="117.91346"
+     inkscape:cy="193.93448"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -2239,7 +2239,7 @@
      style="display:inline"
      transform="translate(8.000005,285.63782)">
     <g
-       id="titlebutton-min"
+       id="titlebutton-minimize"
        inkscape:label="#g6247"
        transform="translate(-471,-43)"
        style="opacity:0.8">
@@ -2652,7 +2652,7 @@
          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:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
     <g
-       id="titlebutton-max"
+       id="titlebutton-maximize"
        inkscape:label="#g6234"
        transform="translate(-480,-43)"
        style="opacity:0.8">
@@ -2765,7 +2765,7 @@
          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:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
     <g
-       id="titlebutton-max-hover"
+       id="titlebutton-maximize-hover"
        inkscape:label="#g6284"
        transform="translate(-377,-9)">
       <g
@@ -2851,7 +2851,7 @@
          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" />
     </g>
     <g
-       id="titlebutton-min-hover"
+       id="titlebutton-minimize-hover"
        inkscape:label="#g6308"
        transform="translate(-368,-9)">
       <g
@@ -3019,7 +3019,7 @@
          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" />
     </g>
     <g
-       id="titlebutton-max-active"
+       id="titlebutton-maximize-active"
        inkscape:label="#g6356"
        transform="translate(-276,8)">
       <g
@@ -3109,7 +3109,7 @@
          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" />
     </g>
     <g
-       id="titlebutton-min-active"
+       id="titlebutton-minimize-active"
        inkscape:label="#g6414"
        transform="translate(-267,8)">
       <g
@@ -3199,7 +3199,7 @@
          y="-185.63782" />
     </g>
     <g
-       id="titlebutton-max-backdrop"
+       id="titlebutton-maximize-backdrop"
        inkscape:label="#g6521"
        style="opacity:0.45"
        transform="translate(-480,-43)">
@@ -3232,7 +3232,7 @@
          y="-168.63782" />
     </g>
     <g
-       id="titlebutton-min-backdrop"
+       id="titlebutton-minimize-backdrop"
        inkscape:label="#g6534"
        style="opacity:0.45"
        transform="translate(-471,-43)">
@@ -4648,7 +4648,7 @@
     </g>
     <g
        style="display:inline;opacity:0.7"
-       id="titlebutton-min-dark"
+       id="titlebutton-minimize-dark"
        inkscape:label="#g6247"
        transform="translate(-229.00002,-43.000019)">
       <g
@@ -4757,7 +4757,7 @@
     </g>
     <g
        style="display:inline;opacity:0.7"
-       id="titlebutton-max-dark"
+       id="titlebutton-maximize-dark"
        inkscape:label="#g6234"
        transform="translate(-238.00002,-43.000019)">
       <g
@@ -4866,7 +4866,7 @@
     </g>
     <g
        style="display:inline"
-       id="titlebutton-max-hover-dark"
+       id="titlebutton-maximize-hover-dark"
        inkscape:label="#g6284"
        transform="translate(-135.00001,-9.0000206)">
       <g
@@ -4953,7 +4953,7 @@
     </g>
     <g
        style="display:inline"
-       id="titlebutton-min-hover-dark"
+       id="titlebutton-minimize-hover-dark"
        inkscape:label="#g6308"
        transform="translate(-126.00001,-9.0000206)">
       <g
@@ -5116,7 +5116,7 @@
     </g>
     <g
        style="display:inline"
-       id="titlebutton-max-active-dark"
+       id="titlebutton-maximize-active-dark"
        inkscape:label="#g6356"
        transform="translate(-34.000017,7.9999889)">
       <g
@@ -5207,7 +5207,7 @@
     </g>
     <g
        style="display:inline"
-       id="titlebutton-min-active-dark"
+       id="titlebutton-minimize-active-dark"
        inkscape:label="#g6414"
        transform="translate(-25.000017,7.9999889)">
       <g
@@ -5297,7 +5297,7 @@
          y="-185.63782" />
     </g>
     <g
-       id="titlebutton-max-backdrop-dark"
+       id="titlebutton-maximize-backdrop-dark"
        inkscape:label="#g6521"
        style="display:inline;opacity:0.4"
        transform="translate(-238.00002,-43.000019)">
@@ -5330,7 +5330,7 @@
          y="-168.63782" />
     </g>
     <g
-       id="titlebutton-min-backdrop-dark"
+       id="titlebutton-minimize-backdrop-dark"
        inkscape:label="#g6534"
        style="display:inline;opacity:0.4"
        transform="translate(-229.00002,-43.000019)">
diff --git a/common/gtk-3.0/3.18/assets.txt b/common/gtk-3.0/3.18/assets.txt
index 6746aca..a11af04 100644
--- a/common/gtk-3.0/3.18/assets.txt
+++ b/common/gtk-3.0/3.18/assets.txt
@@ -40,14 +40,14 @@ titlebutton-close
 titlebutton-close-backdrop
 titlebutton-close-hover
 titlebutton-close-active
-titlebutton-max
-titlebutton-max-backdrop
-titlebutton-max-hover
-titlebutton-max-active
-titlebutton-min
-titlebutton-min-backdrop
-titlebutton-min-hover
-titlebutton-min-active
+titlebutton-maximize
+titlebutton-maximize-backdrop
+titlebutton-maximize-hover
+titlebutton-maximize-active
+titlebutton-minimize
+titlebutton-minimize-backdrop
+titlebutton-minimize-hover
+titlebutton-minimize-active
 checkbox-checked-dark
 checkbox-checked-insensitive-dark
 checkbox-unchecked-dark
@@ -74,11 +74,11 @@ titlebutton-close-dark
 titlebutton-close-backdrop-dark
 titlebutton-close-hover-dark
 titlebutton-close-active-dark
-titlebutton-max-dark
-titlebutton-max-backdrop-dark
-titlebutton-max-hover-dark
-titlebutton-max-active-dark
-titlebutton-min-dark
-titlebutton-min-backdrop-dark
-titlebutton-min-hover-dark
-titlebutton-min-active-dark
+titlebutton-maximize-dark
+titlebutton-maximize-backdrop-dark
+titlebutton-maximize-hover-dark
+titlebutton-maximize-active-dark
+titlebutton-minimize-dark
+titlebutton-minimize-backdrop-dark
+titlebutton-minimize-hover-dark
+titlebutton-minimize-active-dark
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-active-dark.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-active-dark.png
index c6a82b7..c6a82b7 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-active-dark.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-active-dark.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-active-dark@2.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-active-dark@2.png
index 5ed5c6c..5ed5c6c 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-active-dark@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-active-dark@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-active.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-active.png
index c6a82b7..c6a82b7 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-active.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-active.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-active@2.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-active@2.png
index 5ed5c6c..5ed5c6c 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-active@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-active@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-backdrop-dark.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-backdrop-dark.png
index 0883ca7..0883ca7 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-backdrop-dark.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-backdrop-dark.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-backdrop-dark@2.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-backdrop-dark@2.png
index 4542b7f..4542b7f 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-backdrop-dark@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-backdrop-dark@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-backdrop.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-backdrop.png
index 36858b0..36858b0 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-backdrop.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-backdrop.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-backdrop@2.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-backdrop@2.png
index 061e356..061e356 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-backdrop@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-backdrop@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-dark.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-dark.png
index 8addbf8..8addbf8 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-dark.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-dark.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-dark@2.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-dark@2.png
index dedcc38..dedcc38 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-dark@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-dark@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-hover-dark.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-hover-dark.png
index 84a5583..84a5583 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-hover-dark.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-hover-dark.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-hover-dark@2.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-hover-dark@2.png
index d2ef62a..d2ef62a 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-hover-dark@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-hover-dark@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-hover.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-hover.png
index 128a39d..128a39d 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-hover.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-hover.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max-hover@2.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize-hover@2.png
index 66cdeda..66cdeda 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max-hover@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize-hover@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize.png
index 14e5e3e..14e5e3e 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-max@2.png b/common/gtk-3.0/3.18/assets/titlebutton-maximize@2.png
index a1a13bb..a1a13bb 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-max@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-maximize@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-active-dark.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-active-dark.png
index 4785503..4785503 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-active-dark.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-active-dark.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-active-dark@2.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-active-dark@2.png
index fb9325f..fb9325f 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-active-dark@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-active-dark@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-active.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-active.png
index 4785503..4785503 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-active.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-active.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-active@2.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-active@2.png
index fb9325f..fb9325f 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-active@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-active@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-backdrop-dark.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-backdrop-dark.png
index b04db91..b04db91 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-backdrop-dark.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-backdrop-dark.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-backdrop-dark@2.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-backdrop-dark@2.png
index 5b8cf4d..5b8cf4d 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-backdrop-dark@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-backdrop-dark@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-backdrop.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-backdrop.png
index b83cb7d..b83cb7d 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-backdrop.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-backdrop.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-backdrop@2.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-backdrop@2.png
index f83b673..f83b673 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-backdrop@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-backdrop@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-dark.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-dark.png
index b5c9732..b5c9732 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-dark.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-dark.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-dark@2.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-dark@2.png
index 29b6465..29b6465 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-dark@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-dark@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-hover-dark.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-hover-dark.png
index c38e8b3..c38e8b3 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-hover-dark.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-hover-dark.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-hover-dark@2.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-hover-dark@2.png
index 59b63da..59b63da 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-hover-dark@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-hover-dark@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-hover.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-hover.png
index c250748..c250748 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-hover.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-hover.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min-hover@2.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize-hover@2.png
index 965ce3d..965ce3d 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min-hover@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize-hover@2.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize.png
index f4b6db0..f4b6db0 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize.png
diff --git a/common/gtk-3.0/3.18/assets/titlebutton-min@2.png b/common/gtk-3.0/3.18/assets/titlebutton-minimize@2.png
index 9a35819..9a35819 100644
--- a/common/gtk-3.0/3.18/assets/titlebutton-min@2.png
+++ b/common/gtk-3.0/3.18/assets/titlebutton-minimize@2.png
diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css
index 530ab07..8015a12 100644
--- a/common/gtk-3.0/3.18/gtk-dark.css
+++ b/common/gtk-3.0/3.18/gtk-dark.css
@@ -2565,28 +2565,28 @@ GtkVolumeButton.button {
     background-image: -gtk-scaled(url("assets/titlebutton-close-active-dark.png"), url("assets/titlebutton-close-active-dark@2.png")); }
   .header-bar .button.titlebutton.maximize,
   .titlebar .button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-dark.png"), url("assets/titlebutton-max-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-dark.png"), url("assets/titlebutton-maximize-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:backdrop,
   .titlebar .button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop-dark.png"), url("assets/titlebutton-max-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop-dark.png"), url("assets/titlebutton-maximize-backdrop-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:hover,
   .titlebar .button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover-dark.png"), url("assets/titlebutton-max-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover-dark.png"), url("assets/titlebutton-maximize-hover-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:active,
   .titlebar .button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active-dark.png"), url("assets/titlebutton-max-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active-dark.png"), url("assets/titlebutton-maximize-active-dark@2.png")); }
   .header-bar .button.titlebutton.minimize,
   .titlebar .button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-dark.png"), url("assets/titlebutton-min-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-dark.png"), url("assets/titlebutton-minimize-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:backdrop,
   .titlebar .button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop-dark.png"), url("assets/titlebutton-min-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop-dark.png"), url("assets/titlebutton-minimize-backdrop-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:hover,
   .titlebar .button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover-dark.png"), url("assets/titlebutton-min-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover-dark.png"), url("assets/titlebutton-minimize-hover-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:active,
   .titlebar .button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active-dark.png"), url("assets/titlebutton-min-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active-dark.png"), url("assets/titlebutton-minimize-active-dark@2.png")); }
 
 .view:selected, .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:active:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:active,
 NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:selected,
diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css
index cef1939..e8bd476 100644
--- a/common/gtk-3.0/3.18/gtk-darker.css
+++ b/common/gtk-3.0/3.18/gtk-darker.css
@@ -2568,28 +2568,28 @@ GtkVolumeButton.button {
     background-image: -gtk-scaled(url("assets/titlebutton-close-active-dark.png"), url("assets/titlebutton-close-active-dark@2.png")); }
   .header-bar .button.titlebutton.maximize,
   .titlebar .button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-dark.png"), url("assets/titlebutton-max-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-dark.png"), url("assets/titlebutton-maximize-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:backdrop,
   .titlebar .button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop-dark.png"), url("assets/titlebutton-max-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop-dark.png"), url("assets/titlebutton-maximize-backdrop-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:hover,
   .titlebar .button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover-dark.png"), url("assets/titlebutton-max-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover-dark.png"), url("assets/titlebutton-maximize-hover-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:active,
   .titlebar .button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active-dark.png"), url("assets/titlebutton-max-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active-dark.png"), url("assets/titlebutton-maximize-active-dark@2.png")); }
   .header-bar .button.titlebutton.minimize,
   .titlebar .button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-dark.png"), url("assets/titlebutton-min-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-dark.png"), url("assets/titlebutton-minimize-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:backdrop,
   .titlebar .button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop-dark.png"), url("assets/titlebutton-min-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop-dark.png"), url("assets/titlebutton-minimize-backdrop-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:hover,
   .titlebar .button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover-dark.png"), url("assets/titlebutton-min-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover-dark.png"), url("assets/titlebutton-minimize-hover-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:active,
   .titlebar .button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active-dark.png"), url("assets/titlebutton-min-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active-dark.png"), url("assets/titlebutton-minimize-active-dark@2.png")); }
 
 .view:selected, .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:active:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:active,
 NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:selected,
diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css
index f4554e7..6f3bd8d 100644
--- a/common/gtk-3.0/3.18/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-solid-dark.css
@@ -2565,28 +2565,28 @@ GtkVolumeButton.button {
     background-image: -gtk-scaled(url("assets/titlebutton-close-active-dark.png"), url("assets/titlebutton-close-active-dark@2.png")); }
   .header-bar .button.titlebutton.maximize,
   .titlebar .button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-dark.png"), url("assets/titlebutton-max-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-dark.png"), url("assets/titlebutton-maximize-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:backdrop,
   .titlebar .button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop-dark.png"), url("assets/titlebutton-max-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop-dark.png"), url("assets/titlebutton-maximize-backdrop-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:hover,
   .titlebar .button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover-dark.png"), url("assets/titlebutton-max-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover-dark.png"), url("assets/titlebutton-maximize-hover-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:active,
   .titlebar .button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active-dark.png"), url("assets/titlebutton-max-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active-dark.png"), url("assets/titlebutton-maximize-active-dark@2.png")); }
   .header-bar .button.titlebutton.minimize,
   .titlebar .button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-dark.png"), url("assets/titlebutton-min-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-dark.png"), url("assets/titlebutton-minimize-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:backdrop,
   .titlebar .button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop-dark.png"), url("assets/titlebutton-min-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop-dark.png"), url("assets/titlebutton-minimize-backdrop-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:hover,
   .titlebar .button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover-dark.png"), url("assets/titlebutton-min-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover-dark.png"), url("assets/titlebutton-minimize-hover-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:active,
   .titlebar .button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active-dark.png"), url("assets/titlebutton-min-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active-dark.png"), url("assets/titlebutton-minimize-active-dark@2.png")); }
 
 .view:selected, .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:active:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:active,
 NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:selected,
diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css
index 05b5b53..89cb073 100644
--- a/common/gtk-3.0/3.18/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-solid-darker.css
@@ -2568,28 +2568,28 @@ GtkVolumeButton.button {
     background-image: -gtk-scaled(url("assets/titlebutton-close-active-dark.png"), url("assets/titlebutton-close-active-dark@2.png")); }
   .header-bar .button.titlebutton.maximize,
   .titlebar .button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-dark.png"), url("assets/titlebutton-max-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-dark.png"), url("assets/titlebutton-maximize-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:backdrop,
   .titlebar .button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop-dark.png"), url("assets/titlebutton-max-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop-dark.png"), url("assets/titlebutton-maximize-backdrop-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:hover,
   .titlebar .button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover-dark.png"), url("assets/titlebutton-max-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover-dark.png"), url("assets/titlebutton-maximize-hover-dark@2.png")); }
   .header-bar .button.titlebutton.maximize:active,
   .titlebar .button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active-dark.png"), url("assets/titlebutton-max-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active-dark.png"), url("assets/titlebutton-maximize-active-dark@2.png")); }
   .header-bar .button.titlebutton.minimize,
   .titlebar .button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-dark.png"), url("assets/titlebutton-min-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-dark.png"), url("assets/titlebutton-minimize-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:backdrop,
   .titlebar .button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop-dark.png"), url("assets/titlebutton-min-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop-dark.png"), url("assets/titlebutton-minimize-backdrop-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:hover,
   .titlebar .button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover-dark.png"), url("assets/titlebutton-min-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover-dark.png"), url("assets/titlebutton-minimize-hover-dark@2.png")); }
   .header-bar .button.titlebutton.minimize:active,
   .titlebar .button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active-dark.png"), url("assets/titlebutton-min-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active-dark.png"), url("assets/titlebutton-minimize-active-dark@2.png")); }
 
 .view:selected, .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:active:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:active,
 NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:selected,
diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css
index 247d1b1..e7b2c5e 100644
--- a/common/gtk-3.0/3.18/gtk-solid.css
+++ b/common/gtk-3.0/3.18/gtk-solid.css
@@ -2572,28 +2572,28 @@ GtkVolumeButton.button {
     background-image: -gtk-scaled(url("assets/titlebutton-close-active.png"), url("assets/titlebutton-close-active@2.png")); }
   .header-bar .button.titlebutton.maximize,
   .titlebar .button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max.png"), url("assets/titlebutton-max@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize.png"), url("assets/titlebutton-maximize@2.png")); }
   .header-bar .button.titlebutton.maximize:backdrop,
   .titlebar .button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop.png"), url("assets/titlebutton-max-backdrop@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop.png"), url("assets/titlebutton-maximize-backdrop@2.png")); }
   .header-bar .button.titlebutton.maximize:hover,
   .titlebar .button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover.png"), url("assets/titlebutton-max-hover@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover.png"), url("assets/titlebutton-maximize-hover@2.png")); }
   .header-bar .button.titlebutton.maximize:active,
   .titlebar .button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active.png"), url("assets/titlebutton-max-active@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active.png"), url("assets/titlebutton-maximize-active@2.png")); }
   .header-bar .button.titlebutton.minimize,
   .titlebar .button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min.png"), url("assets/titlebutton-min@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize.png"), url("assets/titlebutton-minimize@2.png")); }
   .header-bar .button.titlebutton.minimize:backdrop,
   .titlebar .button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop.png"), url("assets/titlebutton-min-backdrop@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop.png"), url("assets/titlebutton-minimize-backdrop@2.png")); }
   .header-bar .button.titlebutton.minimize:hover,
   .titlebar .button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover.png"), url("assets/titlebutton-min-hover@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover.png"), url("assets/titlebutton-minimize-hover@2.png")); }
   .header-bar .button.titlebutton.minimize:active,
   .titlebar .button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active.png"), url("assets/titlebutton-min-active@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active.png"), url("assets/titlebutton-minimize-active@2.png")); }
 
 .view:selected, .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:active:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:active,
 NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:selected,
diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css
index 23fc864..89ab1f7 100644
--- a/common/gtk-3.0/3.18/gtk.css
+++ b/common/gtk-3.0/3.18/gtk.css
@@ -2572,28 +2572,28 @@ GtkVolumeButton.button {
     background-image: -gtk-scaled(url("assets/titlebutton-close-active.png"), url("assets/titlebutton-close-active@2.png")); }
   .header-bar .button.titlebutton.maximize,
   .titlebar .button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max.png"), url("assets/titlebutton-max@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize.png"), url("assets/titlebutton-maximize@2.png")); }
   .header-bar .button.titlebutton.maximize:backdrop,
   .titlebar .button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop.png"), url("assets/titlebutton-max-backdrop@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop.png"), url("assets/titlebutton-maximize-backdrop@2.png")); }
   .header-bar .button.titlebutton.maximize:hover,
   .titlebar .button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover.png"), url("assets/titlebutton-max-hover@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover.png"), url("assets/titlebutton-maximize-hover@2.png")); }
   .header-bar .button.titlebutton.maximize:active,
   .titlebar .button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active.png"), url("assets/titlebutton-max-active@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active.png"), url("assets/titlebutton-maximize-active@2.png")); }
   .header-bar .button.titlebutton.minimize,
   .titlebar .button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min.png"), url("assets/titlebutton-min@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize.png"), url("assets/titlebutton-minimize@2.png")); }
   .header-bar .button.titlebutton.minimize:backdrop,
   .titlebar .button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop.png"), url("assets/titlebutton-min-backdrop@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop.png"), url("assets/titlebutton-minimize-backdrop@2.png")); }
   .header-bar .button.titlebutton.minimize:hover,
   .titlebar .button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover.png"), url("assets/titlebutton-min-hover@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover.png"), url("assets/titlebutton-minimize-hover@2.png")); }
   .header-bar .button.titlebutton.minimize:active,
   .titlebar .button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active.png"), url("assets/titlebutton-min-active@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active.png"), url("assets/titlebutton-minimize-active@2.png")); }
 
 .view:selected, .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.sidebar-button.button:active, .menuitem.button.flat:selected, .menuitem.sidebar-button.button:selected, .list-row:selected, .sidebar:selected, .sidebar .view:selected, GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected:focus, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:selected:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:selected, GtkFileChooserDialog GtkPlacesSidebar.sidebar .list-row.activatable:active:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar .has-open-popup:active,
 NautilusWindow GtkPlacesSidebar.sidebar .list-row.activatable:selected,
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index ce71870..ec870bc 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -2818,9 +2818,7 @@ GtkVolumeButton.button { padding: 8px; }
     &:active, &:checked {
       @include button(header-active);
     }
-
     &.close, &.maximize, &.minimize {
-
       color: transparent;
       background-color: transparent;
       background-position: center;
@@ -2829,21 +2827,14 @@ GtkVolumeButton.button { padding: 8px; }
 
       &:backdrop { opacity: 1; }
     }
+    // Load png assets for each button
+    @each $k in ('close','maximize', 'minimize') {
+      @each $l, $m in ('',''), (':backdrop','-backdrop'), (':hover','-hover'), (':active','-active') {
 
-    &.close { background-image: -gtk-scaled(url('assets/titlebutton-close#{$darker_asset_suffix}.png'),url('assets/titlebutton-close#{$darker_asset_suffix}@2.png')); }
-    &.close:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-close-backdrop#{$darker_asset_suffix}.png'),url('assets/titlebutton-close-backdrop#{$darker_asset_suffix}@2.png')); }
-    &.close:hover { background-image: -gtk-scaled(url('assets/titlebutton-close-hover#{$darker_asset_suffix}.png'),url('assets/titlebutton-close-hover#{$darker_asset_suffix}@2.png')); }
-    &.close:active { background-image: -gtk-scaled(url('assets/titlebutton-close-active#{$darker_asset_suffix}.png'),url('assets/titlebutton-close-active#{$darker_asset_suffix}@2.png')); }
-
-    &.maximize { background-image: -gtk-scaled(url('assets/titlebutton-max#{$darker_asset_suffix}.png'),url('assets/titlebutton-max#{$darker_asset_suffix}@2.png')); }
-    &.maximize:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-max-backdrop#{$darker_asset_suffix}.png'),url('assets/titlebutton-max-backdrop#{$darker_asset_suffix}@2.png')); }
-    &.maximize:hover { background-image: -gtk-scaled(url('assets/titlebutton-max-hover#{$darker_asset_suffix}.png'),url('assets/titlebutton-max-hover#{$darker_asset_suffix}@2.png')); }
-    &.maximize:active { background-image: -gtk-scaled(url('assets/titlebutton-max-active#{$darker_asset_suffix}.png'),url('assets/titlebutton-max-active#{$darker_asset_suffix}@2.png')); }
-
-    &.minimize { background-image: -gtk-scaled(url('assets/titlebutton-min#{$darker_asset_suffix}.png'),url('assets/titlebutton-min#{$darker_asset_suffix}@2.png')); }
-    &.minimize:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-min-backdrop#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-backdrop#{$darker_asset_suffix}@2.png')); }
-    &.minimize:hover { background-image: -gtk-scaled(url('assets/titlebutton-min-hover#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-hover#{$darker_asset_suffix}@2.png')); }
-    &.minimize:active { background-image: -gtk-scaled(url('assets/titlebutton-min-active#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-active#{$darker_asset_suffix}@2.png')); }
+        &.#{$k}#{$l} { background-image: -gtk-scaled(url('assets/titlebutton-#{$k}#{$m}#{$darker_asset_suffix}.png'),
+                                                     url('assets/titlebutton-#{$k}#{$m}#{$darker_asset_suffix}@2.png')); }
+      }
+    }
   }
 }