diff --git a/src/_sass/gtk/apps/_budgie.scss b/src/_sass/gtk/apps/_budgie.scss
index ed805e7a..c23689df 100644
--- a/src/_sass/gtk/apps/_budgie.scss
+++ b/src/_sass/gtk/apps/_budgie.scss
@@ -1103,9 +1103,11 @@ box.vertical > stack > box.vertical {
 }
 
 %budgie_dialog {
-  background-color: $bg_color;
+  background-color: $base_color;
+  border-radius: $material_radius;
 
-  &, &.background, decoration { border-radius: $bt_radius; }
+  &.background.csd,
+  decoration { border-radius: $material_radius; }
 
   > box > grid {
     padding: 24px;
@@ -1131,8 +1133,8 @@ box.vertical > stack > box.vertical {
       animation: ripple_effect 0.3s cubic-bezier(0.0, 0.0, 0.2, 1);
     }
 
-    &:first-child { border-bottom-left-radius: $bt_radius; }
-    &:last-child { border-bottom-right-radius: $bt_radius; }
+    &:first-child { border-bottom-left-radius: $material_radius; }
+    &:last-child { border-bottom-right-radius: $material_radius; }
   }
 
   buttonbox.linked.horizontal > button:not(.suggested-action):not(.destructive-action) {
@@ -1166,8 +1168,6 @@ box.vertical > stack > box.vertical {
 .budgie-run-dialog {
   @extend %budgie_dialog;
 
-  background-color: $base_color;
-
   entry.search {
     font-size: 120%;
     padding: 6px 12px;
diff --git a/src/gtk/theme-3.0/gtk-Dark.css b/src/gtk/theme-3.0/gtk-Dark.css
index 57ceb9fd..ae7a3f14 100644
--- a/src/gtk/theme-3.0/gtk-Dark.css
+++ b/src/gtk/theme-3.0/gtk-Dark.css
@@ -8989,13 +8989,16 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  background-color: #32343D;
+  background-color: #282A33;
+  border-radius: 3px;
 }
 
-.budgie-run-dialog, .budgie-session-dialog,
-.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.background.csd.budgie-run-dialog, .background.csd.budgie-session-dialog,
+.background.csd.budgie-polkit-dialog,
+.budgie-run-dialog decoration,
+.budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
-  border-radius: 2px;
+  border-radius: 3px;
 }
 
 .budgie-run-dialog > box > grid, .budgie-session-dialog > box > grid,
@@ -9020,12 +9023,12 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-session-dialog buttonbox.linked.horizontal > button:first-child,
 .budgie-polkit-dialog buttonbox.linked.horizontal > button:first-child {
-  border-bottom-left-radius: 2px;
+  border-bottom-left-radius: 3px;
 }
 
 .budgie-session-dialog buttonbox.linked.horizontal > button:last-child,
 .budgie-polkit-dialog buttonbox.linked.horizontal > button:last-child {
-  border-bottom-right-radius: 2px;
+  border-bottom-right-radius: 3px;
 }
 
 .budgie-session-dialog buttonbox.linked.horizontal > button:not(.suggested-action):not(.destructive-action):hover,
@@ -9055,10 +9058,6 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
   padding: 24px 24px 0;
 }
 
-.budgie-run-dialog {
-  background-color: #282A33;
-}
-
 .budgie-run-dialog entry.search {
   font-size: 120%;
   padding: 6px 12px;
diff --git a/src/gtk/theme-3.0/gtk-Light.css b/src/gtk/theme-3.0/gtk-Light.css
index 61718a73..df4568b1 100644
--- a/src/gtk/theme-3.0/gtk-Light.css
+++ b/src/gtk/theme-3.0/gtk-Light.css
@@ -8967,13 +8967,16 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  background-color: #fafbfc;
+  background-color: #ffffff;
+  border-radius: 3px;
 }
 
-.budgie-run-dialog, .budgie-session-dialog,
-.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.background.csd.budgie-run-dialog, .background.csd.budgie-session-dialog,
+.background.csd.budgie-polkit-dialog,
+.budgie-run-dialog decoration,
+.budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
-  border-radius: 2px;
+  border-radius: 3px;
 }
 
 .budgie-run-dialog > box > grid, .budgie-session-dialog > box > grid,
@@ -8998,12 +9001,12 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-session-dialog buttonbox.linked.horizontal > button:first-child,
 .budgie-polkit-dialog buttonbox.linked.horizontal > button:first-child {
-  border-bottom-left-radius: 2px;
+  border-bottom-left-radius: 3px;
 }
 
 .budgie-session-dialog buttonbox.linked.horizontal > button:last-child,
 .budgie-polkit-dialog buttonbox.linked.horizontal > button:last-child {
-  border-bottom-right-radius: 2px;
+  border-bottom-right-radius: 3px;
 }
 
 .budgie-session-dialog buttonbox.linked.horizontal > button:not(.suggested-action):not(.destructive-action):hover,
@@ -9033,10 +9036,6 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
   padding: 24px 24px 0;
 }
 
-.budgie-run-dialog {
-  background-color: #ffffff;
-}
-
 .budgie-run-dialog entry.search {
   font-size: 120%;
   padding: 6px 12px;
diff --git a/src/gtk/theme-3.0/gtk.css b/src/gtk/theme-3.0/gtk.css
index 0619252c..5d3652a9 100644
--- a/src/gtk/theme-3.0/gtk.css
+++ b/src/gtk/theme-3.0/gtk.css
@@ -8983,13 +8983,16 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-run-dialog, .budgie-session-dialog,
 .budgie-polkit-dialog {
-  background-color: #fafbfc;
+  background-color: #ffffff;
+  border-radius: 3px;
 }
 
-.budgie-run-dialog, .budgie-session-dialog,
-.budgie-polkit-dialog, .budgie-run-dialog decoration, .budgie-session-dialog decoration,
+.background.csd.budgie-run-dialog, .background.csd.budgie-session-dialog,
+.background.csd.budgie-polkit-dialog,
+.budgie-run-dialog decoration,
+.budgie-session-dialog decoration,
 .budgie-polkit-dialog decoration {
-  border-radius: 2px;
+  border-radius: 3px;
 }
 
 .budgie-run-dialog > box > grid, .budgie-session-dialog > box > grid,
@@ -9014,12 +9017,12 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
 
 .budgie-session-dialog buttonbox.linked.horizontal > button:first-child,
 .budgie-polkit-dialog buttonbox.linked.horizontal > button:first-child {
-  border-bottom-left-radius: 2px;
+  border-bottom-left-radius: 3px;
 }
 
 .budgie-session-dialog buttonbox.linked.horizontal > button:last-child,
 .budgie-polkit-dialog buttonbox.linked.horizontal > button:last-child {
-  border-bottom-right-radius: 2px;
+  border-bottom-right-radius: 3px;
 }
 
 .budgie-session-dialog buttonbox.linked.horizontal > button:not(.suggested-action):not(.destructive-action):hover,
@@ -9049,10 +9052,6 @@ box.vertical > stack > box.vertical > .raven-background > viewport.frame > list
   padding: 24px 24px 0;
 }
 
-.budgie-run-dialog {
-  background-color: #ffffff;
-}
-
 .budgie-run-dialog entry.search {
   font-size: 120%;
   padding: 6px 12px;