diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss
index a791e65..52e4391 100644
--- a/src/sass/_variables.scss
+++ b/src/sass/_variables.scss
@@ -44,6 +44,7 @@ $bt_radius: if($laptop == 'false', 6px, 6px);
 $bd_radius: if($laptop == 'false', 8px, 8px);
 $wm_radius: if($laptop == 'false', 12px, 12px);
 $mn_radius: if($laptop == 'false', 14px, 12px);
+$po_radius: if($laptop == 'false', 16px, 14px);
 $dash_radius: if($laptop == 'false', 24px, 18px);
 $base_border_radius: if($laptop == 'false', 8px, 8px);
 $modal_radius: $base_border_radius * 2;
diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index fcb2558..1aba4f5 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -5,7 +5,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 %popover_bubble {
   color: $alt_fg_color;
   background-color: $popover_bubble_bg;
-  border-radius: $mn_radius !important;
+  border-radius: $base_border_radius !important;
   border: none;
   box-shadow: 0 1px 2px rgba(black, 0.02) !important;
   text-shadow: none;
diff --git a/src/sass/gnome-shell/common/_dialogs.scss b/src/sass/gnome-shell/common/_dialogs.scss
index a53aaf8..9504a7d 100644
--- a/src/sass/gnome-shell/common/_dialogs.scss
+++ b/src/sass/gnome-shell/common/_dialogs.scss
@@ -2,7 +2,7 @@
 
 %theme_dialogs {
   background-color: $dialog_bg_color;
-  border-radius: $wm_radius;
+  border-radius: $modal_radius;
   border: solid rgba(black, 0.75);
   border-width: if($variant=='light', 0, 1px);
   box-shadow: 0 3px 6px 0 rgba(black, if($variant=='light', 0.25, 0.35));
@@ -40,15 +40,15 @@
 // modal dialog
 .modal-dialog {
   color: $fg_color;
-  padding: 0 5px 6px 5px;
+  padding: $base_padding;
   @extend %theme_dialogs !optional;
 
   &-linked-button {
     min-height: 40px;
     padding: 0 16px;
-    margin: 3px 3px !important;
+    margin: $base_padding !important;
     border: none !important;
-    border-radius: $bt_radius;
+    border-radius: $modal_radius - $base_padding * 2;
 
     @include font(button);
     @include button(flat-normal);
diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index 0ecc0b0..beb970c 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -1,10 +1,10 @@
 /* Popovers/Menus */
 
-$popop_menuitem_radius: $wm_radius - 4px;
+$popop_menuitem_radius: $po_radius - $base_padding;
 
 //.the popover itself
 .popup-menu-boxpointer {
-  -arrow-border-radius: $wm_radius;
+  -arrow-border-radius: $po_radius;
   -arrow-background-color: transparent;
   -arrow-border-width: 0;
   -arrow-border-color: transparent;
@@ -92,10 +92,12 @@ $popop_menuitem_radius: $wm_radius - 4px;
 
 .popup-menu-content {
   padding: $base_padding;
-  @extend %theme_dialogs;
   box-shadow: 0 5px 10px 0 rgba(black, 0.18);
-  border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
   margin: 4px 12px 17px 12px;
+  background-color: $dialog_bg_color;
+  border-radius: $po_radius;
+  border: solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
+  border-width: if($variant=='light', 0, 1px);
   @include font(body-1);
 }
 
diff --git a/src/sass/gnome-shell/extensions-3-28/_misc.scss b/src/sass/gnome-shell/extensions-3-28/_misc.scss
index bf8d74f..107afef 100644
--- a/src/sass/gnome-shell/extensions-3-28/_misc.scss
+++ b/src/sass/gnome-shell/extensions-3-28/_misc.scss
@@ -114,11 +114,13 @@
 .place-menu-item {
   &:ltr {
     padding-left: 0 !important;
+    margin-left: 0 !important;
     padding-right: $base_padding * 5 !important;
   }
 
   &:rtl {
     padding-right: 0 !important;
+    margin-right: 0 !important;
     padding-left: $base_padding * 5 !important;
   }
 
diff --git a/src/sass/gnome-shell/widgets-42-0/_screenshot.scss b/src/sass/gnome-shell/widgets-42-0/_screenshot.scss
index 8f5cfc8..15e3821 100644
--- a/src/sass/gnome-shell/widgets-42-0/_screenshot.scss
+++ b/src/sass/gnome-shell/widgets-42-0/_screenshot.scss
@@ -18,7 +18,7 @@ $screenshot_ui_button_red: $error_color;
   padding: $screenshot_ui_panel_padding;
   // Reduce the bottom padding a little to accommodate the large capture button.
   margin-bottom: 4em;
-  spacing: $base_padding * 2;
+  spacing: $container_padding * 2;
   color: $osd_fg_color;
   background-color: $osd_bg_color;
   border: 1px solid rgba(black, 0.75);
@@ -29,14 +29,14 @@ $screenshot_ui_button_red: $error_color;
   @extend .window-close; // copy window close button
   padding: $base_padding !important; // but with more padding
 
-  &.left { margin-left: $base_padding + 2px; }
-  &.right { margin-right: $base_padding + 2px; }
+  &.left { margin-left: $container_padding; }
+  &.right { margin-right: $container_padding; }
 }
 
 .screenshot-ui-type-button {
   @extend %osd_button;
   min-width: 48px;
-  padding: $base_padding * 2 $base_padding * 3 !important;
+  padding: $base_padding * 3 $base_padding * 4 !important;
   border-radius: $screenshot_ui_panel_border_radius - $screenshot_ui_panel_padding;
 }
 
@@ -45,7 +45,7 @@ $screenshot_ui_button_red: $error_color;
   height: 36px;
   border-radius: $circular_radius;
   border: 4px white;
-  padding: $base_margin;
+  padding: $base_padding;
 
   .screenshot-ui-capture-button-circle {
     background-color: white;
@@ -111,7 +111,7 @@ $screenshot_ui_button_red: $error_color;
 .screenshot-ui-show-pointer-button {
   @extend %osd_button;
   border-radius: $circular_radius;
-  padding: $base_padding * 2 !important;
+  padding: $container_padding * 2.5 !important;
 
   StIcon { icon-size: 16px; }
 }