diff --git a/Icons/Chicago95/actions/16/pan-down-symbolic.png b/Icons/Chicago95/actions/16/pan-down-symbolic.png_bak
similarity index 100%
rename from Icons/Chicago95/actions/16/pan-down-symbolic.png
rename to Icons/Chicago95/actions/16/pan-down-symbolic.png_bak
diff --git a/Icons/Chicago95/actions/16/pan-down-symbolic.svg b/Icons/Chicago95/actions/16/pan-down-symbolic.svg
new file mode 100644
index 0000000..34a3d70
--- /dev/null
+++ b/Icons/Chicago95/actions/16/pan-down-symbolic.svg
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg8"
+   shape-rendering="crispEdges"
+   sodipodi:docname="pan-up-symbolic.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.678384"
+     inkscape:cx="10.350096"
+     inkscape:cy="11.699471"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:pagecheckerboard="true"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     objecttolerance="10000"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     gridtolerance="10000"
+     inkscape:snap-global="true"
+     inkscape:bbox-nodes="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="848"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid10"
+       empspacing="1"
+       dotted="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-292.76665)">
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke-width:0.26458332"
+       id="rect4577"
+       width="0.26458332"
+       height="2.3812499"
+       x="1.0583335"
+       y="293.56039" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke-width:0.26458332"
+       id="rect4579"
+       width="2.1166666"
+       height="0.26458332"
+       x="1.3229167"
+       y="293.56039" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke-width:0.26458332"
+       id="rect4581"
+       width="0.26458332"
+       height="2.1166666"
+       x="3.175"
+       y="293.82498" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke-width:0.26458332"
+       id="rect4583"
+       width="1.8520833"
+       height="0.26458332"
+       x="1.3229167"
+       y="295.67706" />
+    <rect
+       style="fill:#000000;stroke-width:0.26458332"
+       id="rect4587"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.5874999"
+       y="294.61874" />
+  </g>
+</svg>
diff --git a/Icons/Chicago95/actions/16/pan-right-symbolic.png b/Icons/Chicago95/actions/16/pan-right-symbolic.png_bak
similarity index 100%
rename from Icons/Chicago95/actions/16/pan-right-symbolic.png
rename to Icons/Chicago95/actions/16/pan-right-symbolic.png_bak
diff --git a/Icons/Chicago95/actions/16/pan-right-symbolic.svg b/Icons/Chicago95/actions/16/pan-right-symbolic.svg
new file mode 100644
index 0000000..746a5e6
--- /dev/null
+++ b/Icons/Chicago95/actions/16/pan-right-symbolic.svg
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 4.2333332 4.2333335"
+   version="1.1"
+   id="svg8"
+   shape-rendering="crispEdges"
+   sodipodi:docname="pan-down-symbolic.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
+  <defs
+     id="defs2" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.4"
+     inkscape:cx="11.650233"
+     inkscape:cy="10.389158"
+     inkscape:document-units="mm"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:pagecheckerboard="true"
+     inkscape:showpageshadow="false"
+     showborder="true"
+     objecttolerance="10000"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     gridtolerance="10000"
+     inkscape:snap-global="true"
+     inkscape:bbox-nodes="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="848"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid10"
+       empspacing="1"
+       dotted="false" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-292.76665)">
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke-width:0.26458332"
+       id="rect4577"
+       width="0.26458332"
+       height="2.3812499"
+       x="1.0583335"
+       y="293.56039" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke-width:0.26458332"
+       id="rect4579"
+       width="2.1166666"
+       height="0.26458332"
+       x="1.3229167"
+       y="293.56039" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke-width:0.26458332"
+       id="rect4581"
+       width="0.26458332"
+       height="2.1166666"
+       x="3.175"
+       y="293.82498" />
+    <rect
+       style="fill:#808080;fill-opacity:1;stroke-width:0.26458332"
+       id="rect4583"
+       width="1.8520833"
+       height="0.26458332"
+       x="1.3229167"
+       y="295.67706" />
+    <rect
+       style="fill:#000000;stroke-width:0.26458332"
+       id="rect4585"
+       width="0.26458332"
+       height="1.3229166"
+       x="2.1166666"
+       y="294.08957" />
+    <rect
+       style="fill:#000000;stroke-width:0.26458332"
+       id="rect4587"
+       width="1.3229166"
+       height="0.26458332"
+       x="1.5874999"
+       y="294.61874" />
+  </g>
+</svg>
diff --git a/Icons/Chicago95/actions/16/window-maximize.png b/Icons/Chicago95/actions/16/window-maximize.png
index 1ab181c..d0827ce 100755
Binary files a/Icons/Chicago95/actions/16/window-maximize.png and b/Icons/Chicago95/actions/16/window-maximize.png differ
diff --git a/Icons/Chicago95/actions/16/window-restore.png b/Icons/Chicago95/actions/16/window-restore.png
index f8540c8..0632ebe 100755
Binary files a/Icons/Chicago95/actions/16/window-restore.png and b/Icons/Chicago95/actions/16/window-restore.png differ
diff --git a/Icons/Chicago95/icon-theme.cache b/Icons/Chicago95/icon-theme.cache
index d117f19..8d7757d 100644
Binary files a/Icons/Chicago95/icon-theme.cache and b/Icons/Chicago95/icon-theme.cache differ
diff --git a/Icons/Chicago95/places/16/desktop.png b/Icons/Chicago95/places/16/desktop.png
deleted file mode 120000
index 200ab00..0000000
--- a/Icons/Chicago95/places/16/desktop.png
+++ /dev/null
@@ -1 +0,0 @@
-user-desktop.png
\ No newline at end of file
diff --git a/Icons/Chicago95/places/16/desktop.png b/Icons/Chicago95/places/16/desktop.png
new file mode 100644
index 0000000..fe4badc
Binary files /dev/null and b/Icons/Chicago95/places/16/desktop.png differ
diff --git a/Icons/Chicago95/places/16/gnome-ccdesktop.png b/Icons/Chicago95/places/16/gnome-ccdesktop.png
index 200ab00..3c40326 120000
--- a/Icons/Chicago95/places/16/gnome-ccdesktop.png
+++ b/Icons/Chicago95/places/16/gnome-ccdesktop.png
@@ -1 +1 @@
-user-desktop.png
\ No newline at end of file
+desktop.png
\ No newline at end of file
diff --git a/Icons/Chicago95/places/16/gnome-desktop-config.png b/Icons/Chicago95/places/16/gnome-desktop-config.png
index 200ab00..3c40326 120000
--- a/Icons/Chicago95/places/16/gnome-desktop-config.png
+++ b/Icons/Chicago95/places/16/gnome-desktop-config.png
@@ -1 +1 @@
-user-desktop.png
\ No newline at end of file
+desktop.png
\ No newline at end of file
diff --git a/Icons/Chicago95/places/16/gnome-fs-desktop.png b/Icons/Chicago95/places/16/gnome-fs-desktop.png
index 200ab00..3c40326 120000
--- a/Icons/Chicago95/places/16/gnome-fs-desktop.png
+++ b/Icons/Chicago95/places/16/gnome-fs-desktop.png
@@ -1 +1 @@
-user-desktop.png
\ No newline at end of file
+desktop.png
\ No newline at end of file
diff --git a/Icons/Chicago95/places/16/user-desktop.png b/Icons/Chicago95/places/16/user-desktop.png
deleted file mode 100644
index 9aaa876..0000000
Binary files a/Icons/Chicago95/places/16/user-desktop.png and /dev/null differ
diff --git a/Icons/Chicago95/places/16/user-desktop.png b/Icons/Chicago95/places/16/user-desktop.png
new file mode 120000
index 0000000..3c40326
--- /dev/null
+++ b/Icons/Chicago95/places/16/user-desktop.png
@@ -0,0 +1 @@
+desktop.png
\ No newline at end of file
diff --git a/Theme/Chicago95/gtk-3.0/gtk-widgets.css b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
index f7ee2b7..ee697af 100644
--- a/Theme/Chicago95/gtk-3.0/gtk-widgets.css
+++ b/Theme/Chicago95/gtk-3.0/gtk-widgets.css
@@ -182,13 +182,16 @@ expander arrow {
     background-image: url("assets/arrow-down-selected.png"); }
 
 treeview.view.expander {
- -gtk-icon-source: url("assets/expander_plus.png"); }
+  -gtk-icon-palette: default;
+  -gtk-icon-source: -gtk-icontheme('pan-right-symbolic'); }
   treeview.view.expander:selected {
-    -gtk-icon-source: url("assets/expander_plus_highlight.png"); }
+    color: @selected_fg_color;
+    -gtk-icon-source: -gtk-icontheme('pan-right-symbolic'); }
   treeview.view.expander:checked {
-    -gtk-icon-source: url("assets/expander_minus.png"); }
+    -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
   treeview.view.expander:checked:selected {
-    -gtk-icon-source: url("assets/expander_minus_highlight.png"); }
+    color: @selected_fg_color;
+    -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
 
 /************
  * iconview *