diff --git a/widgets/StyledButton.qml b/components/StyledButton.qml
similarity index 100%
rename from widgets/StyledButton.qml
rename to components/StyledButton.qml
diff --git a/components/StyledSlider.qml b/components/StyledSlider.qml
index 644d024..e0b0fca 100644
--- a/components/StyledSlider.qml
+++ b/components/StyledSlider.qml
@@ -7,6 +7,10 @@ Slider {
 
     height: 24
 
+    HoverHandler {
+        cursorShape: Qt.PointingHandCursor
+    }
+
     background: Rectangle {
         x: control.leftPadding
         y: control.topPadding + control.availableHeight / 2 - height / 2
@@ -18,12 +22,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 b17c6d2..6e5b726 100644
--- a/components/StyledSwitch.qml
+++ b/components/StyledSwitch.qml
@@ -4,6 +4,11 @@ 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 2156c6b..3cde9e1 100644
--- a/modules/bar/components/Cpu.qml
+++ b/modules/bar/components/Cpu.qml
@@ -1,3 +1,4 @@
+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 1d65dc6..dbccc2e 100644
--- a/modules/bar/components/Gpu.qml
+++ b/modules/bar/components/Gpu.qml
@@ -1,3 +1,4 @@
+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 a06afba..d65f67a 100644
--- a/modules/bar/components/Pipewire.qml
+++ b/modules/bar/components/Pipewire.qml
@@ -1,3 +1,4 @@
+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 6896f9b..a33b673 100644
--- a/modules/bar/components/notifications/Notifications.qml
+++ b/modules/bar/components/notifications/Notifications.qml
@@ -1,33 +1,22 @@
-import qs.config
+import qs.components
 import qs.constants
 import qs.services
-import qs.widgets
 import QtQuick
 
-StyledButton {
+StyledIconButton {
     id: root
 
     onClicked: {
         menu.toggle();
     }
 
-    content: StyledText {
-        id: text
+    text: Notifications.hasNotifications ? Icons.bell : 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
-                }
+    states: State {
+        when: Notifications.hasNotifications
+        PropertyChanges {
+            root {
+                text: Icons.bellRing
             }
         }
     }
diff --git a/modules/bar/components/tray/menu/MenuItem.qml b/modules/bar/components/tray/menu/MenuItem.qml
index bdf866c..1a54f02 100644
--- a/modules/bar/components/tray/menu/MenuItem.qml
+++ b/modules/bar/components/tray/menu/MenuItem.qml
@@ -1,3 +1,4 @@
+import qs.components
 import qs.widgets
 import Quickshell
 
@@ -7,6 +8,6 @@ StyledButton {
     onClicked: menuEntry.triggered()
     content: StyledText {
         font.pixelSize: 14
-        text: root.menuEntry.text 
+        text: root.menuEntry.text
     }
 }