diff --git a/src/_sass/gtk/apps/_misc.scss b/src/_sass/gtk/apps/_misc.scss
index ae311be..20cc434 100644
--- a/src/_sass/gtk/apps/_misc.scss
+++ b/src/_sass/gtk/apps/_misc.scss
@@ -76,7 +76,7 @@ window.background.chromium {
   // toolbar's border-bottom refers to button's border
   // FIXME: Chrome's button border ignores theme's alpha value :(
   entry,
-  > button { border: 1px solid $track; }
+  > button { border: 1px solid $titlebar-backdrop; }
 
   > button {
     color: $primary;
diff --git a/src/gnome-shell/sass/widgets/_app-grid.scss b/src/gnome-shell/sass/widgets/_app-grid.scss
index 2bba4a4..a56f4c7 100644
--- a/src/gnome-shell/sass/widgets/_app-grid.scss
+++ b/src/gnome-shell/sass/widgets/_app-grid.scss
@@ -203,7 +203,6 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(0,0,0,0.8);
   color: #fff;
   border-radius: 99px;
-  icon-size: 8px;
 }
 
 .page-navigation-hint {
diff --git a/src/gnome-shell/sass/widgets/_osd-42.scss b/src/gnome-shell/sass/widgets/_osd-42.scss
index 30b87c5..ff428f0 100644
--- a/src/gnome-shell/sass/widgets/_osd-42.scss
+++ b/src/gnome-shell/sass/widgets/_osd-42.scss
@@ -9,10 +9,11 @@ $osd_levelbar_height: 4px;
   spacing: $container_padding * 2; // 12px
   padding: $container_padding * 2 $container_padding * 3;
   & > * { spacing: 8px; }
-  margin-bottom: $container_margin;
+  margin-bottom: $container_margin * 16; // 32px
+  min-height: 24px;
 
   StIcon {
-    icon-size: 96px;
+    icon-size: 24px;
   }
 
   .osd-monitor-label { font-size: 3em; }
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 a251628..28c33b6 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css
@@ -2450,7 +2450,6 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
   border-radius: 99px;
-  icon-size: 8px;
 }
 
 .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 77ff658..bb1a45b 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
@@ -2450,7 +2450,6 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
   border-radius: 99px;
-  icon-size: 8px;
 }
 
 .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 10177ab..a6e2a2a 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css
@@ -2450,7 +2450,6 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
   border-radius: 99px;
-  icon-size: 8px;
 }
 
 .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 792752a..b25d263 100644
--- a/src/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/gnome-shell/shell-40-0/gnome-shell.css
@@ -2450,7 +2450,6 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
   border-radius: 99px;
-  icon-size: 8px;
 }
 
 .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 05e274f..e00fa85 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css
@@ -1745,7 +1745,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: bold;
   spacing: 8px;
   padding: 8px 12px;
