diff --git a/Modules/Panels/Audio/AudioPanel.qml b/Modules/Panels/Audio/AudioPanel.qml
index 6b03f7e7..b2b53f2f 100644
--- a/Modules/Panels/Audio/AudioPanel.qml
+++ b/Modules/Panels/Audio/AudioPanel.qml
@@ -17,8 +17,8 @@ SmartPanel {
   property real localInputVolume: AudioService.inputVolume || 0
   property bool localInputVolumeChanging: false
 
-  preferredWidth: 380 * Style.uiScaleRatio
-  preferredHeight: 420 * Style.uiScaleRatio
+  preferredWidth: Math.round(340 * Style.uiScaleRatio)
+  preferredHeight: Math.round(420 * Style.uiScaleRatio)
 
   // Connections to update local volumes when AudioService changes
   Connections {
diff --git a/Modules/Panels/Battery/BatteryPanel.qml b/Modules/Panels/Battery/BatteryPanel.qml
index 02803865..50d31791 100644
--- a/Modules/Panels/Battery/BatteryPanel.qml
+++ b/Modules/Panels/Battery/BatteryPanel.qml
@@ -59,19 +59,33 @@ SmartPanel {
 
   Component {
     id: disabledComponent
-    NText {
-      text: I18n.tr("battery.panel.disabled")
-      pointSize: Style.fontSizeL
-      color: Color.mOnSurfaceVariant
-      wrapMode: Text.WordWrap
-      horizontalAlignment: Text.AlignHCenter
+
+    ColumnLayout {
+      anchors.centerIn: parent
+      spacing: Style.marginM
+
+      NIcon {
+        icon: "recharging"
+        pointSize: 48
+        color: Color.mOnSurfaceVariant
+        Layout.alignment: Qt.AlignHCenter
+      }
+
+      NText {
+        text: I18n.tr("battery.panel.disabled")
+        pointSize: Style.fontSizeL
+        color: Color.mOnSurfaceVariant
+        wrapMode: Text.WordWrap
+        Layout.alignment: Qt.AlignHCenter
+      }
     }
   }
 
   panelContent: Item {
     anchors.fill: parent
-    property real contentPreferredHeight: mainLayout.implicitHeight + Style.marginM * 2
-    property real contentPreferredWidth: 350 * Style.uiScaleRatio
+
+    property real contentPreferredWidth: Math.round(340 * Style.uiScaleRatio)
+    property real contentPreferredHeight: Math.round(mainLayout.implicitHeight + Style.marginM * 2)
 
     ColumnLayout {
       id: mainLayout
@@ -91,6 +105,12 @@ SmartPanel {
           anchors.margins: Style.marginM
           spacing: Style.marginM
 
+          NIcon {
+            icon: "battery-4"
+            pointSize: Style.fontSizeXXL
+            color: Color.mPrimary
+          }
+
           NText {
             text: I18n.tr("battery.panel.title")
             pointSize: Style.fontSizeL
diff --git a/Modules/Panels/Bluetooth/BluetoothPanel.qml b/Modules/Panels/Bluetooth/BluetoothPanel.qml
index 213f0975..db1402ff 100644
--- a/Modules/Panels/Bluetooth/BluetoothPanel.qml
+++ b/Modules/Panels/Bluetooth/BluetoothPanel.qml
@@ -12,13 +12,16 @@ import qs.Modules.MainScreen
 SmartPanel {
   id: root
 
-  preferredWidth: 420 * Style.uiScaleRatio
+  preferredWidth: Math.round(340 * Style.uiScaleRatio)
   preferredHeight: 500 * Style.uiScaleRatio
 
   panelContent: Rectangle {
     color: Color.transparent
 
+    property real contentPreferredHeight: Math.min(preferredHeight, Math.max(240, mainColumn.implicitHeight + Style.marginL * 2))
+
     ColumnLayout {
+      id: mainColumn
       anchors.fill: parent
       anchors.margins: Style.marginL
       spacing: Style.marginM
@@ -92,7 +95,7 @@ SmartPanel {
 
           NIcon {
             icon: "bluetooth-off"
-            pointSize: 64
+            pointSize: 48
             color: Color.mOnSurfaceVariant
             Layout.alignment: Qt.AlignHCenter
           }
diff --git a/Modules/Panels/Calendar/CalendarPanel.qml b/Modules/Panels/Calendar/CalendarPanel.qml
index e21369c6..f28158fc 100644
--- a/Modules/Panels/Calendar/CalendarPanel.qml
+++ b/Modules/Panels/Calendar/CalendarPanel.qml
@@ -14,8 +14,8 @@ SmartPanel {
 
   readonly property var now: Time.now
 
-  preferredWidth: 500 * Style.uiScaleRatio
-  preferredHeight: 700 * Style.uiScaleRatio
+  preferredWidth: Math.round(440 * Style.uiScaleRatio)
+  preferredHeight: Math.round(700 * Style.uiScaleRatio)
 
   // Helper function to calculate ISO week number
   function getISOWeekNumber(date) {
@@ -641,7 +641,7 @@ SmartPanel {
 
         sourceComponent: WeatherCard {
           Layout.fillWidth: true
-          forecastDays: 6
+          forecastDays: 5
           showLocation: false
         }
       }
diff --git a/Modules/Panels/ControlCenter/Cards/WeatherCard.qml b/Modules/Panels/ControlCenter/Cards/WeatherCard.qml
index e5cb7011..737624ba 100644
--- a/Modules/Panels/ControlCenter/Cards/WeatherCard.qml
+++ b/Modules/Panels/ControlCenter/Cards/WeatherCard.qml
@@ -9,7 +9,7 @@ import qs.Widgets
 NBox {
   id: root
 
-  property int forecastDays: 7
+  property int forecastDays: 6
   property bool showLocation: true
   readonly property bool weatherReady: Settings.data.location.weatherEnabled && (LocationService.data.weather !== null)
 
diff --git a/Modules/Panels/ControlCenter/ControlCenterPanel.qml b/Modules/Panels/ControlCenter/ControlCenterPanel.qml
index baff73d8..bf155afa 100644
--- a/Modules/Panels/ControlCenter/ControlCenterPanel.qml
+++ b/Modules/Panels/ControlCenter/ControlCenterPanel.qml
@@ -14,7 +14,7 @@ SmartPanel {
   panelAnchorHorizontalCenter: true
   panelAnchorVerticalCenter: true
 
-  preferredWidth: Math.round(460 * Style.uiScaleRatio)
+  preferredWidth: Math.round(440 * Style.uiScaleRatio)
   preferredHeight: {
     var height = 0
     var count = 0
diff --git a/Modules/Panels/NotificationHistory/NotificationHistoryPanel.qml b/Modules/Panels/NotificationHistory/NotificationHistoryPanel.qml
index 881ec9cd..04df5cb4 100644
--- a/Modules/Panels/NotificationHistory/NotificationHistoryPanel.qml
+++ b/Modules/Panels/NotificationHistory/NotificationHistoryPanel.qml
@@ -13,8 +13,8 @@ import qs.Modules.MainScreen
 SmartPanel {
   id: root
 
-  preferredWidth: 380 * Style.uiScaleRatio
-  preferredHeight: 480 * Style.uiScaleRatio
+  preferredWidth: Math.round(340 * Style.uiScaleRatio)
+  preferredHeight: Math.round(420 * Style.uiScaleRatio)
 
   onOpened: function () {
     NotificationService.updateLastSeenTs()
@@ -25,6 +25,7 @@ SmartPanel {
     color: Color.transparent
 
     ColumnLayout {
+      id: mainColumn
       anchors.fill: parent
       anchors.margins: Style.marginL
       spacing: Style.marginM
@@ -95,7 +96,7 @@ SmartPanel {
 
         NIcon {
           icon: "bell-off"
-          pointSize: 64
+          pointSize: 48
           color: Color.mOnSurfaceVariant
           Layout.alignment: Qt.AlignHCenter
         }
diff --git a/Modules/Panels/SessionMenu/SessionMenu.qml b/Modules/Panels/SessionMenu/SessionMenu.qml
index a241298b..4fdcdeea 100644
--- a/Modules/Panels/SessionMenu/SessionMenu.qml
+++ b/Modules/Panels/SessionMenu/SessionMenu.qml
@@ -14,8 +14,8 @@ import qs.Modules.MainScreen
 SmartPanel {
   id: root
 
-  preferredWidth: 400 * Style.uiScaleRatio
-  preferredHeight: 340 * Style.uiScaleRatio
+  preferredWidth: Math.round(400 * Style.uiScaleRatio)
+  preferredHeight: Math.round(340 * Style.uiScaleRatio)
 
   panelAnchorHorizontalCenter: true
   panelAnchorVerticalCenter: true
diff --git a/Modules/Panels/WiFi/WiFiPanel.qml b/Modules/Panels/WiFi/WiFiPanel.qml
index 2bb8ffb5..b811383c 100644
--- a/Modules/Panels/WiFi/WiFiPanel.qml
+++ b/Modules/Panels/WiFi/WiFiPanel.qml
@@ -11,8 +11,8 @@ import qs.Modules.MainScreen
 SmartPanel {
   id: root
 
-  preferredWidth: 420 * Style.uiScaleRatio
-  preferredHeight: 500 * Style.uiScaleRatio
+  preferredWidth: Math.round(340 * Style.uiScaleRatio)
+  preferredHeight: Math.round(500 * Style.uiScaleRatio)
 
   property string passwordSsid: ""
   property string passwordInput: ""
@@ -23,7 +23,10 @@ SmartPanel {
   panelContent: Rectangle {
     color: Color.transparent
 
+    property real contentPreferredHeight: Math.min(preferredHeight, Math.max(240, mainColumn.implicitHeight + Style.marginL * 2))
+
     ColumnLayout {
+      id: mainColumn
       anchors.fill: parent
       anchors.margins: Style.marginL
       spacing: Style.marginM
@@ -131,7 +134,7 @@ SmartPanel {
 
           NIcon {
             icon: "wifi-off"
-            pointSize: 64
+            pointSize: 48
             color: Color.mOnSurfaceVariant
             Layout.alignment: Qt.AlignHCenter
           }