diff --git a/modules/bar/Tray.qml b/modules/bar/Tray.qml
index 3d52346..93c52b3 100644
--- a/modules/bar/Tray.qml
+++ b/modules/bar/Tray.qml
@@ -7,15 +7,13 @@ import QtQuick.Layouts
 import qs
 import qs.settings
 
-Rectangle {
+Item {
     id: root
-    color: Colors.base01
     visible: iconRepeater.count != 0
-    radius: Config.rounding
     Layout.fillHeight: true
     required property double moduleHeight
     implicitHeight: moduleHeight
-    implicitWidth: iconlayout.implicitWidth + 16
+    implicitWidth: iconlayout.implicitWidth
 
     RowLayout {
         id: iconlayout
@@ -23,10 +21,15 @@ Rectangle {
         Repeater {
             id: iconRepeater
             model: SystemTray.items
-            delegate: WrapperMouseArea {
+            delegate: Rectangle {
                 id: iconWrapper
+                color: Colors.base01
                 required property var modelData
-                child: IconImage {
+                implicitWidth: root.moduleHeight + 8
+                implicitHeight: root.moduleHeight
+                radius: Config.rounding
+                IconImage {
+                    anchors.centerIn: parent
                     source: iconWrapper.modelData.icon
                     implicitSize: 16
                 }
@@ -35,10 +38,13 @@ Rectangle {
                     anchor.item: iconWrapper
                     menu: iconWrapper.modelData.menu
                 }
-                acceptedButtons: Qt.LeftButton | Qt.RightButton
-                onClicked: mouse => {
-                    if (mouse.button == Qt.RightButton) {
-                        menu.open();
+                MouseArea {
+                        anchors.fill: parent
+                    acceptedButtons: Qt.LeftButton | Qt.RightButton
+                    onClicked: mouse => {
+                        if (mouse.button == Qt.RightButton) {
+                            menu.open();
+                        }
                     }
                 }
             }
diff --git a/modules/bar/Ws.qml b/modules/bar/Ws.qml
index 4a92985..cc4d824 100644
--- a/modules/bar/Ws.qml
+++ b/modules/bar/Ws.qml
@@ -14,7 +14,7 @@ Rectangle {
     required property double moduleHeight
     radius: Config.rounding
     color: 'transparent'
-    implicitWidth: wsLayout.implicitWidth + 10
+    implicitWidth: wsLayout.implicitWidth 
     implicitHeight: moduleHeight
 
     RowLayout {