diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c
index 0ca0386a87..3295ebb885 100644
--- a/gtk/gtkshortcutssection.c
+++ b/gtk/gtkshortcutssection.c
@@ -586,12 +586,6 @@ adjust_page_buttons (GtkWidget *widget,
 {
   GtkWidget *label;
 
-  /*
-   * TODO: This is a hack to get the GtkStackSwitcher radio
-   *       buttons to look how we want. However, it's very
-   *       much font size specific.
-   */
-  gtk_widget_set_size_request (widget, 34, 34);
   gtk_style_context_add_class (gtk_widget_get_style_context (widget), "circular");
 
   label = gtk_bin_get_child (GTK_BIN (widget));
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2ed068d2f6..e8b1e84bba 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3379,3 +3379,7 @@ frame.keycap {
 stackswitcher button.text-button {
   min-width: 100px;
 }
+
+stackswitcher button.circular {
+  min-width: 0px;
+}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 6d8c89d85a..4a056fa00a 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4556,6 +4556,11 @@ stackswitcher .titlebar button.text-button.titlebutton,
 .titlebar stackswitcher button.text-button.titlebutton {
   min-width: 100px; }
 
+stackswitcher button.circular,
+stackswitcher .titlebar button.circular.titlebutton,
+.titlebar stackswitcher button.circular.titlebutton {
+  min-width: 0px; }
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 1b4c6bcb19..493aeb7d52 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4729,6 +4729,11 @@ stackswitcher .titlebar button.text-button.titlebutton,
 .titlebar stackswitcher button.text-button.titlebutton {
   min-width: 100px; }
 
+stackswitcher button.circular,
+stackswitcher .titlebar button.circular.titlebutton,
+.titlebar stackswitcher button.circular.titlebutton {
+  min-width: 0px; }
+
 /* GTK NAMED COLORS
    ----------------
    use responsibly! */