diff --git a/Modules/Clock.qml b/Modules/Clock.qml
index 67ff432..ccbd8cd 100644
--- a/Modules/Clock.qml
+++ b/Modules/Clock.qml
@@ -34,6 +34,7 @@ CustomRect {
 
 	StateLayer {
 		acceptedButtons: Qt.LeftButton
+		color: root.visibilities.dashboard ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
 
 		onClicked: {
 			root.visibilities.dashboard = !root.visibilities.dashboard;
diff --git a/Modules/NotifBell.qml b/Modules/NotifBell.qml
index eb86926..4c24ee2 100644
--- a/Modules/NotifBell.qml
+++ b/Modules/NotifBell.qml
@@ -32,6 +32,8 @@ CustomRect {
 	}
 
 	StateLayer {
+		color: root.visibilities.sidebar ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+
 		onClicked: {
 			root.visibilities.sidebar = !root.visibilities.sidebar;
 		}
diff --git a/Modules/Resources.qml b/Modules/Resources.qml
index 2334666..a9cccb1 100644
--- a/Modules/Resources.qml
+++ b/Modules/Resources.qml
@@ -20,6 +20,8 @@ CustomRect {
 	radius: Appearance.rounding.full
 
 	StateLayer {
+		color: root.visibilities.resources ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+
 		onClicked: root.visibilities.resources = !root.visibilities.resources
 	}
 
diff --git a/Modules/Settings/Categories.qml b/Modules/Settings/Categories.qml
index df9875a..cce3bb6 100644
--- a/Modules/Settings/Categories.qml
+++ b/Modules/Settings/Categories.qml
@@ -210,6 +210,8 @@ Item {
 		StateLayer {
 			id: layer
 
+			color: categoryItem.index === clayout.currentIndex ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
+
 			onClicked: {
 				root.content.currentCategory = categoryItem.key;
 				clayout.currentIndex = categoryItem.index;
diff --git a/Modules/SysTray/TrayItem.qml b/Modules/SysTray/TrayItem.qml
index 5f3b246..fbbd1fc 100644
--- a/Modules/SysTray/TrayItem.qml
+++ b/Modules/SysTray/TrayItem.qml
@@ -45,14 +45,15 @@ Item {
 	CustomRect {
 		anchors.fill: parent
 		anchors.margins: 3
-		color: root.current ? DynamicColors.palette.m3primary : "transparent"
+		color: Config.general.color.scheduleDark && root.current ? DynamicColors.palette.m3primary : "transparent"
 		radius: Appearance.rounding.full
 
 		StateLayer {
 			acceptedButtons: Qt.LeftButton | Qt.RightButton
 			anchors.fill: parent
+			color: Config.general.color.scheduleDark && root.current ? DynamicColors.palette.m3onPrimary : DynamicColors.palette.m3onSurface
 
-			onClicked: {
+			onClicked: mouse => {
 				if (mouse.button === Qt.LeftButton) {
 					root.item.activate();
 					console.log(icon.source + "\n" + root.item.id);