diff --git a/Modules/Bar/Bar.qml b/Modules/Bar/Bar.qml
index c9ddfe6..49a89b1 100644
--- a/Modules/Bar/Bar.qml
+++ b/Modules/Bar/Bar.qml
@@ -92,10 +92,10 @@ Variants {
 
             // Top section (left widgets)
             Column {
-              spacing: Style.marginS * root.scaling
+              spacing: Style.marginXS * root.scaling
               anchors.horizontalCenter: parent.horizontalCenter
               anchors.top: parent.top
-              anchors.topMargin: Style.marginM * root.scaling
+              anchors.topMargin: Style.marginS * root.scaling
               width: parent.width
 
               Repeater {
@@ -117,7 +117,7 @@ Variants {
 
             // Center section (center widgets)
             Column {
-              spacing: Style.marginS * root.scaling
+              spacing: Style.marginXS * root.scaling
               anchors.horizontalCenter: parent.horizontalCenter
               anchors.verticalCenter: parent.verticalCenter
               width: parent.width
@@ -141,10 +141,10 @@ Variants {
 
             // Bottom section (right widgets)
             Column {
-              spacing: Style.marginS * root.scaling
+              spacing: Style.marginXS * root.scaling
               anchors.horizontalCenter: parent.horizontalCenter
               anchors.bottom: parent.bottom
-              anchors.bottomMargin: Style.marginM * root.scaling
+              anchors.bottomMargin: Style.marginS * root.scaling
               width: parent.width
 
               Repeater {
@@ -249,4 +249,4 @@ Variants {
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Modules/Bar/Widgets/ActiveWindow.qml b/Modules/Bar/Widgets/ActiveWindow.qml
index 007cb61..e9bb66d 100644
--- a/Modules/Bar/Widgets/ActiveWindow.qml
+++ b/Modules/Bar/Widgets/ActiveWindow.qml
@@ -19,7 +19,6 @@ Item {
   property int sectionWidgetIndex: -1
   property int sectionWidgetsCount: 0
 
-
   property var widgetMetadata: BarWidgetRegistry.widgetMetadata[widgetId]
   property var widgetSettings: {
     if (section && sectionWidgetIndex >= 0) {
@@ -53,18 +52,8 @@ Item {
   visible: getTitle() !== ""
 
   function calculatedVerticalHeight() {
-    // Base height for the background rectangle
-    let total = Math.round(Style.capsuleHeight * scaling)
-
-    // Add padding for the container margins
-    total += Style.marginM * scaling * 2 // Top and bottom margins
-
-    // Add space for icon if shown
-    if (showIcon) {
-      total += Style.fontSizeL * scaling * 1.2 + Style.marginS * scaling
-    }
-
-    return total
+    // Use standard widget height like other widgets
+    return Math.round(Style.capsuleHeight * scaling)
   }
 
   function calculatedHorizontalWidth() {
@@ -222,8 +211,8 @@ Item {
       Item {
         id: verticalLayout
         anchors.centerIn: parent
-        width: parent.width - Style.marginM * scaling * 2
-        height: parent.height - Style.marginM * scaling * 2
+        width: parent.width - Style.marginXS * scaling * 2
+        height: parent.height - Style.marginXS * scaling * 2
         visible: barPosition === "left" || barPosition === "right"
 
         // Window icon
diff --git a/Modules/Bar/Widgets/Clock.qml b/Modules/Bar/Widgets/Clock.qml
index bfb912a..3e754f3 100644
--- a/Modules/Bar/Widgets/Clock.qml
+++ b/Modules/Bar/Widgets/Clock.qml
@@ -221,4 +221,4 @@ Rectangle {
       PanelService.getPanel("calendarPanel")?.toggle(this)
     }
   }
-}
\ No newline at end of file
+}
diff --git a/Modules/Bar/Widgets/MediaMini.qml b/Modules/Bar/Widgets/MediaMini.qml
index 652a2f1..1f8aa42 100644
--- a/Modules/Bar/Widgets/MediaMini.qml
+++ b/Modules/Bar/Widgets/MediaMini.qml
@@ -30,7 +30,6 @@ Item {
     return {}
   }
 
-
   readonly property string barPosition: Settings.data.bar.position
 
   readonly property bool showAlbumArt: (widgetSettings.showAlbumArt !== undefined) ? widgetSettings.showAlbumArt : widgetMetadata.showAlbumArt
diff --git a/Modules/Bar/Widgets/SystemMonitor.qml b/Modules/Bar/Widgets/SystemMonitor.qml
index a19bc59..cb04187 100644
--- a/Modules/Bar/Widgets/SystemMonitor.qml
+++ b/Modules/Bar/Widgets/SystemMonitor.qml
@@ -57,7 +57,7 @@ Item {
 
     total = visibleCount * Math.round(Style.capsuleHeight * scaling)
     total += Math.max(visibleCount - 1, 0) * Style.marginXS * scaling
-    total += Style.marginM * scaling * 2 // padding
+    total += Style.marginXS * scaling * 2 // minimal padding to match other widgets
 
     return total
   }
@@ -329,7 +329,7 @@ Item {
       id: verticalLayout
       anchors.centerIn: parent
       width: Math.round(32 * scaling)
-      height: parent.height - Style.marginM * scaling * 2
+      height: parent.height - Style.marginXS * scaling * 2
       spacing: Style.marginXS * scaling
       visible: barPosition === "left" || barPosition === "right"
 
diff --git a/Modules/Bar/Widgets/Workspace.qml b/Modules/Bar/Widgets/Workspace.qml
index 561cba3..8d668a9 100644
--- a/Modules/Bar/Widgets/Workspace.qml
+++ b/Modules/Bar/Widgets/Workspace.qml
@@ -19,7 +19,7 @@ Item {
   property string section: ""
   property int sectionWidgetIndex: -1
   property int sectionWidgetsCount: 0
-  
+
   property var widgetMetadata: BarWidgetRegistry.widgetMetadata[widgetId]
   property var widgetSettings: {
     if (section && sectionWidgetIndex >= 0) {
@@ -31,7 +31,6 @@ Item {
     return {}
   }
 
-
   readonly property string barPosition: Settings.data.bar.position
 
   readonly property string labelMode: (widgetSettings.labelMode !== undefined) ? widgetSettings.labelMode : widgetMetadata.labelMode