diff --git a/modules/bar/Bar.qml b/modules/bar/Bar.qml
index 5e1b62c..03808b2 100644
--- a/modules/bar/Bar.qml
+++ b/modules/bar/Bar.qml
@@ -13,9 +13,9 @@ Variants {
         aboveWindows: true
         screen: modelData
         margins {
-          top: Settings.config.margins
-          left: Settings.config.margins
-          right: Settings.config.margins
+            top: Settings.config.margins
+            left: Settings.config.margins
+            right: Settings.config.margins
         }
 
         anchors {
@@ -51,13 +51,13 @@ Variants {
 
             Row {
                 id: rightStuff
-                rightPadding: 10
+                rightPadding: 5
                 spacing: 10
                 anchors.right: parent.right
                 anchors.verticalCenter: parent.verticalCenter
                 Volume {}
                 Battery {}
-                SystemTray {}
+                SysTray {}
             }
         }
     }
diff --git a/modules/bar/Battery.qml b/modules/bar/Battery.qml
index 776539f..0a150c3 100644
--- a/modules/bar/Battery.qml
+++ b/modules/bar/Battery.qml
@@ -89,13 +89,13 @@ Loader {
                         id: rawProfileIcon
                         anchors.fill: parent
                         source: Quickshell.iconPath(root.getProfileIcon())
-                        visible: false // 🤫 Shh! Hide the dark original
+                        visible: false
                     }
 
                     ColorOverlay {
                         anchors.fill: parent
                         source: rawProfileIcon
-                        color: "white" // ✨ The magic dye!
+                        color: Colors.foreground
                     }
                 }
             }
diff --git a/modules/bar/SystemTray.qml b/modules/bar/SysTray.qml
similarity index 81%
rename from modules/bar/SystemTray.qml
rename to modules/bar/SysTray.qml
index 1e7d383..5aeeafa 100644
--- a/modules/bar/SystemTray.qml
+++ b/modules/bar/SysTray.qml
@@ -5,8 +5,9 @@ import "../../settings/"
 
 Item {
     id: root
-    implicitWidth: trayRow.implicitWidth
+    implicitWidth: trayRow.implicitWidth + 5
     implicitHeight: Settings.config.barHeight
+    readonly property var count: trayRepeater.count
     visible: trayRepeater.count > 0
 
     Row {