diff --git a/styles/src/components/_button.scss b/styles/src/components/_button.scss
index 5ebe26e..c7a60ed 100755
--- a/styles/src/components/_button.scss
+++ b/styles/src/components/_button.scss
@@ -201,8 +201,7 @@
 
   -fx-padding: cfg.$padding-y cfg.$padding-x cfg.$padding-y cfg.$padding-x;
 
-  &:hover,
-  &:hover:focused {
+  &:hover {
     -fx-background-color: -color-button-border-hover, -color-button-bg-hover;
     -fx-text-fill: -color-button-fg-hover;
 
@@ -212,6 +211,10 @@
     }
   }
 
+  &:hover:focused {
+    -fx-background-color: -color-button-border-focused, -color-button-bg-hover;
+  }
+
   &:focused {
     -fx-background-color: -color-button-border-focused, -color-button-bg-focused;
     -fx-text-fill: -color-button-fg-focused;
diff --git a/styles/src/components/_toggle-button.scss b/styles/src/components/_toggle-button.scss
index 25525aa..bb1a3ac 100644
--- a/styles/src/components/_toggle-button.scss
+++ b/styles/src/components/_toggle-button.scss
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-@use "../settings/config"as cfg;
+@use "../settings/config" as cfg;
 @use "button";
 
 .toggle-button {
@@ -8,7 +8,6 @@
 
   -color-button-bg-selected: -color-accent-emphasis;
   -color-button-fg-selected: -color-fg-emphasis;
-  -color-button-border-focused: -color-border-default;
 
   -fx-padding: cfg.$padding-y cfg.$padding-x cfg.$padding-y cfg.$padding-x;