diff --git a/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml b/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
index 71629fce8..157b15851 100644
--- a/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
+++ b/declarativeimports/plasmacomponents/platformcomponents/touch/ToolButton.qml
@@ -213,7 +213,7 @@ Item {
             font.underline: theme.defaultFont.underline
             font.weight: theme.defaultFont.weight
             font.wordSpacing: theme.defaultFont.wordSpacing
-            color: theme.buttonTextColor
+            color: surface.opacity == 1 ? theme.buttonTextColor : theme.textColor
             horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
         }
diff --git a/declarativeimports/plasmacomponents/qml/TabButton.qml b/declarativeimports/plasmacomponents/qml/TabButton.qml
index 0131b1293..5e635621b 100644
--- a/declarativeimports/plasmacomponents/qml/TabButton.qml
+++ b/declarativeimports/plasmacomponents/qml/TabButton.qml
@@ -140,6 +140,8 @@ Item {
         elide: Text.ElideRight
         horizontalAlignment: !internal.portrait && iconSource != null ? Text.AlignLeft : Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
+
+        color: root.checked ? theme.buttonTextColor : theme.textColor
     }
 
     Private.IconLoader {
diff --git a/declarativeimports/plasmacomponents/qml/ToolButton.qml b/declarativeimports/plasmacomponents/qml/ToolButton.qml
index a5e9c834d..546e60b83 100644
--- a/declarativeimports/plasmacomponents/qml/ToolButton.qml
+++ b/declarativeimports/plasmacomponents/qml/ToolButton.qml
@@ -215,7 +215,7 @@ Item {
             font.underline: theme.defaultFont.underline
             font.weight: theme.defaultFont.weight
             font.wordSpacing: theme.defaultFont.wordSpacing
-            color: theme.buttonTextColor
+            color: surface.opacity == 1 ? theme.buttonTextColor : theme.textColor
             horizontalAlignment: icon.valid ? Text.AlignLeft : Text.AlignHCenter
             verticalAlignment: Text.AlignVCenter
         }