diff --git a/src/controls/private/PrivateActionToolButton.qml b/src/controls/private/PrivateActionToolButton.qml
index 056025c2..bceacfa6 100644
--- a/src/controls/private/PrivateActionToolButton.qml
+++ b/src/controls/private/PrivateActionToolButton.qml
@@ -1,107 +1,109 @@
 /*
  *   Copyright 2016 Marco Martin <mart@kde.org>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU Library General Public License as
  *   published by the Free Software Foundation; either version 2, or
  *   (at your option) any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *   GNU Library General Public License for more details
  *
  *   You should have received a copy of the GNU Library General Public
  *   License along with this program; if not, write to the
  *   Free Software Foundation, Inc.,
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
 import QtQuick 2.6
 import QtQuick.Layouts 1.2
 import QtQuick.Controls 2.0 as Controls
 import org.kde.kirigami 2.4
 
 Controls.ToolButton {
     id: control
 
     implicitWidth: showText && ( kirigamiAction ? kirigamiAction.text.length > 0 : text.length > 0) ? Math.max(background.implicitWidth, control.background.contentWidth) : implicitHeight
     implicitHeight: background.implicitHeight
 
     hoverEnabled: true
     //TODO: replace with upstream action when we depend on Qt 5.10
     property Action kirigamiAction
     property bool showText: true
     property bool showMenuArrow: true
 
     //we need our own text delegate
     text: ""
     checkable: kirigamiAction && kirigamiAction.checkable
     checked: (kirigamiAction && kirigamiAction.checked) || menu.visible
     enabled: kirigamiAction && kirigamiAction.enabled
     opacity: enabled ? 1 : 0.4
     visible: kirigamiAction && kirigamiAction.visible
     onClicked: {
         if (kirigamiAction) {
             kirigamiAction.trigger();
         }
         if (menu.count>0 && !menu.visible) {
             menu.popup(control, 0, control.height)
         }
     }
 
     ActionsMenu {
         id: menu
         y: control.height
         actions: control.kirigamiAction ? control.kirigamiAction.children : ""
         submenuComponent: Component {
             ActionsMenu {}
         }
     }
 
     Component.onCompleted: {
         //NOTE: Make it a proper property when we depend on Qt 5.10
         if (palette)
-            palette.button = Qt.binding(function() { return control.kirigamiAction ? control.kirigamiAction.icon.color : undefined});
+            palette.button = Qt.binding(function() { return control.kirigamiAction && control.kirigamiAction.icon.color.a ? control.kirigamiAction.icon.color : undefined});
     }
     contentItem: MouseArea {
         hoverEnabled: true
         onPressed: mouse.accepted = false
         Theme.colorSet: checked ? Theme.Selection : Theme.Window
         Theme.inherit: false
         RowLayout {
             id: layout
             onImplicitWidthChanged: control.background.contentWidth = implicitWidth + 16
             anchors.centerIn: parent
             Icon {
                 id: mainIcon
                 Layout.minimumWidth: Units.iconSizes.smallMedium
                 Layout.minimumHeight: Units.iconSizes.smallMedium
                 source: control.kirigamiAction ? (control.kirigamiAction.icon ? control.kirigamiAction.icon.name : control.kirigamiAction.iconName) : ""
                 visible: control.kirigamiAction && control.kirigamiAction.iconName != ""
-                color: control.flat && control.kirigamiAction && control.kirigamiAction.icon && control.kirigamiAction.icon.color.a > 0 ? control.kirigamiAction.icon.color : Theme.textColor
+                color: control.flat && control.kirigamiAction && control.kirigamiAction.icon && control.kirigamiAction.icon.color.a > 0 ? control.kirigamiAction.icon.color : label.color
             }
             Controls.Label {
+                id: label
                 MnemonicData.enabled: control.enabled
                 MnemonicData.controlType: MnemonicData.ActionElement
                 MnemonicData.label: control.kirigamiAction ? control.kirigamiAction.text : ""
 
                 text: MnemonicData.richTextLabel
                 visible: control.showText && text.length > 0
+                color: control.flat || !control.palette || control.palette.button === Theme.backgroundColor ? Theme.textColor : Theme.highlightedTextColor
             }
             Icon {
                 Layout.minimumWidth: Units.iconSizes.small
                 Layout.minimumHeight: Units.iconSizes.small
                 source: "arrow-down"
                 visible: showMenuArrow && menu.count > 0
             }
         }
     }
     Controls.ToolTip {
         visible: control.hovered && text.length > 0
         text: kirigamiAction ? (kirigamiAction.tooltip.length ? kirigamiAction.tooltip : kirigamiAction.text) : ""
         delay: 1000
         timeout: 5000
         y: control.height
     }
 }