diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 53fa4cdd..e2aa7265 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+- TMS-1164: Button hover color fixes
+
 ## [1.71.0] - 2026-02-03
 
 - TMS-1164: Change button hover & focus styles
diff --git a/assets/styles/themes/_theme-paahde-overrides.scss b/assets/styles/themes/_theme-paahde-overrides.scss
index d87668a1..84ad44e0 100644
--- a/assets/styles/themes/_theme-paahde-overrides.scss
+++ b/assets/styles/themes/_theme-paahde-overrides.scss
@@ -45,7 +45,6 @@
         &:hover,
         &:focus {
             color: $primary-invert !important;
-            background-color: $primary !important;
         }
     }
 
diff --git a/assets/styles/themes/theme-mustavalkoinen-overrides.scss b/assets/styles/themes/theme-mustavalkoinen-overrides.scss
index 07b8210d..1e102fc6 100644
--- a/assets/styles/themes/theme-mustavalkoinen-overrides.scss
+++ b/assets/styles/themes/theme-mustavalkoinen-overrides.scss
@@ -76,12 +76,17 @@
     }
 
     .button {
-        background-color: $black !important;
-        color: $white !important;
-        border-color: $black !important;
+        &,
+        &:hover,
+        &:focus,
+        &:active {
+            background-color: $black !important;
+            color: $white !important;
+            border-color: $black !important;
 
-        .icon {
-            fill: $white !important;
+            .icon {
+                fill: $white !important;
+            }
         }
     }
 }
diff --git a/assets/styles/ui-components/_pill.scss b/assets/styles/ui-components/_pill.scss
index f899fd65..503d58a1 100644
--- a/assets/styles/ui-components/_pill.scss
+++ b/assets/styles/ui-components/_pill.scss
@@ -102,10 +102,6 @@ $pill-hover-shadow-color: rgba(0, 0, 0, .15) !default;
     &.is-active {
         color: $pill-color-active;
         background-color: $pill-background-active;
-
-        &:hover {
-            color: $pill-color-active;
-        }
     }
 
     &.is-outlined {