diff --git a/src/assets/gnome-shell/common-assets/window-close-24-symbolic.svg b/src/assets/gnome-shell/common-assets/window-close-24-symbolic.svg
new file mode 100644
index 00000000..8f027dc7
--- /dev/null
+++ b/src/assets/gnome-shell/common-assets/window-close-24-symbolic.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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="24"
+   height="24"
+   version="1.1"
+   viewBox="0 0 6.35 6.35"
+   id="svg6"
+   sodipodi:docname="window-close-24-symbolic.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="708"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="21.583333"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg6" />
+  <metadata
+     id="metadata2">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     d="m1.5875 1.5875h0.26458c0.00274-3.18e-5 0.0055-1.217e-4 0.00827 0 0.067456 0.00296 0.1349 0.03402 0.1819 0.082682l1.1336 1.1328 1.1402-1.1328c0.07028-0.060986 0.11818-0.08083 0.1819-0.082682h0.26458v0.26458c0 0.075795-0.00909 0.14569-0.066146 0.19844l-1.1319 1.1245 1.1236 1.1327c0.049791 0.049787 0.074412 0.11998 0.074414 0.19017v0.26458h-0.26458c-0.070194-2.6e-6 -0.14038-0.024633-0.19017-0.074414l-1.1319-1.1327-1.1336 1.1327c-0.049785 0.049792-0.11998 0.074414-0.19017 0.074414h-0.26458v-0.26458c-8e-7 -0.070191 0.024622-0.14038 0.074414-0.19017l1.1336-1.1327-1.1336-1.1245c-0.055759-0.051496-0.080211-0.12416-0.074414-0.19844z"
+     color="#bebebe"
+     enable-background="new"
+     fill="#333"
+     style="text-decoration-line:none;text-indent:0;text-transform:none;fill:#ffffff"
+     id="path4" />
+</svg>
diff --git a/src/main/gnome-shell/gnome-shell-theme.gresource.xml b/src/main/gnome-shell/gnome-shell-theme.gresource.xml
index f8e3b0cb..0a6771ca 100644
--- a/src/main/gnome-shell/gnome-shell-theme.gresource.xml
+++ b/src/main/gnome-shell/gnome-shell-theme.gresource.xml
@@ -14,6 +14,7 @@
     <file>assets/window-close.svg</file>
     <file>assets/window-close-hover.svg</file>
     <file>assets/window-close-active.svg</file>
+    <file>assets/window-close-24-symbolic.svg</file>
     <file>assets/activities.svg</file>
     <file>assets/view-app-grid.svg</file>
     <file>assets/background.png</file>
diff --git a/src/sass/gnome-shell/widgets-40-0/_misc.scss b/src/sass/gnome-shell/widgets-40-0/_misc.scss
index bf79abed..498de521 100644
--- a/src/sass/gnome-shell/widgets-40-0/_misc.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_misc.scss
@@ -1,5 +1,12 @@
-/* Workspace animation */
-
+// Workspace animation
 .workspace-animation {
   background-color: rgba($osd_bg_color, 1);
 }
+
+// reset prev/next month icons
+.calendar {
+  .calendar-change-month-back,
+  .calendar-change-month-forward {
+    padding: 0 2px;
+  }
+}
diff --git a/src/sass/gnome-shell/widgets-40-0/_window-picker.scss b/src/sass/gnome-shell/widgets-40-0/_window-picker.scss
index 0d0108f7..ccd65607 100644
--- a/src/sass/gnome-shell/widgets-40-0/_window-picker.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_window-picker.scss
@@ -18,23 +18,26 @@ $window_close_button_padding: 3px;
 // Close button
 .window-close {
   background-color: rgba($osd_bg_color, 1);
-  color: $osd_fg_color;
+  color: white;
   border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
   padding: $window_close_button_padding;
   height: $window_close_button_size;
   width: $window_close_button_size;
   box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
   transition-duration: 300ms;
+  background-image: url("assets/window-close-24-symbolic.svg");
 
-  & StIcon { icon-size: 24px; }
+  StIcon {
+    icon-size: 1px; // Can't set to 0
+  }
 
   &:hover {
-    color: lighten($osd_fg_color, 10%);
+    color: white;
     background-color: lighten(rgba($osd_bg_color, 1), 15%);
   }
 
   &:active {
-    color: transparentize($osd_fg_color, 0.2);
+    color: white;
     background-color: darken(rgba($osd_bg_color, 1), 5%);
   }
 }
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 006ef257..dbd7071a 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -623,11 +623,6 @@ button {
     &:not(:disabled) label:disabled { color: inherit; opacity: 0.6; }
   }
 
-  //Webkitgtk workaround start
-  &:active { color: $fg_color; }
-  &:active:hover, &:checked { color: $selected_fg_color; }
-  //Webkitgtk workaround end
-
   &:disabled {
     @include button(insensitive);
 
@@ -1846,10 +1841,6 @@ headerbar, .titlebar {
     transition-duration: 300ms;
   }
 
-  &:not(.suggested-action):not(.destructive-action) {
-    &:active:hover, &:checked { color: $header_fg; }
-  }
-
   &:checked {
     @include button(header-checked);
     transition: $button_transition;
@@ -4099,13 +4090,14 @@ headerbar,
       min-height: 16px;
       margin: 0;
       padding: 0;
-      color: transparent;
-      background-color: transparent;
       background-position: center;
       background-repeat: no-repeat;
       background-size: 16px 16px;
-      border-width: 0;
-      box-shadow: none;
+
+      &, &:hover, &:focus, &:active, &:backdrop {
+        @include button(undecorated);
+        color: transparent;
+      }
 
       &:backdrop { opacity: 1; }
     }