diff --git a/stow/.config/waybar/style.css b/stow/.config/waybar/style.css
index ee1892e..2c5700e 100644
--- a/stow/.config/waybar/style.css
+++ b/stow/.config/waybar/style.css
@@ -35,19 +35,11 @@ window#waybar.solo {
 */
 
 button {
-    /* Use box-shadow instead of border so the text isn't offset */
-    box-shadow: inset 0 -3px transparent;
     /* Avoid rounded borders under each button name */
     border: none;
     border-radius: 0;
 }
 
-/* https://github.com/Alexays/Waybar/wiki/FAQ#the-workspace-buttons-have-a-strange-hover-effect */
-button:hover {
-    background: inherit;
-    box-shadow: inset 0 -3px #ffffff;
-}
-
 #workspaces {
     background-color: @background;
     color: @primary;
@@ -57,19 +49,17 @@ button:hover {
 #workspaces button {
     color: @primary;
     padding: 0 5px;
+    border-radius: inherit;
 }
 
 #workspaces button:hover {
-    background: rgba(0, 0, 0, 0.2);
-}
-
-#workspaces button.focused {
-    background-color: #64727D;
-    box-shadow: inset 0 -3px #ffffff;
+    color: @on_primary;
+    background: @on_primary_container;
 }
 
 #workspaces button.urgent {
-    background-color: #eb4d4b;
+    color: @error;
+    background-color: @error_container;
 }
 
 #clock,
@@ -103,6 +93,8 @@ button:hover {
     border-bottom-right-radius: 0px;
     margin-right: 0px;
 
+    border-right: none;
+
     background-color: @background;
     color: @primary;
 }
@@ -112,6 +104,8 @@ button:hover {
     border-bottom-left-radius: 0px;
     margin-left: 0px;
 
+    border-left: none;
+
     background-color: @primary;
     color: @background;
     padding: 10px;