diff --git a/Modules/Bar/Calendar/CalendarPanel.qml b/Modules/Bar/Calendar/CalendarPanel.qml
index 230365ad..dbe4dd6f 100644
--- a/Modules/Bar/Calendar/CalendarPanel.qml
+++ b/Modules/Bar/Calendar/CalendarPanel.qml
@@ -115,7 +115,7 @@ NPanel {
       // Banner with date/time/clock
       Rectangle {
         Layout.fillWidth: true
-        Layout.preferredHeight: capsuleColumn.implicitHeight + Style.marginS * 2
+        Layout.preferredHeight: capsuleColumn.implicitHeight + Style.marginM * 2
         radius: Style.radiusL
         color: Color.mPrimary
 
@@ -125,14 +125,14 @@ NPanel {
           anchors.left: parent.left
           anchors.bottom: parent.bottom
 
-          anchors.topMargin: Style.marginS
-          anchors.bottomMargin: Style.marginS
-          anchors.rightMargin: clockLoader.width + (Style.marginL * 2)
-          anchors.leftMargin: Style.marginL
+          anchors.topMargin: Style.marginM
+          anchors.bottomMargin: Style.marginM
+          anchors.rightMargin: clockLoader.width + (Style.marginXL * 2)
+          anchors.leftMargin: Style.marginXL
 
           spacing: 0
 
-          // Combined layout for weather icon, date, and weather text
+          // Combined layout for date, month year, locatio and time-zone
           RowLayout {
             Layout.fillWidth: true
             height: 60 * Style.uiScaleRatio
@@ -233,7 +233,7 @@ NPanel {
         ClockLoader {
           id: clockLoader
           anchors.right: parent.right
-          anchors.rightMargin: Style.marginM
+          anchors.rightMargin: Style.marginXL
           anchors.verticalCenter: parent.verticalCenter
           progressColor: Color.mOnPrimary
           Layout.alignment: Qt.AlignVCenter
@@ -667,7 +667,6 @@ NPanel {
 
         sourceComponent: WeatherCard {
           Layout.fillWidth: true
-          Layout.preferredHeight: implicitHeight
           forecastDays: 6
           showLocation: false
         }
diff --git a/Modules/ControlCenter/Cards/WeatherCard.qml b/Modules/ControlCenter/Cards/WeatherCard.qml
index b99a5a05..ea9f8ac4 100644
--- a/Modules/ControlCenter/Cards/WeatherCard.qml
+++ b/Modules/ControlCenter/Cards/WeatherCard.qml
@@ -67,7 +67,7 @@ NBox {
               temp = Math.round(temp)
               return `${temp}°${suffix}`
             }
-            pointSize: Style.fontSizeXL
+            pointSize: showLocation ? Style.fontSizeXL :  Style.fontSizeXL * 1.6
             font.weight: Style.fontWeightBold
           }