diff --git a/src/stylesheet/widgets/_buttons.scss b/src/stylesheet/widgets/_buttons.scss
index eb023af19120809445755cd284823f420df598d2..5c0dbc0b827fc7015b714c6b9031aeeaa5dfdd05 100644
--- a/src/stylesheet/widgets/_buttons.scss
+++ b/src/stylesheet/widgets/_buttons.scss
@@ -393,11 +393,23 @@ menubutton {
     > button { @extend %osd_button; }
   }
 
+  &:disabled {
+    filter: opacity($disabled_opacity);
+  }
+
+  > button:disabled:not(:checked) {
+    filter: none;
+  }
+
   &.circular > button { @extend %circular_button; }
   &.flat > button { @extend %button_basic_flat; }
   &.pill > button { @extend %pill_button; }
   &.destructive-action > button { @extend %destructive_button; }
 
+  &.flat:disabled {
+    filter: none;
+  }
+
   &.suggested-action {
     background-color: var(--accent-bg-color);
     color: var(--accent-fg-color);
@@ -497,7 +509,7 @@ splitbutton {
   &:disabled {
     filter: Opacity(var(--disabled-opacity));
 
-    > button, > menubutton > button {
+    > button, > menubutton, > menubutton > button {
       filter: none;
     }
   }
diff --git a/src/stylesheet/widgets/_toolbars.scss b/src/stylesheet/widgets/_toolbars.scss
index 3b913bf893002e3b52cab43d77f78fcac5d9afe4..61a9789b6da32eeff443df4edff6d1e0bcbc0f79 100644
--- a/src/stylesheet/widgets/_toolbars.scss
+++ b/src/stylesheet/widgets/_toolbars.scss
@@ -8,6 +8,10 @@
   }
 
   menubutton:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
+    &:disabled {
+      filter: none;
+    }
+
     &.image-button > button {
       @extend %button_basic_flat;
     }
@@ -21,11 +25,17 @@
     }
   }
 
-  menubutton.raised > button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
-    &.arrow-button,
-    &.image-button,
-    &.image-text-button {
-      @extend %button_basic_raised;
+  menubutton.raised {
+    > button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
+      &.arrow-button,
+      &.image-button,
+      &.image-text-button {
+        @extend %button_basic_raised;
+
+        &:disabled:not(:checked) {
+          filter: none;
+        }
+      }
     }
   }
 
@@ -36,11 +46,19 @@
 
       color: inherit;
       background-color: transparent;
+
+      &:disabled:not(:checked) {
+        filter: none;
+      }
     }
   }
 
   menubutton.destructive-action > button:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {
     @extend %destructive_button;
+
+    &:disabled:not(:checked) {
+      filter: none;
+    }
   }
 
   splitbutton:not(.raised):not(.suggested-action):not(.destructive-action):not(.opaque) {