diff --git a/package/contents/ui/PaintedToolButton.qml b/package/contents/ui/PaintedToolButton.qml
index a492464..11632ea 100644
--- a/package/contents/ui/PaintedToolButton.qml
+++ b/package/contents/ui/PaintedToolButton.qml
@@ -110,7 +110,7 @@ Item {
             radius: buttonItem.shadow
 
             // fake highlighted
-            color: {
+            /*color: {
                 if (menuOpened) {
                     return enforceLattePalette ? root.latteBridge.palette.highlightColor : Kirigami.Theme.highlightColor
                 } else if (buttonItem.containsMouse) {
@@ -118,6 +118,15 @@ Item {
                 } else {
                     return 'transparent';
                 }
+            }*/
+            color: {
+                if (buttonItem.menuOpened) {
+                    return Kirigami.Theme.highlightColor
+                } else if (buttonItem.containsMouse) {
+                    return Kirigami.Theme.backgroundColor
+                } else {
+                    return 'transparent';
+                }
             }
 
             layer.enabled: menuOpened || buttonItem.containsMouse
@@ -267,15 +276,15 @@ Item {
                 return Util.stylizeEscapedMnemonics(Util.toHtmlEscaped(text));
             }
 
-            color: {
+            /*color: {
                 if (buttonItem.menuOpened) {
-                    return enforceLattePalette ? root.latteBridge.palette.highlightedTextColor : Kirigami.Theme.highlightedTextColor
+                    return Kirigami.Theme.highlightedTextColor
                 } else if (buttonItem.containsMouse) {
-                    return enforceLattePalette ? root.latteBridge.palette.buttonTextColor : Kirigami.Theme.buttonTextColor
+                    return Kirigami.Theme.buttonTextColor
                 } else {
-                    return enforceLattePalette ? root.latteBridge.palette.textColor : Kirigami.Theme.textColor;
+                    return Kirigami.Theme.textColor;
                 }
-            }
+            }*/
         }
     }
 
@@ -292,11 +301,11 @@ Item {
             layer.effect: ColorOverlay{
                 color: {
                     if (buttonItem.menuOpened) {
-                        return enforceLattePalette ? root.latteBridge.palette.highlightedTextColor : Kirigami.Theme.highlightedTextColor
+                        return Kirigami.Theme.highlightedTextColor
                     } else if (buttonItem.containsMouse) {
-                        return enforceLattePalette ? root.latteBridge.palette.buttonTextColor : Kirigami.Theme.textColor
+                        return Kirigami.Theme.buttonTextColor
                     } else {
-                        return enforceLattePalette ? root.latteBridge.palette.textColor : Kirigami.Theme.textColor;
+                        return Kirigami.Theme.textColor;
                     }
                 }
             }