-  margin-bottom: 2px;
+  margin-bottom: 32px;
+  min-height: 24px;
 }
 
 .osd-window > * {
@@ -1753,7 +1754,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .osd-window StIcon {
-  icon-size: 96px;
+  icon-size: 24px;
 }
 
 .osd-window .osd-monitor-label {
@@ -2524,7 +2525,6 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
   border-radius: 99px;
-  icon-size: 8px;
 }
 
 .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 add5eeb..e7a9760 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
@@ -1745,7 +1745,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: bold;
   spacing: 8px;
   padding: 8px 12px;
-  margin-bottom: 2px;
+  margin-bottom: 32px;
+  min-height: 24px;
 }
 
 .osd-window > * {
@@ -1753,7 +1754,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .osd-window StIcon {
-  icon-size: 96px;
+  icon-size: 24px;
 }
 
 .osd-window .osd-monitor-label {
@@ -2524,7 +2525,6 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
   border-radius: 99px;
-  icon-size: 8px;
 }
 
 .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 e54d302..53a7bef 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css
@@ -1745,7 +1745,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: bold;
   spacing: 12px;
   padding: 12px 18px;
-  margin-bottom: 4px;
+  margin-bottom: 64px;
+  min-height: 24px;
 }
 
 .osd-window > * {
@@ -1753,7 +1754,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .osd-window StIcon {
-  icon-size: 96px;
+  icon-size: 24px;
 }
 
 .osd-window .osd-monitor-label {
@@ -2524,7 +2525,6 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
   border-radius: 99px;
-  icon-size: 8px;
 }
 
 .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 1574450..6456819 100644
--- a/src/gnome-shell/shell-42-0/gnome-shell.css
+++ b/src/gnome-shell/shell-42-0/gnome-shell.css
@@ -1745,7 +1745,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   font-weight: bold;
   spacing: 12px;
   padding: 12px 18px;
-  margin-bottom: 4px;
+  margin-bottom: 64px;
+  min-height: 24px;
 }
 
 .osd-window > * {
@@ -1753,7 +1754,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
 }
 
 .osd-window StIcon {
-  icon-size: 96px;
+  icon-size: 24px;
 }
 
 .osd-window .osd-monitor-label {
@@ -2524,7 +2525,6 @@ StWidget.focused .app-well-app-running-dot {
   background-color: rgba(0, 0, 0, 0.8);
   color: #fff;
   border-radius: 99px;
-  icon-size: 8px;
 }
 
 .page-navigation-hint {
diff --git a/src/gtk/3.0/gtk-Compact.css b/src/gtk/3.0/gtk-Compact.css
index 83d6912..8294a41 100644
--- a/src/gtk/3.0/gtk-Compact.css
+++ b/src/gtk/3.0/gtk-Compact.css
@@ -7137,7 +7137,7 @@ window.background.chromium {
 
 window.background.chromium entry,
 window.background.chromium > button {
-  border: 1px solid rgba(0, 0, 0, 0.26);
+  border: 1px solid #2C2C2C;
 }
 
 window.background.chromium > button {
diff --git a/src/gtk/3.0/gtk-Dark-Compact.css b/src/gtk/3.0/gtk-Dark-Compact.css
index 7648dff..adcf7a7 100644
--- a/src/gtk/3.0/gtk-Dark-Compact.css
+++ b/src/gtk/3.0/gtk-Dark-Compact.css
@@ -7133,7 +7133,7 @@ window.background.chromium {
 
 window.background.chromium entry,
 window.background.chromium > button {
-  border: 1px solid rgba(255, 255, 255, 0.3);
+  border: 1px solid #2C2C2C;
 }
 
 window.background.chromium > button {
diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css
index ef97da5..8844760 100644
--- a/src/gtk/3.0/gtk-Dark.css
+++ b/src/gtk/3.0/gtk-Dark.css
@@ -7133,7 +7133,7 @@ window.background.chromium {
 
 window.background.chromium entry,
 window.background.chromium > button {
-  border: 1px solid rgba(255, 255, 255, 0.3);
+  border: 1px solid #2C2C2C;
 }
 
 window.background.chromium > button {
diff --git a/src/gtk/3.0/gtk-Light-Compact.css b/src/gtk/3.0/gtk-Light-Compact.css
index 1bf6d20..11ae600 100644
--- a/src/gtk/3.0/gtk-Light-Compact.css
+++ b/src/gtk/3.0/gtk-Light-Compact.css
@@ -7136,7 +7136,7 @@ window.background.chromium {
 
 window.background.chromium entry,
 window.background.chromium > button {
-  border: 1px solid rgba(0, 0, 0, 0.26);
+  border: 1px solid #FFFFFF;
 }
 
 window.background.chromium > button {
diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css
index 7051b4c..91c7359 100644
--- a/src/gtk/3.0/gtk-Light.css
+++ b/src/gtk/3.0/gtk-Light.css
@@ -7136,7 +7136,7 @@ window.background.chromium {
 
 window.background.chromium entry,
 window.background.chromium > button {
-  border: 1px solid rgba(0, 0, 0, 0.26);
+  border: 1px solid #FFFFFF;
 }
 
 window.background.chromium > button {
diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css
index db07f01..f8727a4 100644
--- a/src/gtk/3.0/gtk.css
+++ b/src/gtk/3.0/gtk.css
@@ -7137,7 +7137,7 @@ window.background.chromium {
 
 window.background.chromium entry,
 window.background.chromium > button {
-  border: 1px solid rgba(0, 0, 0, 0.26);
+  border: 1px solid #2C2C2C;
 }
 
 window.background.chromium > button {