diff --git a/Aduru-Dark.tar.gz b/Aduru-Dark.tar.gz
index f9bc798..bd1df7f 100644
Binary files a/Aduru-Dark.tar.gz and b/Aduru-Dark.tar.gz differ
diff --git a/Aduru-Darker.tar.gz b/Aduru-Darker.tar.gz
index a6ba341..8282fed 100644
Binary files a/Aduru-Darker.tar.gz and b/Aduru-Darker.tar.gz differ
diff --git a/Aduru.tar.gz b/Aduru.tar.gz
index 919e83e..595eb4b 100644
Binary files a/Aduru.tar.gz and b/Aduru.tar.gz differ
diff --git a/src/gnome-shell/assets-common/close-window-hover.svg b/src/gnome-shell/assets-common/close-window-hover.svg
index 13d86a0..401ba44 100644
--- a/src/gnome-shell/assets-common/close-window-hover.svg
+++ b/src/gnome-shell/assets-common/close-window-hover.svg
@@ -96,9 +96,9 @@
      pagecolor="#000000"
      id="base"
      showgrid="false"
-     inkscape:zoom="9.0054155"
-     inkscape:cx="-24.016455"
-     inkscape:cy="-3.4599545"
+     inkscape:zoom="23.38173"
+     inkscape:cx="5.9977145"
+     inkscape:cy="11.525987"
      inkscape:window-x="1366"
      inkscape:window-y="30"
      inkscape:current-layer="close-button"
@@ -134,7 +134,7 @@
          id="rect5147-9-1-7-4-1-6-6"
          d="m 96.440125,4.4078411 c -0.0054,-0.1160465 -0.03261,-0.2408063 -0.03261,-0.3583563 0,-3.75409003 3.021295,-6.7763327 6.774195,-6.7763327 3.75291,0 6.77419,3.02224267 6.77419,6.7763327 0,0.11755 -0.0266,0.2423098 -0.0325,0.3583563 -0.34568,-3.42530726 -3.22328,-6.0921822 -6.74164,-6.0921822 -3.518348,0 -6.395947,2.66687494 -6.741621,6.0921822 z"
          style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e9394c;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:0.48380801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /><path
-         d="m 100.84219,1.7058939 h 0.58511 c 0.007,-7.02e-5 0.0122,-2.692e-4 0.0183,0 0.14917,0.00655 0.29833,0.075257 0.40226,0.1829027 l 1.33478,1.3351896 1.35307,-1.3351896 c 0.15541,-0.134909 0.26134,-0.1788056 0.40224,-0.1829027 h 0.58512 v 0.5852885 c 0,0.1676676 -0.0201,0.3222891 -0.14629,0.4389666 l -1.33476,1.3351893 1.31648,1.3168991 c 0.11012,0.1101339 0.16457,0.2653993 0.16457,0.4206763 v 0.5852885 h -0.58512 c -0.15522,-5.9e-6 -0.31044,-0.05449 -0.42053,-0.1646124 l -1.33478,-1.3351894 -1.33478,1.3351894 c -0.1101,0.1101455 -0.26532,0.1646124 -0.42055,0.1646124 H 100.8422 V 5.8029137 c 0,-0.1552712 0.0544,-0.3105424 0.16457,-0.4206763 L 102.34155,4.0653383 101.00677,2.730149 C 100.88344,2.6162341 100.82938,2.4555021 100.8422,2.2911824 Z"
+         d="m 100.84218,1.7058936 h 0.58511 c 0.007,-7.02e-5 0.0122,-2.692e-4 0.0183,0 0.14917,0.00655 0.29833,0.075257 0.40226,0.1829027 l 1.33478,1.3351896 1.35307,-1.3351896 c 0.15541,-0.134909 0.26134,-0.1788056 0.40224,-0.1829027 h 0.58512 v 0.5852885 c 0,0.1676676 -0.0201,0.3222891 -0.14629,0.4389666 l -1.33476,1.3351893 1.31648,1.3168991 c 0.11012,0.1101339 0.16457,0.2653993 0.16457,0.4206763 v 0.5852885 h -0.58512 c -0.15522,-5.9e-6 -0.31044,-0.05449 -0.42053,-0.1646124 l -1.33478,-1.3351894 -1.33478,1.3351894 c -0.1101,0.1101455 -0.26532,0.1646124 -0.42055,0.1646124 h -0.58511 V 5.8029134 c 0,-0.1552712 0.0544,-0.3105424 0.16457,-0.4206763 l 1.33478,-1.3168991 -1.33478,-1.3351893 c -0.12333,-0.1139149 -0.17739,-0.2746469 -0.16457,-0.4389666 z"
          inkscape:connector-curvature="0"
          id="path27279-0-5-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;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86190695;marker:none;enable-background:new"
diff --git a/src/gnome-shell/assets-common/close-window.svg b/src/gnome-shell/assets-common/close-window.svg
index 1a83508..d687f39 100644
--- a/src/gnome-shell/assets-common/close-window.svg
+++ b/src/gnome-shell/assets-common/close-window.svg
@@ -96,9 +96,9 @@
      pagecolor="#000000"
      id="base"
      showgrid="false"
-     inkscape:zoom="16"
-     inkscape:cx="19.830697"
-     inkscape:cy="14.458114"
+     inkscape:zoom="14.6875"
+     inkscape:cx="9.9074675"
+     inkscape:cy="6.2471142"
      inkscape:window-x="1366"
      inkscape:window-y="30"
      inkscape:current-layer="close-button"
