diff --git a/modules/bar/Tray.qml b/modules/bar/Tray.qml
index 93c52b3..83f8668 100644
--- a/modules/bar/Tray.qml
+++ b/modules/bar/Tray.qml
@@ -7,27 +7,28 @@ import QtQuick.Layouts
 import qs
 import qs.settings
 
-Item {
+Rectangle {
     id: root
     visible: iconRepeater.count != 0
     Layout.fillHeight: true
     required property double moduleHeight
     implicitHeight: moduleHeight
-    implicitWidth: iconlayout.implicitWidth
+    implicitWidth: iconlayout.width + 16
+    color: Colors.base01
+    radius: Config.rounding
 
     RowLayout {
         id: iconlayout
         anchors.centerIn: root
+        spacing: 8
         Repeater {
             id: iconRepeater
             model: SystemTray.items
-            delegate: Rectangle {
+            delegate: Item {
                 id: iconWrapper
-                color: Colors.base01
                 required property var modelData
-                implicitWidth: root.moduleHeight + 8
-                implicitHeight: root.moduleHeight
-                radius: Config.rounding
+                implicitWidth: 16
+                implicitHeight: 16
                 IconImage {
                     anchors.centerIn: parent
                     source: iconWrapper.modelData.icon
@@ -39,7 +40,7 @@ Item {
                     menu: iconWrapper.modelData.menu
                 }
                 MouseArea {
-                        anchors.fill: parent
+                    anchors.fill: parent
                     acceptedButtons: Qt.LeftButton | Qt.RightButton
                     onClicked: mouse => {
                         if (mouse.button == Qt.RightButton) {