diff --git a/lib/Styles/Gtk/Button.scss b/lib/Styles/Gtk/Button.scss
index d671a8a2f..9deef63f3 100644
--- a/lib/Styles/Gtk/Button.scss
+++ b/lib/Styles/Gtk/Button.scss
@@ -8,8 +8,19 @@ button {
         @extend .circular;
 
         padding: rem(4px);
-        min-height: rem(16px);
-        min-width: rem(16px);
+        min-height: 16px;
+        min-width: 16px;
+        transition:
+            background duration("expand") easing(),
+            transform duration("expand") easing("ease-out-back");
+
+        &:active {
+            background: rgba($fg-color, 0.15);
+            transform: scale(0.8);
+            transition:
+                background duration("collapse") easing(),
+                transform duration("collapse") easing();
+        }
 
         &.toggle {
             @include border-interactive-roundrect;
@@ -21,6 +32,7 @@ button {
     }
 
     .linked &,
+    .linked &.image-button,
     .linked &.image-button.toggle,
     &.text-button {
         @include control;
@@ -29,6 +41,7 @@ button {
         &:active,
         &:checked {
             @include control-active;
+            transform: none;
         }
 
         &:active {
@@ -109,7 +122,6 @@ button {
             transform duration("expand") easing("ease-out-back");
 
         &:active {
-            transform: scale(0.95);
             transition:
                 background duration("collapse") easing(),
                 transform duration("collapse") easing();
diff --git a/lib/Styles/Gtk/WindowControls.scss b/lib/Styles/Gtk/WindowControls.scss
index 7f0a69792..1b2707889 100644
--- a/lib/Styles/Gtk/WindowControls.scss
+++ b/lib/Styles/Gtk/WindowControls.scss
@@ -10,18 +10,9 @@ windowcontrols {
     }
 
     button {
+        @extend .image-button;
+
         border-radius: rem($window_radius / 2);
         padding: rem(4px);
-        transition:
-            background duration("expand") easing(),
-            transform duration("expand") easing("ease-out-back");
-
-        &:active {
-            background: rgba($fg-color, 0.15);
-            transform: scale(0.8);
-            transition:
-                background duration("collapse") easing(),
-                transform duration("collapse") easing();
-        }
     }
 }