diff --git a/TODO.md b/TODO.md
index 00606a4b..fe2fea8d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,7 +3,6 @@
 
   - Theming
     - File format
-    - Gray colored buttons when disabled
     - Make the icon blue in EditAccount when hovering and no avatar set
     - Remove the filled theme
     - Have a default background
diff --git a/src/qml/Base/HButtonContent.qml b/src/qml/Base/HButtonContent.qml
index c0c7a063..3129b494 100644
--- a/src/qml/Base/HButtonContent.qml
+++ b/src/qml/Base/HButtonContent.qml
@@ -24,7 +24,7 @@ HRowLayout {
 
         id: icon
         svgName: button.icon.name
-        colorize: button.icon.color
+        colorize: enabled ? button.icon.color: theme.icons.disabledColorize
         cache: button.icon.cache
 
         onLoadingChanged: if (! loading) resetAnimations.start()
diff --git a/src/themes/Default.qpl b/src/themes/Default.qpl
index 5e746a49..a73be18f 100644
--- a/src/themes/Default.qpl
+++ b/src/themes/Default.qpl
@@ -86,7 +86,10 @@ colors:
 
 icons:
     string preferredPack: "thin"
-    color colorize: "white"  // "transparent" to disable
+
+    // "transparent" to disable colorizing
+    color colorize:         "white"
+    color disabledColorize: "white"
 
 
 // Generic UI controls