diff --git a/Modules/Dock/Dock.qml b/Modules/Dock/Dock.qml
index f941df3..aaa4064 100644
--- a/Modules/Dock/Dock.qml
+++ b/Modules/Dock/Dock.qml
@@ -32,8 +32,6 @@ Variants {
 
       screen: modelData
 
-      WlrLayershell.namespace: "noctalia-dock"
-      WlrLayershell.exclusionMode: Settings.data.dock.exclusive ? ExclusionMode.Auto : ExclusionMode.Ignore
 
       readonly property bool autoHide: Settings.data.dock.autoHide
       readonly property int hideDelay: 500
@@ -50,7 +48,7 @@ Variants {
                                                        || (Settings.data.bar.monitors.length === 0)) : false
       readonly property bool barAtBottom: hasBar && Settings.data.bar.position === "bottom"
       readonly property bool barAtTop: hasBar && Settings.data.bar.position === "top"
-      readonly property int barHeight: (barAtBottom || barAtTop) ? (Settings.data.bar.height || 30) * scaling : 0
+      readonly property int barHeight: (barAtBottom || barAtTop) ? Settings.data.bar.height * scaling : 0
       readonly property int dockSpacing: 8 * scaling // Space between dock and bar/edge
 
       // Track hover state
@@ -60,14 +58,12 @@ Variants {
 
       // Dock is positioned at the bottom
       anchors.bottom: true
-
-      // Dock should be above bar but not create its own exclusion zone
-      exclusionMode: ExclusionMode.Ignore
       focusable: false
-
-      // Make the window transparent
       color: Color.transparent
 
+      WlrLayershell.namespace: "noctalia-dock"
+      WlrLayershell.exclusionMode: Settings.data.dock.exclusive ? ExclusionMode.Auto : ExclusionMode.Ignore
+
       // Set the window size - include extra height only if bar is at bottom
       implicitWidth: dockContainer.width + (floatingMargin * 2)
       implicitHeight: fullHeight + floatingMargin + (barAtBottom ? barHeight + dockSpacing : 0)
@@ -135,8 +131,8 @@ Variants {
 
       Rectangle {
         id: dockContainer
-        width: dockLayout.implicitWidth + Style.marginL * scaling * 2
-        height: Math.round(iconSize * 1.6)
+        width: dockLayout.implicitWidth + Style.marginM * scaling * 2
+        height: Math.round(iconSize * 1.5)
         color: Qt.alpha(Color.mSurface, Settings.data.dock.backgroundOpacity)
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.bottom: parent.bottom
@@ -203,7 +199,7 @@ Variants {
 
           RowLayout {
             id: dockLayout
-            spacing: Style.marginL * scaling
+            spacing: Style.marginM * scaling
             Layout.preferredHeight: parent.height
             anchors.centerIn: parent
 
@@ -229,7 +225,6 @@ Variants {
                   visible: false
                 }
 
-                // The icon with better quality settings
                 Image {
                   id: appIcon
                   width: iconSize
@@ -323,7 +318,6 @@ Variants {
                   radius: Style.radiusXS * scaling
                   anchors.top: parent.bottom
                   anchors.horizontalCenter: parent.horizontalCenter
-                  anchors.topMargin: Style.marginXXS * 1.5 * scaling
 
                   // Pulse animation for active indicator
                   SequentialAnimation on opacity {