diff --git a/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss
index 5279ca72..4c4bee43 100644
--- a/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss
+++ b/src/sass/gnome-shell/extensions-46-0/_dash-to-dock.scss
@@ -18,7 +18,7 @@
     color: white;
     background-color: rgba(black, 0.75);
     text-align: center;
-    padding: 0.32em 0.4em;
+    padding: 0.25em 0.4em;
   }
 
   .notification-badge {
@@ -29,7 +29,7 @@
     box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.25);
     border-radius: $circular-radius;
     margin: 2px 3px 5px;
-    padding: 0.3em 0.4em;
+    padding: 0.25em 0.4em;
     font-weight: bold;
     text-align: center;
   }
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 5330c9e6..4a50f300 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2183,6 +2183,10 @@ popover {
     stack > box { padding: 0; }
 
     > box > button { margin: 0; }
+
+    > statuspage.compact > scrolledwindow > viewport > box {
+      margin: $space-size * 2;
+    }
   }
 
   // FIXME: Use the popover color instead of transparent as a workaround for .view
diff --git a/src/sass/gtk/apps/_gnome-4.0.scss b/src/sass/gtk/apps/_gnome-4.0.scss
index c2a047f3..4725b7aa 100644
--- a/src/sass/gtk/apps/_gnome-4.0.scss
+++ b/src/sass/gtk/apps/_gnome-4.0.scss
@@ -95,6 +95,13 @@ navigation-view-page {
   }
 }
 
+button.star {
+  min-height: 24px;
+  min-width: 24px;
+  padding: ($medium-size - 24px) / 2;
+  border-radius: $corner-radius;
+}
+
 //
 // Gnome Control Center
 //
@@ -899,18 +906,6 @@ box.star {
   background-image: none;
 }
 
-button.star {
-  outline-offset: 0;
-  background-color: transparent;
-  background-image: none;
-  border-image: none;
-  border-radius: 0;
-  border-width: 0;
-  padding: 0;
-  box-shadow: none;
-  outline-offset: -1px;
-}
-
 star-image {
   color: $yellow-dark;
 }
diff --git a/src/sass/libadwaita/apps/_nautilus.scss b/src/sass/libadwaita/apps/_nautilus.scss
index b02ef870..d9c93a58 100644
--- a/src/sass/libadwaita/apps/_nautilus.scss
+++ b/src/sass/libadwaita/apps/_nautilus.scss
@@ -105,4 +105,11 @@ list.operations-list {
       animation: none;
     }
   }
+}
+
+button.image-button.star {
+  min-height: 24px;
+  min-width: 24px;
+  padding: ($medium_size - 24px) / 2;
+  border-radius: $button_radius;
 }
\ No newline at end of file
diff --git a/src/sass/libadwaita/widgets/_popovers.scss b/src/sass/libadwaita/widgets/_popovers.scss
index a7bc861b..91104649 100644
--- a/src/sass/libadwaita/widgets/_popovers.scss
+++ b/src/sass/libadwaita/widgets/_popovers.scss
@@ -43,6 +43,10 @@ popover {
     separator {
       background-color: gtkalpha(currentColor, 0.08);
     }
+
+    > statuspage.compact > scrolledwindow > viewport > box { // Nautilus popover
+      margin: $base_padding * 2;
+    }
   }
 
   .osd &,