diff --git a/Icons/Chicago95/actions/16/window-maximise-symbolic.png b/Icons/Chicago95/actions/16/window-maximise-symbolic.png
deleted file mode 120000
index 3e3a144..0000000
--- a/Icons/Chicago95/actions/16/window-maximise-symbolic.png
+++ /dev/null
@@ -1 +0,0 @@
-./window-maximise.png
\ No newline at end of file
diff --git a/Icons/Chicago95/actions/16/window-maximize-symbolic.png b/Icons/Chicago95/actions/16/window-maximize-symbolic.png
new file mode 120000
index 0000000..db93082
--- /dev/null
+++ b/Icons/Chicago95/actions/16/window-maximize-symbolic.png
@@ -0,0 +1 @@
+window-maximize.png
\ No newline at end of file
diff --git a/Icons/Chicago95/actions/16/window-maximise.png b/Icons/Chicago95/actions/16/window-maximize.png
similarity index 100%
rename from Icons/Chicago95/actions/16/window-maximise.png
rename to Icons/Chicago95/actions/16/window-maximize.png
diff --git a/Icons/Chicago95/actions/16/window-minimize-symbolic.png b/Icons/Chicago95/actions/16/window-minimize-symbolic.png
new file mode 120000
index 0000000..484939f
--- /dev/null
+++ b/Icons/Chicago95/actions/16/window-minimize-symbolic.png
@@ -0,0 +1 @@
+window-minimize.png
\ No newline at end of file
diff --git a/Icons/Chicago95/actions/16/window-minimise.png b/Icons/Chicago95/actions/16/window-minimize.png
similarity index 100%
rename from Icons/Chicago95/actions/16/window-minimise.png
rename to Icons/Chicago95/actions/16/window-minimize.png
diff --git a/Theme/Chicago95/gtk-3.0/buttons/window_button_normal.png b/Theme/Chicago95/gtk-3.0/buttons/window_button_normal.png
new file mode 100644
index 0000000..e4d728a
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/buttons/window_button_normal.png differ
diff --git a/Theme/Chicago95/gtk-3.0/buttons/window_button_pressed.png b/Theme/Chicago95/gtk-3.0/buttons/window_button_pressed.png
new file mode 100644
index 0000000..5485506
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/buttons/window_button_pressed.png differ
diff --git a/Theme/Chicago95/gtk-3.0/gtk-windowbuttons.css b/Theme/Chicago95/gtk-3.0/gtk-windowbuttons.css
index 6ab6593..c50528a 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-windowbuttons.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-windowbuttons.css
@@ -29,7 +29,7 @@ button.titlebutton {
 .titlebutton.close,
 .titlebutton.maximize,
 .titlebutton.minimize {
-  color: transparent;
+  color: @bg_dark;
   border: none;
   box-shadow: none;
   padding: 0px;
@@ -37,39 +37,41 @@ button.titlebutton {
   background-color: transparent;
   min-width: 18px;
   min-height: 18px;
-  -gtk-icon-shadow: none; }
+  background-image: url("buttons/window_button_normal.png");
+  -gtk-icon-shadow: none;
+  -gtk-icon-style: requested; }
 
 .titlebutton.minimize {
-  background-image: url("buttons/minimize_normal.png"); }
+  background-image: url("buttons/window_button_normal.png"); }
   .titlebutton.minimize:backdrop {
-    background-image: url("buttons/minimize_normal.png"); }
+    background-image: url("buttons/window_button_normal.png"); }
   .titlebutton.minimize:checked,
   .titlebutton.minimize:active {
-    background-image: url("buttons/minimize_pressed.png"); }
+    background-image: url("buttons/window_button_pressed.png"); }
 
 .titlebutton.maximize {
-  background-image: url("buttons/maximize_normal.png"); }
+  background-image: url("buttons/window_button_normal.png"); }
   .titlebutton.maximize:backdrop {
-    background-image: url("buttons/maximize_normal.png"); }
+    background-image: url("buttons/window_button_normal.png"); }
   .titlebutton.maximize:checked,
   .titlebutton.maximize:active {
-    background-image: url("buttons/maximize_pressed.png"); }
+    background-image: url("buttons/window_button_pressed.png"); }
 
 .maximized .titlebutton.maximize  {
-  background-image: url("buttons/restore_normal.png"); }
+  background-image: url("buttons/window_button_normal.png"); }
   .maximized .titlebutton.maximize:backdrop {
-    background-image: url("buttons/restore_normal.png"); }
+    background-image: url("buttons/window_button_normal.png"); }
   .maximized .titlebutton.maximize:checked,
   .maximized .titlebutton.maximize:active  {
-    background-image: url("buttons/restore_pressed.png"); }
+    background-image: url("buttons/window_button_pressed.png"); }
 
 .titlebutton.close {
-  background-image: url("buttons/close_normal.png"); }
+  background-image: url("buttons/window_button_normal.png"); }
   .titlebutton.close:backdrop {
-    background-image: url("buttons/close_normal.png"); }
+    background-image: url("buttons/window_button_normal.png"); }
   .titlebutton.close:checked,
   .titlebutton.close:active {
-    background-image: url("buttons/close_pressed.png"); }
+    background-image: url("buttons/window_button_pressed.png"); }
 
 /* Groups these buttons together */
 .titlebutton.minimize {