diff --git a/src/assets/gnome-shell/common-assets/window-close-24-symbolic.svg b/src/assets/gnome-shell/common-assets/window-close-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/common-assets/window-close-24-symbolic.svg
rename to src/assets/gnome-shell/common-assets/window-close-symbolic.svg
diff --git a/src/assets/gnome-shell/icons/scalable/status/carousel-arrow-back-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/carousel-arrow-back-symbolic.svg
new file mode 100644
index 00000000..98489309
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/status/carousel-arrow-back-symbolic.svg
@@ -0,0 +1,36 @@
+<?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"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24.000001"
+   version="1.1"
+   id="svg19258">
+  <defs
+     id="defs19252" />
+  <metadata
+     id="metadata19255">
+    <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
+     id="g834"
+     transform="rotate(-90,-246.75894,471.75774)"
+     style="fill:#241f31">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#241f31;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 213.0007,724.40348 -10.3711,7.3945 v 0 a 1.5,1.5 0 0 0 -0.6308,1.2187 v 1.5 h 1.5 a 1.5,1.5 0 0 0 0.8711,-0.2793 l 8.6289,-6.1523 8.6289,6.1523 a 1.5,1.5 0 0 0 0.8711,0.2793 h 1.5 v -1.5 a 1.5,1.5 0 0 0 -0.6309,-1.2187 v 0 z"
+       id="path832" />
+  </g>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/status/carousel-arrow-next-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/carousel-arrow-next-symbolic.svg
new file mode 100644
index 00000000..7d6356f2
--- /dev/null
+++ b/src/assets/gnome-shell/icons/scalable/status/carousel-arrow-next-symbolic.svg
@@ -0,0 +1,36 @@
+<?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"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24.000001"
+   version="1.1"
+   id="svg19258">
+  <defs
+     id="defs19252" />
+  <metadata
+     id="metadata19255">
+    <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
+     id="g872"
+     transform="matrix(0,-1,-1,0,742.51668,224.9988)"
+     style="fill:#241f31">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#241f31;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 213.0007,724.40348 -10.3711,7.3945 v 0 a 1.5,1.5 0 0 0 -0.6308,1.2187 v 1.5 h 1.5 a 1.5,1.5 0 0 0 0.8711,-0.2793 l 8.6289,-6.1523 8.6289,6.1523 a 1.5,1.5 0 0 0 0.8711,0.2793 h 1.5 v -1.5 a 1.5,1.5 0 0 0 -0.6309,-1.2187 v 0 z"
+       id="path870" />
+  </g>
+</svg>
diff --git a/src/assets/gnome-shell/icons/scalable/status/window-close-24-symbolic.svg b/src/assets/gnome-shell/icons/scalable/status/window-close-symbolic.svg
similarity index 100%
rename from src/assets/gnome-shell/icons/scalable/status/window-close-24-symbolic.svg
rename to src/assets/gnome-shell/icons/scalable/status/window-close-symbolic.svg
diff --git a/src/main/gnome-shell/gnome-shell-theme.gresource.xml b/src/main/gnome-shell/gnome-shell-theme.gresource.xml
index 0a6771ca..f00dead0 100644
--- a/src/main/gnome-shell/gnome-shell-theme.gresource.xml
+++ b/src/main/gnome-shell/gnome-shell-theme.gresource.xml
@@ -14,7 +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/window-close-symbolic.svg</file>
     <file>assets/activities.svg</file>
     <file>assets/view-app-grid.svg</file>
     <file>assets/background.png</file>
@@ -27,7 +27,9 @@
     <file>icons/scalable/status/keyboard-layout-filled-symbolic.svg</file>
     <file>icons/scalable/status/keyboard-shift-filled-symbolic.svg</file>
     <file>icons/scalable/status/message-indicator-symbolic.svg</file>
-    <file>icons/scalable/status/window-close-24-symbolic.svg</file>
+    <file>icons/scalable/status/window-close-symbolic.svg</file>
+    <file>icons/scalable/status/carousel-arrow-back-symbolic.svg</file>
+    <file>icons/scalable/status/carousel-arrow-next-symbolic.svg</file>
     <file>icons/scalable/actions/pointer-double-click-symbolic.svg</file>
     <file>icons/scalable/actions/pointer-drag-symbolic.svg</file>
     <file>icons/scalable/actions/pointer-primary-click-symbolic.svg</file>
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 5be90959..112fece2 100644
--- a/src/sass/gnome-shell/widgets-40-0/_window-picker.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_window-picker.scss
@@ -25,11 +25,11 @@ $window_close_button_padding: 3px;
   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");
+//  background-image: url("assets/window-close-symbolic.svg");
 
-  StIcon {
-    icon-size: 1px; // Can't set to 0
-  }
+//  StIcon {
+//    icon-size: 1px; // Can't set to 0
+//  }
 
   &:hover {
     color: white;