3 files changed, 6 insertions, 7 deletions
diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml
index 17fd03c5..d2b948da 100644
--- a/src/imports/controls/ToolButton.qml
+++ b/src/imports/controls/ToolButton.qml
@@ -69,9 +69,9 @@ T.ToolButton {
         implicitWidth: 26
         implicitHeight: 26
 
-        color: Qt.darker("#33333333", control.checkable && control.checked ? 1.5 : 1.0)
-        opacity: control.pressed ? 1.0 : control.checkable && control.checked ? 0.5 : 0
-        visible: control.pressed || (control.checkable && control.checked)
+        color: Qt.darker("#33333333", control.enabled && (control.checked || control.highlighted) ? 1.5 : 1.0)
+        opacity: control.pressed ? 1.0 : control.enabled && (control.checked || control.highlighted) ? 0.5 : 0
+        visible: control.pressed || (control.enabled && (control.checked || control.highlighted))
     }
     //! [background]
 }
diff --git a/src/imports/controls/material/ToolButton.qml b/src/imports/controls/material/ToolButton.qml
index 4f72f4ef..ce755d2b 100644
--- a/src/imports/controls/material/ToolButton.qml
+++ b/src/imports/controls/material/ToolButton.qml
@@ -70,9 +70,8 @@ T.ToolButton {
         implicitWidth: 26
         implicitHeight: 26
 
-        color: control.activeFocus || (control.checkable && control.checked)
-               ? control.Material.flatButtonFocusColor : control.Material.flatButtonPressColor
-        visible: control.pressed || control.activeFocus || (control.checkable && control.checked)
+        color: control.pressed ? control.Material.flatButtonPressColor : control.Material.flatButtonFocusColor
+        visible: control.enabled && (control.pressed || control.activeFocus || control.checked || control.highlighted)
     }
     //! [background]
 }
diff --git a/src/imports/controls/universal/ToolButton.qml b/src/imports/controls/universal/ToolButton.qml
index 6488044b..8310be03 100644
--- a/src/imports/controls/universal/ToolButton.qml
+++ b/src/imports/controls/universal/ToolButton.qml
@@ -72,7 +72,7 @@ T.ToolButton {
         implicitHeight: 48 // AppBarThemeCompactHeight
 
         color: control.pressed ? control.Universal.listMediumColor :
-               control.checkable && control.checked ? control.Universal.accentColor : "transparent"
+               control.enabled && (control.highlighted || control.checked) ? control.Universal.accentColor : "transparent"
     }
     //! [background]
 }