diff --git a/src/sass/gnome-shell/common/_buttons.scss b/src/sass/gnome-shell/common/_buttons.scss
index 51accb6d..fe0d6c16 100644
--- a/src/sass/gnome-shell/common/_buttons.scss
+++ b/src/sass/gnome-shell/common/_buttons.scss
@@ -26,3 +26,16 @@
     @extend %flat_button;
   }
 }
+
+.icon-button {
+    @extend .button; // same style as buttons
+
+    border-radius: 99px;
+    padding: $base_padding*2;
+    min-height: 16px;
+
+    StIcon {
+        icon-size: $base_icon_size;
+        -st-icon-style: symbolic;
+    }
+}
diff --git a/src/sass/gnome-shell/common/_quick-settings.scss b/src/sass/gnome-shell/common/_quick-settings.scss
index 0e9da8aa..2648802a 100644
--- a/src/sass/gnome-shell/common/_quick-settings.scss
+++ b/src/sass/gnome-shell/common/_quick-settings.scss
@@ -160,15 +160,6 @@
 .quick-settings-system-item {
   & > StBoxLayout { spacing: 2 * $base_padding; }
 
-  .icon-button {
-    background-color: $button;
-    color: $text;
-    border-radius: $base_radius;
-    @extend %button;
-
-    > StIcon { -st-icon-style: symbolic; }
-  }
-
   & .power-item {
     min-height: 0;
     min-width: 0;