diff --git a/src/_sass/gnome-shell/_common.scss b/src/_sass/gnome-shell/_common.scss
index 81eab63..8819adf 100644
--- a/src/_sass/gnome-shell/_common.scss
+++ b/src/_sass/gnome-shell/_common.scss
@@ -64,6 +64,5 @@ $bubble_button_radius: if($corner_style == 'circular', $circular-radius, $materi
   background-color: $system;
   border: none;
   box-shadow: $shell-shadow-z4;
-  border-radius: $circular-radius;
   padding: $space-size * 2;
 }
diff --git a/src/_sass/gnome-shell/widgets/_app-grid.scss b/src/_sass/gnome-shell/widgets/_app-grid.scss
index 74d1748..af4c670 100644
--- a/src/_sass/gnome-shell/widgets/_app-grid.scss
+++ b/src/_sass/gnome-shell/widgets/_app-grid.scss
@@ -199,7 +199,7 @@ StWidget.focused .app-well-app-running-dot {
 .system-action-icon {
   background-color: rgba(0,0,0,0.8);
   color: #fff;
-  border-radius: 99px;
+  border-radius: $circular-radius;
 }
 
 .page-navigation-hint {
diff --git a/src/_sass/gnome-shell/widgets/_osd-42.scss b/src/_sass/gnome-shell/widgets/_osd-42.scss
index a1e269a..97f4e89 100644
--- a/src/_sass/gnome-shell/widgets/_osd-42.scss
+++ b/src/_sass/gnome-shell/widgets/_osd-42.scss
@@ -9,6 +9,7 @@ $osd_levelbar_height: 4px;
   spacing: $space-size * 2;
   padding: $space-size * 2 $space-size * 3;
   margin-bottom: 8em;
+  border-radius: $circular-radius;
 
   & > * { spacing: 8px; }
 
@@ -68,4 +69,5 @@ $osd_levelbar_height: 4px;
 
 .resize-popup {
   @extend %osd_panel;
+  border-radius: $window-radius;
 }
diff --git a/src/_sass/gnome-shell/widgets/_osd.scss b/src/_sass/gnome-shell/widgets/_osd.scss
index 2854b69..2f9dd92 100644
--- a/src/_sass/gnome-shell/widgets/_osd.scss
+++ b/src/_sass/gnome-shell/widgets/_osd.scss
@@ -10,6 +10,7 @@ $osd_levelbar_height: 4px;
   margin: $margin-size * 8; // 32px
   min-width: 64px;
   min-height: 64px;
+  border-radius: $window-radius;
 
   StIcon {
     icon-size: 96px;
diff --git a/src/_sass/gnome-shell/widgets/_switcher-popup.scss b/src/_sass/gnome-shell/widgets/_switcher-popup.scss
index 6a6222f..daab1ae 100644
--- a/src/_sass/gnome-shell/widgets/_switcher-popup.scss
+++ b/src/_sass/gnome-shell/widgets/_switcher-popup.scss
@@ -8,6 +8,7 @@
 // switcher onscreen panel
 .switcher-list {
   @extend %osd_panel;
+  border-radius: $window-radius;
 
   .item-box {
     padding: 8px;
@@ -20,7 +21,7 @@
 
     &:selected {
       background-color: $primary;
-      color: on(dark);
+      color: on($primary);
     }
   }
 
@@ -45,10 +46,11 @@
 }
 
 .switcher-arrow {
-  border-color: rgba(0,0,0,0);
-  color: $text-disabled;
+  border-color: on(dark, secondary);
+  color: on(dark, secondary);
+
   &:highlighted {
-    color: $text;
+    color: on($primary);
   }
 }
 
diff --git a/src/_sass/gnome-shell/widgets/_workspace-switcher.scss b/src/_sass/gnome-shell/widgets/_workspace-switcher.scss
index f581d98..eb553ea 100644
--- a/src/_sass/gnome-shell/widgets/_workspace-switcher.scss
+++ b/src/_sass/gnome-shell/widgets/_workspace-switcher.scss
@@ -5,6 +5,7 @@
 
 .workspace-switcher-container {
   @extend %osd_panel;
+  border-radius: $window-radius;
 }
 
 .workspace-switcher {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
index 5207a0c..7c00026 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
@@ -88,7 +88,6 @@ stage {
   background-color: #212121;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
-  border-radius: 9999px;
   padding: 8px;
 }
 
@@ -1768,6 +1767,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   margin: 16px;
   min-width: 64px;
   min-height: 64px;
+  border-radius: 16px;
 }
 
 .osd-window StIcon {
@@ -1813,6 +1813,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 16px;
 }
 
+.switcher-list {
+  border-radius: 16px;
+}
+
 .switcher-list .item-box {
   padding: 8px;
   border-radius: 10px;
@@ -1847,12 +1851,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .switcher-arrow {
-  border-color: rgba(0, 0, 0, 0);
-  color: rgba(0, 0, 0, 0.38);
+  border-color: rgba(255, 255, 255, 0.7);
+  color: rgba(255, 255, 255, 0.7);
 }
 
 .switcher-arrow:highlighted {
-  color: rgba(0, 0, 0, 0.87);
+  color: white;
 }
 
 .input-source-switcher-symbol {
@@ -1870,6 +1874,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 8px;
 }
 
+.workspace-switcher-container {
+  border-radius: 16px;
+}
+
 .workspace-switcher {
   background: transparent;
   border: none;
@@ -2584,7 +2592,7 @@ StWidget.focused .app-well-app-running-dot {
 .system-action-icon {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
-  border-radius: 99px;
+  border-radius: 9999px;
 }
 
 .page-navigation-hint {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
index 965cc6e..4b801f2 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css
@@ -88,7 +88,6 @@ stage {
   background-color: #212121;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
-  border-radius: 9999px;
   padding: 8px;
 }
 
@@ -1768,6 +1767,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   margin: 16px;
   min-width: 64px;
   min-height: 64px;
+  border-radius: 16px;
 }
 
 .osd-window StIcon {
@@ -1813,6 +1813,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 16px;
 }
 
+.switcher-list {
+  border-radius: 16px;
+}
+
 .switcher-list .item-box {
   padding: 8px;
   border-radius: 10px;
@@ -1847,8 +1851,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .switcher-arrow {
-  border-color: rgba(0, 0, 0, 0);
-  color: rgba(255, 255, 255, 0.5);
+  border-color: rgba(255, 255, 255, 0.7);
+  color: rgba(255, 255, 255, 0.7);
 }
 
 .switcher-arrow:highlighted {
@@ -1870,6 +1874,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 8px;
 }
 
+.workspace-switcher-container {
+  border-radius: 16px;
+}
+
 .workspace-switcher {
   background: transparent;
   border: none;
@@ -2584,7 +2592,7 @@ StWidget.focused .app-well-app-running-dot {
 .system-action-icon {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
-  border-radius: 99px;
+  border-radius: 9999px;
 }
 
 .page-navigation-hint {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
index 3622b83..960e100 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
@@ -88,7 +88,6 @@ stage {
   background-color: #212121;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
-  border-radius: 9999px;
   padding: 12px;
 }
 
@@ -1768,6 +1767,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   margin: 32px;
   min-width: 64px;
   min-height: 64px;
+  border-radius: 18px;
 }
 
 .osd-window StIcon {
@@ -1813,6 +1813,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 24px;
 }
 
+.switcher-list {
+  border-radius: 18px;
+}
+
 .switcher-list .item-box {
   padding: 8px;
   border-radius: 10px;
@@ -1847,8 +1851,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .switcher-arrow {
-  border-color: rgba(0, 0, 0, 0);
-  color: rgba(255, 255, 255, 0.5);
+  border-color: rgba(255, 255, 255, 0.7);
+  color: rgba(255, 255, 255, 0.7);
 }
 
 .switcher-arrow:highlighted {
@@ -1870,6 +1874,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 12px;
 }
 
+.workspace-switcher-container {
+  border-radius: 18px;
+}
+
 .workspace-switcher {
   background: transparent;
   border: none;
@@ -2584,7 +2592,7 @@ StWidget.focused .app-well-app-running-dot {
 .system-action-icon {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
-  border-radius: 99px;
+  border-radius: 9999px;
 }
 
 .page-navigation-hint {
diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css
index 0d16b34..151301a 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -88,7 +88,6 @@ stage {
   background-color: #212121;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
-  border-radius: 9999px;
   padding: 12px;
 }
 
@@ -1768,6 +1767,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   margin: 32px;
   min-width: 64px;
   min-height: 64px;
+  border-radius: 18px;
 }
 
 .osd-window StIcon {
@@ -1813,6 +1813,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 24px;
 }
 
+.switcher-list {
+  border-radius: 18px;
+}
+
 .switcher-list .item-box {
   padding: 8px;
   border-radius: 10px;
@@ -1847,12 +1851,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .switcher-arrow {
-  border-color: rgba(0, 0, 0, 0);
-  color: rgba(0, 0, 0, 0.38);
+  border-color: rgba(255, 255, 255, 0.7);
+  color: rgba(255, 255, 255, 0.7);
 }
 
 .switcher-arrow:highlighted {
-  color: rgba(0, 0, 0, 0.87);
+  color: white;
 }
 
 .input-source-switcher-symbol {
@@ -1870,6 +1874,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 12px;
 }
 
+.workspace-switcher-container {
+  border-radius: 18px;
+}
+
 .workspace-switcher {
   background: transparent;
   border: none;
@@ -2584,7 +2592,7 @@ StWidget.focused .app-well-app-running-dot {
 .system-action-icon {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
-  border-radius: 99px;
+  border-radius: 9999px;
 }
 
 .page-navigation-hint {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
index 1b5fdda..a09b7c0 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
@@ -142,7 +142,6 @@ stage {
   background-color: #212121;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
-  border-radius: 9999px;
   padding: 8px;
 }
 
@@ -2093,6 +2092,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 8px;
   padding: 8px 12px;
   margin-bottom: 8em;
+  border-radius: 9999px;
 }
 
 .osd-window > * {
@@ -2167,12 +2167,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 15em;
 }
 
+.resize-popup {
+  border-radius: 16px;
+}
+
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
   spacing: 16px;
 }
 
+.switcher-list {
+  border-radius: 16px;
+}
+
 .switcher-list .item-box {
   padding: 8px;
   border-radius: 10px;
@@ -2207,12 +2215,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .switcher-arrow {
-  border-color: rgba(0, 0, 0, 0);
-  color: rgba(0, 0, 0, 0.38);
+  border-color: rgba(255, 255, 255, 0.7);
+  color: rgba(255, 255, 255, 0.7);
 }
 
 .switcher-arrow:highlighted {
-  color: rgba(0, 0, 0, 0.87);
+  color: white;
 }
 
 .input-source-switcher-symbol {
@@ -2230,6 +2238,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 8px;
 }
 
+.workspace-switcher-container {
+  border-radius: 16px;
+}
+
 .workspace-switcher {
   background: transparent;
   border: none;
@@ -2944,7 +2956,7 @@ StWidget.focused .app-well-app-running-dot {
 .system-action-icon {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
-  border-radius: 99px;
+  border-radius: 9999px;
 }
 
 .page-navigation-hint {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
index 120b59e..6dc9a17 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css
@@ -142,7 +142,6 @@ stage {
   background-color: #212121;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
-  border-radius: 9999px;
   padding: 8px;
 }
 
@@ -2097,6 +2096,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 8px;
   padding: 8px 12px;
   margin-bottom: 8em;
+  border-radius: 9999px;
 }
 
 .osd-window > * {
@@ -2171,12 +2171,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 15em;
 }
 
+.resize-popup {
+  border-radius: 16px;
+}
+
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
   spacing: 16px;
 }
 
+.switcher-list {
+  border-radius: 16px;
+}
+
 .switcher-list .item-box {
   padding: 8px;
   border-radius: 10px;
@@ -2211,8 +2219,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .switcher-arrow {
-  border-color: rgba(0, 0, 0, 0);
-  color: rgba(255, 255, 255, 0.5);
+  border-color: rgba(255, 255, 255, 0.7);
+  color: rgba(255, 255, 255, 0.7);
 }
 
 .switcher-arrow:highlighted {
@@ -2234,6 +2242,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 8px;
 }
 
+.workspace-switcher-container {
+  border-radius: 16px;
+}
+
 .workspace-switcher {
   background: transparent;
   border: none;
@@ -2948,7 +2960,7 @@ StWidget.focused .app-well-app-running-dot {
 .system-action-icon {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
-  border-radius: 99px;
+  border-radius: 9999px;
 }
 
 .page-navigation-hint {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
index 247c789..6dbbf29 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
@@ -142,7 +142,6 @@ stage {
   background-color: #212121;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
-  border-radius: 9999px;
   padding: 12px;
 }
 
@@ -2097,6 +2096,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 12px;
   padding: 12px 18px;
   margin-bottom: 8em;
+  border-radius: 9999px;
 }
 
 .osd-window > * {
@@ -2171,12 +2171,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 15em;
 }
 
+.resize-popup {
+  border-radius: 18px;
+}
+
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
   spacing: 24px;
 }
 
+.switcher-list {
+  border-radius: 18px;
+}
+
 .switcher-list .item-box {
   padding: 8px;
   border-radius: 10px;
@@ -2211,8 +2219,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .switcher-arrow {
-  border-color: rgba(0, 0, 0, 0);
-  color: rgba(255, 255, 255, 0.5);
+  border-color: rgba(255, 255, 255, 0.7);
+  color: rgba(255, 255, 255, 0.7);
 }
 
 .switcher-arrow:highlighted {
@@ -2234,6 +2242,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 12px;
 }
 
+.workspace-switcher-container {
+  border-radius: 18px;
+}
+
 .workspace-switcher {
   background: transparent;
   border: none;
@@ -2948,7 +2960,7 @@ StWidget.focused .app-well-app-running-dot {
 .system-action-icon {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
-  border-radius: 99px;
+  border-radius: 9999px;
 }
 
 .page-navigation-hint {
diff --git a/src/gnome-shell/shell-42-0/gnome-shell.css b/src/gnome-shell/shell-42-0/gnome-shell.css
index b8147c2..e72fd28 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell.css
@@ -142,7 +142,6 @@ stage {
   background-color: #212121;
   border: none;
   box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
-  border-radius: 9999px;
   padding: 12px;
 }
 
@@ -2093,6 +2092,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   spacing: 12px;
   padding: 12px 18px;
   margin-bottom: 8em;
+  border-radius: 9999px;
 }
 
 .osd-window > * {
@@ -2167,12 +2167,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   width: 15em;
 }
 
+.resize-popup {
+  border-radius: 18px;
+}
+
 /* App Switcher */
 .switcher-popup {
   padding: 8px;
   spacing: 24px;
 }
 
+.switcher-list {
+  border-radius: 18px;
+}
+
 .switcher-list .item-box {
   padding: 8px;
   border-radius: 10px;
@@ -2207,12 +2215,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .switcher-arrow {
-  border-color: rgba(0, 0, 0, 0);
-  color: rgba(0, 0, 0, 0.38);
+  border-color: rgba(255, 255, 255, 0.7);
+  color: rgba(255, 255, 255, 0.7);
 }
 
 .switcher-arrow:highlighted {
-  color: rgba(0, 0, 0, 0.87);
+  color: white;
 }
 
 .input-source-switcher-symbol {
@@ -2230,6 +2238,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   padding: 12px;
 }
 
+.workspace-switcher-container {
+  border-radius: 18px;
+}
+
 .workspace-switcher {
   background: transparent;
   border: none;
@@ -2944,7 +2956,7 @@ StWidget.focused .app-well-app-running-dot {
 .system-action-icon {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
-  border-radius: 99px;
+  border-radius: 9999px;
 }
 
 .page-navigation-hint {