diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-down-disabled.png b/Theme/Chicago95/gtk-3.0/assets/arrow-down-disabled.png
new file mode 100644
index 0000000..c033db1
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-down-disabled.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-down-selected.png b/Theme/Chicago95/gtk-3.0/assets/arrow-down-selected.png
new file mode 100644
index 0000000..1d76f2c
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-down-selected.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-down.png b/Theme/Chicago95/gtk-3.0/assets/arrow-down.png
new file mode 100644
index 0000000..b58e80b
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-down.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-left-disabled.png b/Theme/Chicago95/gtk-3.0/assets/arrow-left-disabled.png
new file mode 100644
index 0000000..a5c2866
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-left-disabled.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-left-selected.png b/Theme/Chicago95/gtk-3.0/assets/arrow-left-selected.png
new file mode 100644
index 0000000..928416f
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-left-selected.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-left.png b/Theme/Chicago95/gtk-3.0/assets/arrow-left.png
new file mode 100644
index 0000000..15b54a7
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-left.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-right-disabled.png b/Theme/Chicago95/gtk-3.0/assets/arrow-right-disabled.png
new file mode 100644
index 0000000..00bc0b5
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-right-disabled.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-right-selected.png b/Theme/Chicago95/gtk-3.0/assets/arrow-right-selected.png
new file mode 100644
index 0000000..772ff9c
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-right-selected.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-right.png b/Theme/Chicago95/gtk-3.0/assets/arrow-right.png
new file mode 100644
index 0000000..938610a
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-right.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-up-disabled.png b/Theme/Chicago95/gtk-3.0/assets/arrow-up-disabled.png
new file mode 100644
index 0000000..5074fc0
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-up-disabled.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-up-selected.png b/Theme/Chicago95/gtk-3.0/assets/arrow-up-selected.png
new file mode 100644
index 0000000..7a75240
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-up-selected.png differ
diff --git a/Theme/Chicago95/gtk-3.0/assets/arrow-up.png b/Theme/Chicago95/gtk-3.0/assets/arrow-up.png
new file mode 100644
index 0000000..65fc8bf
Binary files /dev/null and b/Theme/Chicago95/gtk-3.0/assets/arrow-up.png differ
diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets-assets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets-assets.css
deleted file mode 100644
index 4f6b68c..0000000
--- a/Theme/Chicago95/gtk-3.0/gtk-widgets-assets.css
+++ /dev/null
@@ -1,257 +0,0 @@
-/******************
- * window buttons *
- ******************/
-
-/* Makes the raised 2px effect slimmer on the top and left side */
-.titlebutton {
- padding: 0px;
- margin: 0px;
- border-top: 0px;
- border-left: 0px;
- background-position: center;
- background-repeat: no-repeat;
-}
-
-.titlebutton:active,
-.titlebutton:checked {
- padding: 0px;
- border-top: 0px;
- border-left: 0px;
- background-position: center 2px, center 2px;
- background-repeat: no-repeat;
-}
-
-/* helps get hid of ugly fat buttons */
-/* also, image does not display any background image on ssd windows. thanks gnome devs. */
-.titlebutton image {
- padding: 0px;
- margin-top: -1px;
- margin-bottom: -2px;
- margin-left: -1px;
- min-width: 0px;
- min-height: 0px;
-}
-
-.titlebutton.close,
-.titlebutton.maximize,
-.titlebutton.minimize {
-    color: transparent; /* FUCKING dirty secret to get rid of static symbols in these buttons */
-
-}
-
-.titlebutton.minimize {
-    background-image: url("buttons/icon-minimise.png");
-    background-size: 12px;
-}
-.titlebutton.minimize:backdrop {
-}
-.titlebutton.minimize:checked {
-}
-
-.titlebutton.maximize {
-    background-image: url("buttons/icon-maximise.png");
-    background-size: 11px;
-}
-.titlebutton.maximize:backdrop {
-}
-.titlebutton.maximize:checked {
-}
-
-.maximized .titlebutton.maximize  {
-    background-image: url("buttons/icon-restore.png");
-    background-size: 11px;
-}
-.maximized .titlebutton.maximize:active {
-}
-
-.titlebutton.close {
-    background-image: url("buttons/icon-close.png");
-    background-size: 10px;
-}
-.titlebutton.close:backdrop {
-}
-.titlebutton.close:checked {
-}
-
-/* Groups these buttons together */
-/* doesen't work on ssd windows. get your shit together gnome poeple */
-.titlebutton.close {
-  margin-right: 0px;
-  margin-left: -4px;
-}
-.titlebutton.maximize {
-  margin-left: -6px;
-}
-
-
-
-
-
-
-/* Scroolbar Arrows */
-.scrollbar.button.vertical.top {
-	-gtk-icon-source: url("assets/arrow-up.png");
-}
-
-
-.scrollbar.button.vertical.bottom {
-	-gtk-icon-source: url("assets/arrow-down.png");
-}
-
-.scrollbar.button.horizontal.left {
-	-gtk-icon-source: url("assets/arrow-left.png");
-}
-
-.scrollbar.button.horizontal.right  {
-	-gtk-icon-source: url("assets/arrow-right.png");
-}
-
-.scrollbar.button.vertical.top:disabled {
-	-gtk-icon-source: url("assets/arrow-up-insens.png");
-}
-
-.scrollbar.button.vertical.bottom:disabled {
-	-gtk-icon-source: url("assets/arrow-down-insens.png");
-}
-
-
-.scrollbar.button.horizontal.left:disabled {
-	-gtk-icon-source: url("assets/arrow-left-insens.png");
-}
-
-
-.scrollbar.button.horizontal.right:disabled {
-	-gtk-icon-source: url("assets/arrow-right-insens.png");
-}
-/*
-
-.scrollbar.button.vertical.top:prelight {
-	background-image: url("assets/stepper-up-prelight.png");
-        border-image: url("assets/stepper-up-prelight.png");
-	border-width: 1px;
-        border-radius: 1px;
-	border-color: black;
-}
-
-.scrollbar.button.vertical.bottom:prelight {
-	background-image: url("assets/stepper-down-prelight.png");
-        border-image: url("assets/stepper-down-prelight.png");
-	border-width: 1px;
-        border-radius: 1px;
-	border-color: black;
-}
-
-.scrollbar.button.horizontal.left:prelight {
-	background-image: url("assets/stepper-left-prelight.png");
-        border-image: url("assets/stepper-left-prelight.png");
-	border-width: 1px;
-        border-radius: 1px;
-	border-color: black;
-}
-
-.scrollbar.button.horizontal.right:prelight {
-	background-image: url("assets/stepper-right-prelight.png");
-        border-image: url("assets/stepper-right-prelight.png");
-	border-width: 1px;
-        border-radius: 1px;
-	border-color: black;
-   
-} */
-
-
-.scale.scale-has-marks-above.slider.horizontal,
-.scale.scale-has-marks-above.slider.horizontal:hover,
-.scale.scale-has-marks-above.slider.horizontal:active,
-.scale.scale-has-marks-above.slider.horizontal:active:hover {
-        border: 0;
-        box-shadow: 0 0 0;
-        background-color: transparent;
-	background-image: url("assets/slider-above.png");
-}
-
-.scale.scale-has-marks-above.slider.horizontal:disabled,
-.scale.scale-has-marks-above.slider.horizontal:disabled:hover {
-        border: 0;
-        box-shadow: 0 0 0;
-        background-color: transparent;
-	background-image: url("assets/slider-above-insense.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical,
-.scale.scale-has-marks-above.slider.vertical:hover,
-.scale.scale-has-marks-above.slider.vertical:active,
-.scale.scale-has-marks-above.slider.vertical:active:hover {
-        border: 0;
-        box-shadow: 0 0 0;
-        background-color: transparent;
-	background-image: url("assets/slider-left.png");
-}
-
-.scale.scale-has-marks-above.slider.vertical:disabled,
-.scale.scale-has-marks-above.slider.vertical:disabled:hover {
-        border: 0;
-        box-shadow: 0 0 0;
-        background-color: transparent;
-	background-image: url("assets/slider-left-insense.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal,
-.scale.scale-has-marks-below.slider.horizontal:hover,
-.scale.scale-has-marks-below.slider.horizontal:active,
-.scale.scale-has-marks-below.slider.horizontal:active:hover {
-        border: 0;
-        box-shadow: 0 0 0;
-        background-color: transparent;
-	background-image: url("assets/slider-below.png");
-}
-
-.scale.scale-has-marks-below.slider.horizontal:disabled,
-.scale.scale-has-marks-below.slider.horizontal:disabled:hover {
-        border: 0;
-        box-shadow: 0 0 0;
-        background-color: transparent;
-	background-image: url("assets/slider-below-insense.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical,
-.scale.scale-has-marks-below.slider.vertical:hover,
-.scale.scale-has-marks-below.slider.vertical:active,
-.scale.scale-has-marks-below.slider.vertical:active:hover {
-        border: 0;
-        box-shadow: 0 0 0;
-        background-color: transparent;
-	background-image: url("assets/slider-right.png");
-}
-
-.scale.scale-has-marks-below.slider.vertical:disabled,
-.scale.scale-has-marks-below.slider.vertical:disabled:hover {
-        border: 0;
-        box-shadow: 0 0 0;
-        background-color: transparent;
-	background-image: url("assets/slider-right-insense.png");
-}
-
-.menu .menuitem .arrow:dir(ltr) {
-        -gtk-icon-source: url("assets/arrow-right.png");
-}
-.menu .menuitem .arrow:dir(rtl) {
-        -gtk-icon-source: url("assets/arrow-left.png");
-}
-
-.menu .menuitem .arrow:dir(ltr):hover {
-        -gtk-icon-source: url("assets/arrow-right-hover.png");
-}
-.menu .menuitem .arrow:dir(rtl):hover {
-        -gtk-icon-source: url("assets/arrow-left-hover.png");
-}
-
-.menu .menuitem .arrow:dir(ltr):disabled {
-        -gtk-icon-source: url("assets/arrow-right-insense.png");
-}
-.menu .menuitem .arrow:dir(rtl):disabled {
-        -gtk-icon-source: url("assets/arrow-left-insense.png");
-}
-
-.combobox .arrow {
-    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); 
-}
diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
index 86383ee..63e2b92 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
@@ -145,26 +145,51 @@ border.flat {
 }
 
 arrow {
-  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-  min-height: 12px;
-  min-width: 12px; 
-  color: alpha(currentColor, 0.7);
+  background-image: url("assets/arrow-down.png");
+  background-position: center;
+  background-repeat: no-repeat;
+  background-size: 11px;
+  min-height: 10px;
+  min-width: 10px; 
+}
+*:hover > arrow {
+  background-image: url("assets/arrow-down-selected.png");
 }
 
+tabs > arrow.up,
+expander arrow,
 arrow.right {
-  -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-  -gtk-icon-transform: rotate(90deg);
-  min-height: 12px;
-  min-width: 12px; 
-  color: alpha(currentColor, 0.7);
+  background-image: url("assets/arrow-right.png");
+}
+tabs > arrow.up:hover,
+expander arrow:hover,
+*:hover > arrow.right {
+  background-image: url("assets/arrow-right-selected.png");
 }
 
+tabs > arrow.down,
 arrow.left {
-  -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-  -gtk-icon-transform: rotate(-90deg);
-  min-height: 12px;
-  min-width: 12px; 
-  color: alpha(currentColor, 0.7);
+  background-image: url("assets/arrow-left.png");
+}
+tabs > arrow.down:hover,
+*:hover > arrow.left {
+  background-image: url("assets/arrow-left-selected.png");
+}
+
+arrow.up {
+  background-image: url("assets/arrow-up.png");
+}
+*:hover > arrow.up {
+  background-image: url("assets/arrow-up-selected.png");
+}
+
+expander arrow:checked,
+arrow.down {
+  background-image: url("assets/arrow-down.png");
+}
+expander arrow:checked:hover,
+*:hover > arrow.down {
+  background-image: url("assets/arrow-down-selected.png");
 }
 
 
@@ -305,13 +330,6 @@ header button {
     background-color: @bg_color;
 }
 
-/* Buton pressing contents shifting is wonky with scrollbars */
-scrollbar button:checked,
-scrollbar button:active,
-scrollbar slider:checked,
-scrollbar slider:active {
-   padding: 2px; /*3px 1px 1px 3px;*/
-}
 
 stacksidebar list row:selected,
 stacksidebar list row:active,
@@ -326,10 +344,20 @@ switch slider:checked,
 combobox button:checked,
 combobox button:active,
 spinbutton button:checked,
-spinbutton button:active,
+spinbutton button:active {
+   padding: 3px 1px 1px 3px;
+}
+
+/* These have no button pressing effect */
+scrollbar button:checked,
+scrollbar button:active,
+scrollbar slider:checked,
+scrollbar slider:active {
+   padding: 2px;
+}
 header button:checked,
 header button:active {
-   padding: 3px 1px 1px 3px;
+   padding: 0px;
 }
 
 /* button has no decoration untill active/hover etc */
@@ -605,7 +633,7 @@ combobox  button {
  margin-bottom: 2px;
 }
 
-combobox entry{
+combobox entry {
  margin-right: -24px;
 }
 
@@ -622,13 +650,12 @@ scrollbar {
 }
 
 /* where is the junction? in scrollablewindow? doesent exists anymore? */
-scrollbar junction {
+scrollbar.junction,
+scrollbar .junction {
   border-width: 1px;
   border-style: solid;
   border-color: #c0c0c0;
-  border-radius: 0;
-  background-color: #c0c0c0;
-  box-shadow: none
+  background-color: red;
 }
 
 scrollbar.vertical slider {
@@ -641,23 +668,41 @@ scrollbar.horizontal slider {
 }
 
 scrollbar button {
+    -gtk-icon-source: none;
+    background-image: url("assets/arrow-down.png");
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: 9px;
 	min-width: 10px;
 	min-height: 10px;
 }
 
 scrollbar.vertical button.up {
-  -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+  background-image: url("assets/arrow-up.png");
 }
+scrollbar.vertical button.up:disabled {
+  background-image: url("assets/arrow-up-disabled.png");
+}
+
 scrollbar.vertical button.down {
-  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+  background-image: url("assets/arrow-down.png");
 }
+scrollbar.vertical button.down:disabled {
+  background-image: url("assets/arrow-down-disabled.png");
+}
+
 scrollbar.horizontal button.up {
-  -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-  -gtk-icon-transform: rotate(-90deg);
+  background-image: url("assets/arrow-left.png");
 }
+scrollbar.horizontal button.up:disabled {
+  background-image: url("assets/arrow-left-disabled.png");
+}
+
 scrollbar.horizontal button.down {
-  -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
-  -gtk-icon-transform: rotate(90deg);
+  background-image: url("assets/arrow-right.png");
+}
+scrollbar.horizontal button.down:disabled {
+  background-image: url("assets/arrow-right-disabled.png");
 }
 
 
@@ -730,11 +775,6 @@ calendar.header {
 expander arrow {
  min-width: 16px;
  min-height: 16px;
-  -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
-}
-
-expander arrow:checked {
-   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
 
@@ -1098,6 +1138,12 @@ notebook header tabs button {
   margin-right: 5px;
 }
 
+tabs > arrow {
+  background-color: transparent;
+  padding: 2px;
+  -gtk-icon-source: none;
+}
+
 
 /***********************************
  * progressbar, levelbar and scale *
@@ -1608,6 +1654,94 @@ window.ssd.maximized .titlebar {
     border-radius: 0;
 }
 
+
+/******************
+ * window buttons *
+ ******************/
+
+/* Makes the raised 2px effect slimmer on the top and left side */
+.titlebutton {
+ padding: 0px;
+ margin: 0px;
+ border-top: 0px;
+ border-left: 0px;
+ background-position: center;
+ background-repeat: no-repeat;
+}
+
+.titlebutton:active,
+.titlebutton:checked {
+ padding: 0px;
+ border-top: 0px;
+ border-left: 0px;
+ background-position: center 2px, center 2px;
+ background-repeat: no-repeat;
+}
+
+/* helps get hid of ugly fat buttons */
+/* also, image does not display any background image on ssd windows. thanks gnome devs. */
+.titlebutton image {
+ padding: 0px;
+ margin-top: -1px;
+ margin-bottom: -2px;
+ margin-left: -1px;
+ min-width: 0px;
+ min-height: 0px;
+}
+
+.titlebutton.close,
+.titlebutton.maximize,
+.titlebutton.minimize {
+    color: transparent; /* FUCKING dirty secret to get rid of static symbols in these buttons */
+
+}
+
+.titlebutton.minimize {
+    background-image: url("buttons/icon-minimise.png");
+    background-size: 12px;
+}
+.titlebutton.minimize:backdrop {
+}
+.titlebutton.minimize:checked {
+}
+
+.titlebutton.maximize {
+    background-image: url("buttons/icon-maximise.png");
+    background-size: 11px;
+}
+.titlebutton.maximize:backdrop {
+}
+.titlebutton.maximize:checked {
+}
+
+.maximized .titlebutton.maximize  {
+    background-image: url("buttons/icon-restore.png");
+    background-size: 11px;
+}
+.maximized .titlebutton.maximize:active {
+}
+
+.titlebutton.close {
+    background-image: url("buttons/icon-close.png");
+    background-size: 10px;
+}
+.titlebutton.close:backdrop {
+}
+.titlebutton.close:checked {
+}
+
+/* Groups these buttons together */
+/* doesen't work on ssd windows. get your shit together gnome poeple */
+.titlebutton.close {
+  margin-right: 0px;
+  margin-left: -4px;
+}
+.titlebutton.maximize {
+  margin-left: -6px;
+}
+
+
+
 /* declaration of .view was causing problems with white background rubberband in nautilus, putting this here for now */
 flowbox rubberband, treeview.view rubberband, .content-view rubberband,
 .rubberband, rubberband {
@@ -1616,4 +1750,3 @@ flowbox rubberband, treeview.view rubberband, .content-view rubberband,
  /* box-shadow: inset 1px 1px 0px 0px black,
                 inset -1px -1px 0px 0px black; */
 }
-
diff --git a/Theme/Chicago95/gtk-3.0/gtk.css b/Theme/Chicago95/gtk-3.0/gtk.css
index 8fa1a0e..cdc6f27 100644
--- a/Theme/Chicago95/gtk-3.0/gtk.css
+++ b/Theme/Chicago95/gtk-3.0/gtk.css
@@ -96,7 +96,6 @@
 @define-color progressbar_color @selected_bg_color;
 
 @import url("gtk-widgets.css");
-@import url("gtk-widgets-assets.css");
 
 /* @import url("apps/gnome-applications.css");
 @import url("apps/granite-widgets.css");