diff --git a/src/sass/gnome-shell/common/_base.scss b/src/sass/gnome-shell/common/_base.scss
index 4fb9ce0..edc4af8 100644
--- a/src/sass/gnome-shell/common/_base.scss
+++ b/src/sass/gnome-shell/common/_base.scss
@@ -41,10 +41,11 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 %osd_panel {
   color: $fg_color;
   background-color: $base_color;
-  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
+  border-radius: $wm_radius;
+  border: solid rgba(black, 0.75);
+  border-width: if($variant=='light', 0, 1px);
   box-shadow: 0 3px 8px 0 rgba(black, 0.25);
-  border-radius: $bt_radius;
-  padding: 12px;
+  padding: $base_padding * 2;
 }
 
 %search-section-content-item {
diff --git a/src/sass/gnome-shell/common/_osd.scss b/src/sass/gnome-shell/common/_osd.scss
index 3995340..ed01111 100644
--- a/src/sass/gnome-shell/common/_osd.scss
+++ b/src/sass/gnome-shell/common/_osd.scss
@@ -10,19 +10,19 @@
   .level {
     height: 4px;
     border-radius: 3px;
-    background-color: rgba(black, 0.1);
+    background-color: $borders_color;
     color: $fg_color;
 
     // For >= 3.29.90
     -barlevel-height: 4px;
     // FIXME: above 'background-color' property rendered correct trough
     // colour already, so keep -background-color style-property transparent
-    -barlevel-background-color: rgba(black, 0.1);
+    -barlevel-background-color: $borders_color;
     -barlevel-active-background-color: $selected_bg_color;
     -barlevel-overdrive-color: $destructive_color;
     -barlevel-overdrive-separator-width: 2px;
     -barlevel-border-width: 0;
-    -barlevel-border-color: rgba(black, 0.15);
+    -barlevel-border-color: transparent;
   }
 
   .level-bar {
diff --git a/src/sass/gnome-shell/widgets-42-0/_osd.scss b/src/sass/gnome-shell/widgets-42-0/_osd.scss
index 3d53886..254ecb6 100644
--- a/src/sass/gnome-shell/widgets-42-0/_osd.scss
+++ b/src/sass/gnome-shell/widgets-42-0/_osd.scss
@@ -11,4 +11,13 @@
     &:ltr { margin-right: 6px; }
     &:rtl { margin-left: 6px; }
   }
+
+  .level {
+    margin-bottom: 4px;
+    &:first-child { margin-bottom: 0px; }
+    min-width: $base_icon_size * 10;
+
+    &:ltr { margin-right: $base_padding; }
+    &:rtl { margin-left: $base_padding; }
+  }
 }