@@ -134,7 +134,7 @@
          id="rect5147-9-1-7-4-1-6-6"
          d="m 96.457345,4.1801826 c -0.0056,-0.1198768 -0.0337,-0.2487546 -0.0337,-0.3701846 0,-3.87800178 3.122004,-7 7.000005,-7 3.878,0 6.99999,3.12199822 6.99999,7 0,0.12143 -0.0275,0.2503078 -0.0336,0.3701846 -0.3572,-3.53836682 -3.33072,-6.2932676 -6.96636,-6.2932676 -3.635629,0 -6.609147,2.75490078 -6.966344,6.2932676 z"
          style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#e9394c;fill-opacity:0;fill-rule:nonzero;stroke:none;stroke-width:0.48380801;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" /><path
-         d="m 101.00614,1.3890519 h 0.60462 c 0.007,-7.26e-5 0.0126,-2.781e-4 0.0189,0 0.15414,0.00677 0.30827,0.077741 0.41567,0.1889398 l 1.37927,1.3792603 1.39817,-1.3792603 c 0.16059,-0.139362 0.27005,-0.1847075 0.41565,-0.1889398 h 0.60462 v 0.6046072 c 0,0.1732018 -0.0208,0.3329269 -0.15116,0.4534556 l -1.37926,1.3792601 1.36037,1.3603662 c 0.11379,0.1137691 0.17005,0.2741593 0.17005,0.4345616 v 0.6046072 h -0.60462 c -0.1604,-6.1e-6 -0.32079,-0.056289 -0.43455,-0.1700458 L 103.4246,4.6766038 102.04533,6.055864 c -0.11377,0.113781 -0.27417,0.1700458 -0.43457,0.1700458 h -0.60461 V 5.6213026 c 0,-0.1603963 0.0562,-0.3207925 0.17005,-0.4345616 l 1.37927,-1.3603662 -1.37927,-1.3792601 c -0.12744,-0.1176749 -0.1833,-0.2837121 -0.17006,-0.4534556 z"
+         d="m 100.7642,1.6286177 h 0.60462 c 0.007,-7.26e-5 0.0126,-2.781e-4 0.0189,0 0.15414,0.00677 0.30827,0.077741 0.41567,0.1889398 l 1.37927,1.3792603 1.39817,-1.3792603 c 0.16059,-0.139362 0.27005,-0.1847075 0.41565,-0.1889398 h 0.60462 v 0.6046072 c 0,0.1732018 -0.0208,0.3329269 -0.15116,0.4534556 l -1.37926,1.3792601 1.36037,1.3603662 c 0.11379,0.1137691 0.17005,0.2741593 0.17005,0.4345616 v 0.6046072 h -0.60462 c -0.1604,-6.1e-6 -0.32079,-0.056289 -0.43455,-0.1700458 l -1.37927,-1.3792602 -1.37927,1.3792602 c -0.11377,0.113781 -0.27417,0.1700458 -0.43457,0.1700458 h -0.60461 V 5.8608684 c 0,-0.1603963 0.0562,-0.3207925 0.17005,-0.4345616 l 1.37927,-1.3603662 -1.37927,-1.3792601 c -0.12744,-0.1176749 -0.1833,-0.2837121 -0.17006,-0.4534556 z"
          inkscape:connector-curvature="0"
          id="path27279-0-5-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;writing-mode:lr-tb;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86190695;marker:none;enable-background:new"
diff --git a/src/gnome-shell/scss/_common.scss b/src/gnome-shell/scss/_common.scss
index 0239f43..e478ebe 100644
--- a/src/gnome-shell/scss/_common.scss
+++ b/src/gnome-shell/scss/_common.scss
@@ -1357,7 +1357,7 @@ StScrollBar {
   box-shadow: inset 2px 0 darken($primary_color, 10%);
   min-width: 62px;
   padding: 20px 0 16px 0;
-  
+
   &:rtl {
     padding: 20px 0 16px 0;
   }
@@ -1766,9 +1766,9 @@ StScrollBar {
   //osd tooltip
   border-radius: 7px;
   padding: 4px 12px;
-  color: $fg_color;
-  background-color: $base_color;
-  border: 1px solid $border_color;
+  color: $light_fg_color;
+  background-color: $dark_base_color;
+  border: 1px solid $dark_border_color;
   text-align: center;
   -x-offset: 8px;
 }
@@ -2025,8 +2025,9 @@ StScrollBar {
   font-size: 11pt;
   width: 34em;
   margin: 0;
-  border-radius: 0 $standard_radius $standard_radius 0;
-  border: 1px solid $border_color;
+  border-radius: 0 0 $standard_radius 0;
+  border-right: 1px solid $border_color;
+  border-bottom: 1px solid $border_color !important;
   border-left-width: 0px !important;
   border-top-width: 0px !important;
   box-shadow: -2px 0 darken($primary_color, 10%);
diff --git a/src/gtk-3.0/_apps.scss b/src/gtk-3.0/_apps.scss
index 7cb6617..7c4699d 100644
--- a/src/gtk-3.0/_apps.scss
+++ b/src/gtk-3.0/_apps.scss
@@ -53,7 +53,8 @@
 // Tweak Tool
 list.tweak-categories {
   background-image: image($sidebar_bg_color);
-  border-width: 0px;
+  border-right-style: none;
+  border-right-width: 0px;
 
   separator {
     min-height: 0px;
@@ -110,6 +111,12 @@ list.tweak-categories {
   }
 }
 
+// Evolution
+#main-toolbar {
+  // get rid of the huge icons
+  -gtk-icon-style: symbolic;
+}
+
 // Builder
 
 window.workbench {