diff --git a/components/StyledSlider.qml b/components/StyledSlider.qml
index e0b0fca..644d024 100644
--- a/components/StyledSlider.qml
+++ b/components/StyledSlider.qml
@@ -7,10 +7,6 @@ Slider {
 
     height: 24
 
-    HoverHandler {
-        cursorShape: Qt.PointingHandCursor
-    }
-
     background: Rectangle {
         x: control.leftPadding
         y: control.topPadding + control.availableHeight / 2 - height / 2
@@ -22,12 +18,12 @@ Slider {
         color: Theme.palette.base100
 
         Rectangle {
-            width: control.visualPosition * parent.width
-            Behavior on width {
-                NumberAnimation {
-                    duration: 75
-                }
+          width: control.visualPosition * parent.width
+          Behavior on width {
+            NumberAnimation {
+              duration: 75
             }
+          }
             height: parent.height
             color: Theme.palette.primary
             radius: 8
diff --git a/components/StyledSwitch.qml b/components/StyledSwitch.qml
index 6e5b726..b17c6d2 100644
--- a/components/StyledSwitch.qml
+++ b/components/StyledSwitch.qml
@@ -4,11 +4,6 @@ import QtQuick.Controls
 
 Switch {
     id: control
-
-    HoverHandler {
-        cursorShape: Qt.PointingHandCursor
-    }
-
     indicator: Item {
         implicitWidth: 48
         implicitHeight: 22
diff --git a/modules/bar/components/Cpu.qml b/modules/bar/components/Cpu.qml
index 3cde9e1..2156c6b 100644
--- a/modules/bar/components/Cpu.qml
+++ b/modules/bar/components/Cpu.qml
@@ -1,4 +1,3 @@
-import qs.components
 import qs.config
 import qs.constants
 import qs.services
diff --git a/modules/bar/components/Gpu.qml b/modules/bar/components/Gpu.qml
index dbccc2e..1d65dc6 100644
--- a/modules/bar/components/Gpu.qml
+++ b/modules/bar/components/Gpu.qml
@@ -1,4 +1,3 @@
-import qs.components
 import qs.config
 import qs.constants
 import qs.services
diff --git a/modules/bar/components/Pipewire.qml b/modules/bar/components/Pipewire.qml
index d65f67a..a06afba 100644
--- a/modules/bar/components/Pipewire.qml
+++ b/modules/bar/components/Pipewire.qml
@@ -1,4 +1,3 @@
-import qs.components
 import qs.config
 import qs.services
 import qs.widgets
diff --git a/modules/bar/components/notifications/Notifications.qml b/modules/bar/components/notifications/Notifications.qml
index a33b673..6896f9b 100644
--- a/modules/bar/components/notifications/Notifications.qml
+++ b/modules/bar/components/notifications/Notifications.qml
@@ -1,22 +1,33 @@
-import qs.components
+import qs.config
 import qs.constants
 import qs.services
+import qs.widgets
 import QtQuick
 
-StyledIconButton {
+StyledButton {
     id: root
 
     onClicked: {
         menu.toggle();
     }
 
-    text: Notifications.hasNotifications ? Icons.bell : Icons.bellRing
+    content: StyledText {
+        id: text
 
-    states: State {
-        when: Notifications.hasNotifications
-        PropertyChanges {
-            root {
-                text: Icons.bellRing
+        font.family: Theme.lucide.font.family
+        font.pixelSize: Dimensions.notifications.fontSize
+        font.bold: true
+        text: Icons.bell
+
+        color: root.containsMouse ? Theme.palette.base300 : Theme.palette.basecontent
+
+        states: State {
+            when: Notifications.hasNotifications
+            PropertyChanges {
+                text {
+                    text: Icons.bellRing
+                    color: root.containsMouse ? Theme.palette.base300 : Theme.palette.secondary
+                }
             }
         }
     }
diff --git a/modules/bar/components/tray/menu/MenuItem.qml b/modules/bar/components/tray/menu/MenuItem.qml
index 1a54f02..bdf866c 100644
--- a/modules/bar/components/tray/menu/MenuItem.qml
+++ b/modules/bar/components/tray/menu/MenuItem.qml
@@ -1,4 +1,3 @@
-import qs.components
 import qs.widgets
 import Quickshell
 
@@ -8,6 +7,6 @@ StyledButton {
     onClicked: menuEntry.triggered()
     content: StyledText {
         font.pixelSize: 14
-        text: root.menuEntry.text
+        text: root.menuEntry.text 
     }
 }
diff --git a/components/StyledButton.qml b/widgets/StyledButton.qml
similarity index 100%
rename from components/StyledButton.qml
rename to widgets/StyledButton.qml