9 files changed, 14 insertions, 9 deletions
diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml
index 438265d1..b1670c9a 100644
--- a/src/imports/controls/Button.qml
+++ b/src/imports/controls/Button.qml
@@ -55,7 +55,9 @@ T.Button {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? undefined : Default.textDisabledLightColor
+    icon.color: Color.transparent(checked || highlighted ? Default.textLightColor :
+        visualFocus ? Default.focusColor : down ? Default.textDarkColor : Default.textColor,
+        enabled || highlighted || checked ? 1 : 0.3)
 
     contentItem: IconLabel {
         spacing: control.spacing
diff --git a/src/imports/controls/CheckDelegate.qml b/src/imports/controls/CheckDelegate.qml
index 095e1949..6ae09ace 100644
--- a/src/imports/controls/CheckDelegate.qml
+++ b/src/imports/controls/CheckDelegate.qml
@@ -54,7 +54,7 @@ T.CheckDelegate {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? undefined : Default.textDisabledLightColor
+    icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor
 
     contentItem: IconLabel {
         leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0
diff --git a/src/imports/controls/ItemDelegate.qml b/src/imports/controls/ItemDelegate.qml
index 507dfd2d..26309a9a 100644
--- a/src/imports/controls/ItemDelegate.qml
+++ b/src/imports/controls/ItemDelegate.qml
@@ -54,7 +54,7 @@ T.ItemDelegate {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? undefined : Default.textDisabledLightColor
+    icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor
 
     contentItem: IconLabel {
         spacing: control.spacing
diff --git a/src/imports/controls/MenuItem.qml b/src/imports/controls/MenuItem.qml
index 73d921c2..c60bc708 100644
--- a/src/imports/controls/MenuItem.qml
+++ b/src/imports/controls/MenuItem.qml
@@ -54,7 +54,7 @@ T.MenuItem {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? undefined : Default.textDisabledLightColor
+    icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor
 
     contentItem: IconLabel {
         leftPadding: control.checkable && !control.mirrored ? control.indicator.width + control.spacing : 0
diff --git a/src/imports/controls/RadioDelegate.qml b/src/imports/controls/RadioDelegate.qml
index 89d4b12a..b3aeb2b3 100644
--- a/src/imports/controls/RadioDelegate.qml
+++ b/src/imports/controls/RadioDelegate.qml
@@ -54,7 +54,7 @@ T.RadioDelegate {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? undefined : Default.textDisabledLightColor
+    icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor
 
     contentItem: IconLabel {
         leftPadding: control.mirrored ? control.indicator.width + control.spacing : 0
diff --git a/src/imports/controls/RoundButton.qml b/src/imports/controls/RoundButton.qml
index 747988d8..62c5556e 100644
--- a/src/imports/controls/RoundButton.qml
+++ b/src/imports/controls/RoundButton.qml
@@ -53,7 +53,10 @@ T.RoundButton {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? undefined : Default.textDisabledLightColor
+    icon.color: Color.transparent(checked || highlighted ? Default.textLightColor
+                                                         : visualFocus ? Default.focusColor
+                                                         : down ? Default.textDarkColor : Default.textColor,
+                                  enabled || highlighted || checked ? 1 : 0.3)
 
     contentItem: IconLabel {
         spacing: control.spacing
diff --git a/src/imports/controls/SwitchDelegate.qml b/src/imports/controls/SwitchDelegate.qml
index 287e174c..d54c00fa 100644
--- a/src/imports/controls/SwitchDelegate.qml
+++ b/src/imports/controls/SwitchDelegate.qml
@@ -54,7 +54,7 @@ T.SwitchDelegate {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? undefined : Default.textDisabledLightColor
+    icon.color: enabled ? Default.textDarkColor : Default.textDisabledColor
 
     indicator: SwitchIndicator {
         x: text ? (control.mirrored ? control.leftPadding : control.width - width - control.rightPadding) : control.leftPadding + (control.availableWidth - width) / 2
diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml
index 039f9769..2350d0d0 100644
--- a/src/imports/controls/TabButton.qml
+++ b/src/imports/controls/TabButton.qml
@@ -53,7 +53,7 @@ T.TabButton {
 
     icon.width: 24
     icon.height: 24
-    icon.color: !enabled ? Default.textDisabledLightColor : !checked ? Default.textLightColor : Default.textColor
+    icon.color: Color.transparent(!checked ? Default.textLightColor : down ? Default.textDarkColor : Default.textColor, enabled ? 1 : 0.3)
 
     contentItem: IconLabel {
         spacing: control.spacing
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 184bbfad..345fdb9a 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -53,7 +53,7 @@ T.ToolButton {
 
     icon.width: 24
     icon.height: 24
-    icon.color: enabled ? undefined : Default.textDisabledLightColor
+    icon.color: enabled ? (visualFocus ? Default.focusColor : Default.textDarkColor) : Default.textDisabledLightColor
 
     contentItem: IconLabel {
         spacing: control.spacing