diff --git a/src/styles/constant.css b/src/styles/constant.css
index daab134..7b9bfda 100644
--- a/src/styles/constant.css
+++ b/src/styles/constant.css
@@ -38,8 +38,8 @@
 
 /* Interactive States */
 
-@define-color glass-hover alpha(@foreground, 0.08);
-@define-color glass-active alpha(@foreground, 0.14);
+@define-color glass-hover alpha(white, 0.10);
+@define-color glass-active alpha(white, 0.50);
 @define-color glass-selected alpha(@primary, 0.18);
 @define-color glass-focus alpha(@primary, 0.25);
 
diff --git a/src/styles/controlpanel/networks.css b/src/styles/controlpanel/networks.css
index 9a5d364..cd0f0ad 100644
--- a/src/styles/controlpanel/networks.css
+++ b/src/styles/controlpanel/networks.css
@@ -37,7 +37,17 @@
 }
 
 #wifi-connections #device-icon.connected {
-  background-color: @glass-accent;
+  background-color: @glass-active;
+  color: @glass-text;
+}
+
+/* Bluetooth-specific device icon styles */
+#bluetooth-connections #device-icon {
+  background-color: @glass-hover;
+}
+
+#bluetooth-connections #device-icon.connected {
+  background-color: @glass-active;
   color: @glass-text;
 }
 
diff --git a/src/styles/controlpanel/quicksettings.css b/src/styles/controlpanel/quicksettings.css
index 2e3e901..79c0569 100644
--- a/src/styles/controlpanel/quicksettings.css
+++ b/src/styles/controlpanel/quicksettings.css
@@ -31,7 +31,7 @@
 }
 
 #device-icon.connected {
-  background-color: @glass-accent;
+  background-color: @glass-active;
 }
 
 #toggle-button {
@@ -53,7 +53,7 @@
 }
 
 #toggle-button:checked {
-  background-color: @glass-accent;
+  background-color: @glass-active;
 }
 
 
@@ -123,13 +123,13 @@
   font-weight: bold;
 }
 .wifi-icon-box {
-  background-color: @glass-text-secondary;
+  background-color: @glass-hover;
   border-radius: apply(radius-full);
   padding: 2px;
 }
 
 .wifi-icon-box-connected {
-  background-color: @glass-accent;
+  background-color: @glass-active;
   border-radius: apply(radius-full);
   padding: 2px;
 }
diff --git a/src/styles/notification/notification_buttons.css b/src/styles/notification/notification_buttons.css
index 6cfea7f..b66688a 100644
--- a/src/styles/notification/notification_buttons.css
+++ b/src/styles/notification/notification_buttons.css
@@ -77,8 +77,8 @@ menu.mac-context-menu {
 }
 
 .mac-context-menu menuitem:hover {
-  background-color: @glass-accent;
-  color: @glass-overlay-dark;
+  background-color: @glass-hover;
+  color: @glass-text;
 }
 
 .mac-header-pill {
diff --git a/src/styles/widgets/dropdown.css b/src/styles/widgets/dropdown.css
index 40efb6f..813fd10 100644
--- a/src/styles/widgets/dropdown.css
+++ b/src/styles/widgets/dropdown.css
@@ -21,13 +21,13 @@
 }
 
 #dropdown-option:hover {
-  color: @on-primary;
+  color: @glass-text;
   transition: all 20ms ease-in-out;
-  background-color: @glass-accent;
+  background-color: @glass-hover;
 }
 
 #dropdown-option:hover #dropdown-option-label {
-  color: @on-primary;
+  color: @glass-text;
 }
 
 #dropdown-option-label {
@@ -42,7 +42,7 @@
 }
 
 #dropdown-option:hover #dropdown-option-keybind {
-  color: @on-primary;
+  color: @glass-text;
 }
 
 #dropdown-option-keybind {
diff --git a/src/styles/widgets/tray.css b/src/styles/widgets/tray.css
index 564d647..ef23854 100644
--- a/src/styles/widgets/tray.css
+++ b/src/styles/widgets/tray.css
@@ -40,11 +40,11 @@ menu > menuitem:hover {
   transition: all 20ms ease-in-out;
   font-size: apply(font-md);
   border-radius: apply(radius-xs);
-  color: @on-primary;
-  background-color: @glass-accent;
+  color: @glass-text;
+  background-color: @glass-hover;
 }
 
 menu > menuitem:hover > label {
-  color: @on-primary;
+  color: @glass-text;
   font-weight: 400;
 }
diff --git a/src/styles/window/battery.css b/src/styles/window/battery.css
index 22b360c..60e03f4 100644
--- a/src/styles/window/battery.css
+++ b/src/styles/window/battery.css
@@ -137,11 +137,11 @@
 }
 
 #energy-mode-icon.connected {
-  background-color: @glass-accent;
-  color: @on-primary;
+  background-color: @glass-active;
+  color: @glass-text;
 }
 
 #game-mode-icon.connected {
-  background-color: @glass-accent;
-  color: @on-primary;
+  background-color: @glass-active;
+  color: @glass-text;
 }
diff --git a/src/styles/window/panel.css b/src/styles/window/panel.css
index 8523049..4913bd3 100644
--- a/src/styles/window/panel.css
+++ b/src/styles/window/panel.css
@@ -15,8 +15,8 @@
 #global-menu:hover,
 #global-menu.active,
 #workspaces>button:hover {
-    background-color: @glass-accent;
-    color: @on-primary;
+    background-color: @glass-hover;
+    color: @glass-text;
 }
 
 #panel-button,
@@ -60,11 +60,11 @@
 }
 
 #workspaces>button.active:hover {
-    background-color: @glass-accent;
+    background-color: @glass-hover;
 }
 
 #workspaces>button.active:hover label {
-    color: @on-primary;
+    color: @glass-text;
 }
 
 #workspaces>button.urgent {
@@ -83,7 +83,7 @@
 #global-menu:hover *,
 #global-menu.active *,
 #workspaces>button:hover * {
-    color: @on-primary;
+    color: @glass-text;
 
 }
 
diff --git a/src/styles/window/settings.css b/src/styles/window/settings.css
index 26bfa01..bd0d00b 100644
--- a/src/styles/window/settings.css
+++ b/src/styles/window/settings.css
@@ -24,8 +24,8 @@
 }
 
 #settings-sidebar-button:hover {
-    background-color: @glass-accent;
-    color: @on-primary;
+    background-color: @glass-hover;
+    color: @glass-text;
 }
 
 #settings-sidebar-button Label {
@@ -34,16 +34,16 @@
 }
 
 #settings-sidebar-button.active {
-    background-color: @glass-accent;
+    background-color: @glass-hover;
 }
 
 #settings-sidebar-button.active Label {
-    color: @on-primary;
+    color: @glass-text;
 }
 
 #settings-sidebar-button:hover *,
 #settings-sidebar-button.active * {
-    color: @on-primary;
+    color: @glass-text;
 }
 
 #settings-content-wrapper {