diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml
index e62fbb35..379d2d00 100644
--- a/Modules/LockScreen/LockScreen.qml
+++ b/Modules/LockScreen/LockScreen.qml
@@ -112,14 +112,14 @@ Loader {
             ColumnLayout {
               anchors.horizontalCenter: parent.horizontalCenter
               anchors.top: parent.top
-              anchors.topMargin: 80 * scaling
-              spacing: 8 * scaling
+              anchors.topMargin: 100 * scaling
+              spacing: 12 * scaling
 
               NText {
                 id: timeText
                 text: lockScreen.formatTime()
                 Layout.alignment: Qt.AlignHCenter
-                pointSize: 64 * scaling
+                pointSize: 80 * scaling
                 font.weight: Font.Medium
                 color: Color.mOnSurface
                 horizontalAlignment: Text.AlignHCenter
@@ -144,7 +144,7 @@ Loader {
                 id: dateText
                 text: lockScreen.formatDate()
                 Layout.alignment: Qt.AlignHCenter
-                pointSize: Style.fontSizeL * scaling
+                pointSize: Style.fontSizeXL * scaling
                 font.weight: Font.Medium
                 color: Color.mOnSurface
                 horizontalAlignment: Text.AlignHCenter
@@ -155,12 +155,12 @@ Loader {
             // User Profile
             ColumnLayout {
               anchors.centerIn: parent
-              spacing: 6 * scaling
+              spacing: 10 * scaling
               Layout.alignment: Qt.AlignHCenter
 
               Rectangle {
-                Layout.preferredWidth: 130 * scaling
-                Layout.preferredHeight: 130 * scaling
+                Layout.preferredWidth: 160 * scaling
+                Layout.preferredHeight: 160 * scaling
                 Layout.alignment: Qt.AlignHCenter
                 radius: width * 0.5
                 color: Color.transparent
@@ -189,8 +189,8 @@ Loader {
 
                 NImageCircled {
                   anchors.centerIn: parent
-                  width: 120 * scaling
-                  height: 120 * scaling
+                  width: 150 * scaling
+                  height: 150 * scaling
                   imagePath: Settings.data.general.avatarImage
                   fallbackIcon: "person"
 
@@ -213,7 +213,7 @@ Loader {
               NText {
                 text: I18n.tr("lock-screen.welcome-back")
                 Layout.alignment: Qt.AlignHCenter
-                pointSize: Style.fontSizeL * scaling
+                pointSize: Style.fontSizeXL * scaling
                 font.weight: Font.Medium
                 color: Color.mOnSurface
                 horizontalAlignment: Text.AlignHCenter
@@ -223,7 +223,7 @@ Loader {
               NText {
                 text: Quickshell.env("USER")
                 Layout.alignment: Qt.AlignHCenter
-                pointSize: Style.fontSizeXXXL * scaling
+                pointSize: Style.fontSizeXXXL * scaling * 1.2
                 font.weight: Font.Medium
                 color: Color.mOnSurface
                 horizontalAlignment: Text.AlignHCenter
@@ -233,12 +233,12 @@ Loader {
 
             // Error notification
             Rectangle {
-              width: 400 * scaling
-              height: 50 * scaling
+              width: 450 * scaling
+              height: 60 * scaling
               anchors.horizontalCenter: parent.horizontalCenter
               anchors.bottom: parent.bottom
               anchors.bottomMargin: 300 * scaling
-              radius: 25 * scaling
+              radius: 30 * scaling
               color: Color.mError
               border.color: Color.mError
               border.width: 1
@@ -247,18 +247,18 @@ Loader {
 
               RowLayout {
                 anchors.centerIn: parent
-                spacing: 8 * scaling
+                spacing: 10 * scaling
 
                 NIcon {
                   icon: "alert-circle"
-                  pointSize: Style.fontSizeM * scaling
+                  pointSize: Style.fontSizeL * scaling
                   color: Color.mOnError
                 }
 
                 NText {
                   text: lockContext.errorMessage || "Authentication failed"
                   color: Color.mOnError
-                  pointSize: Style.fontSizeM * scaling
+                  pointSize: Style.fontSizeL * scaling
                   font.weight: Font.Medium
                   horizontalAlignment: Text.AlignHCenter
                 }
@@ -274,26 +274,26 @@ Loader {
 
             // Bottom container with weather, password input and controls
             Rectangle {
-              width: 700 * scaling
-              height: 200 * scaling
+              width: 800 * scaling
+              height: 240 * scaling
               anchors.horizontalCenter: parent.horizontalCenter
               anchors.bottom: parent.bottom
-              anchors.bottomMargin: 80 * scaling
-              radius: 30 * scaling
+              anchors.bottomMargin: 100 * scaling
+              radius: 35 * scaling
               color: Qt.alpha(Color.mSurfaceContainerHighest, 0.9)
               border.color: Qt.alpha(Color.mOutline, 0.2)
               border.width: 1
 
               ColumnLayout {
                 anchors.fill: parent
-                anchors.margins: 12 * scaling
-                spacing: 12 * scaling
+                anchors.margins: 16 * scaling
+                spacing: 16 * scaling
 
                 // Weather section
                 RowLayout {
                   Layout.fillWidth: true
-                  Layout.preferredHeight: 60 * scaling
-                  spacing: 16 * scaling
+                  Layout.preferredHeight: 70 * scaling
+                  spacing: 20 * scaling
                   visible: LocationService.coordinatesReady && LocationService.data.weather !== null
 
                   // Media widget with visualizer
@@ -374,7 +374,7 @@ Loader {
 
                         NText {
                           text: MediaService.trackTitle || "No media"
-                          pointSize: Style.fontSizeS * scaling
+                          pointSize: Style.fontSizeM * scaling
                           font.weight: Style.fontWeightMedium
                           color: Color.mOnSurface
                           Layout.fillWidth: true
@@ -383,7 +383,7 @@ Loader {
 
                         NText {
                           text: MediaService.trackArtist || ""
-                          pointSize: Style.fontSizeXS * scaling
+                          pointSize: Style.fontSizeM * scaling
                           color: Color.mOnSurfaceVariant
                           Layout.fillWidth: true
                           elide: Text.ElideRight
@@ -434,7 +434,7 @@ Loader {
 
                         NText {
                           text: LocationService.data.weather.current_weather.windspeed + " km/h"
-                          pointSize: Style.fontSizeXS * scaling
+                          pointSize: Style.fontSizeM * scaling
                           color: Color.mOnSurfaceVariant
                           font.weight: Font.Normal
                         }
@@ -446,13 +446,13 @@ Loader {
 
                         NText {
                           text: Settings.data.location.name.split(",")[0]
-                          pointSize: Style.fontSizeXS * scaling
+                          pointSize: Style.fontSizeM * scaling
                           color: Color.mOnSurfaceVariant
                         }
 
                         NText {
                           text: (LocationService.data.weather.current && LocationService.data.weather.current.relativehumidity_2m) ? LocationService.data.weather.current.relativehumidity_2m + "% humidity" : ""
-                          pointSize: Style.fontSizeXS * scaling
+                          pointSize: Style.fontSizeM * scaling
                           color: Color.mOnSurfaceVariant
                         }
                       }
@@ -473,7 +473,7 @@ Loader {
 
                         NText {
                           text: Qt.locale().toString(new Date(LocationService.data.weather.daily.time[index].replace(/-/g, "/")), "ddd")
-                          pointSize: Style.fontSizeXS * scaling
+                          pointSize: Style.fontSizeM * scaling
                           color: Color.mOnSurfaceVariant
                           horizontalAlignment: Text.AlignHCenter
                           Layout.fillWidth: true
@@ -488,7 +488,7 @@ Loader {
 
                         NText {
                           text: Math.round(LocationService.data.weather.daily.temperature_2m_max[index]) + "°/" + Math.round(LocationService.data.weather.daily.temperature_2m_min[index]) + "°"
-                          pointSize: Style.fontSizeXS * scaling
+                          pointSize: Style.fontSizeM * scaling
                           font.weight: Style.fontWeightMedium
                           color: Color.mOnSurface
                           horizontalAlignment: Text.AlignHCenter
@@ -511,14 +511,14 @@ Loader {
 
                       NIcon {
                         icon: BatteryService.getIcon(Math.round(UPower.displayDevice.percentage * 100), UPower.displayDevice.state === UPowerDeviceState.Charging, true)
-                        pointSize: Style.fontSizeS * scaling
+                        pointSize: Style.fontSizeM * scaling
                         color: UPower.displayDevice.state === UPowerDeviceState.Charging ? Color.mPrimary : Color.mOnSurfaceVariant
                       }
 
                       NText {
                         text: Math.round(UPower.displayDevice.percentage * 100) + "%"
                         color: Color.mOnSurfaceVariant
-                        pointSize: Style.fontSizeXS * scaling
+                        pointSize: Style.fontSizeM * scaling
                         font.weight: Font.Medium
                       }
                     }
@@ -530,14 +530,14 @@ Loader {
 
                       NIcon {
                         icon: "keyboard"
-                        pointSize: Style.fontSizeS * scaling
+                        pointSize: Style.fontSizeM * scaling
                         color: Color.mOnSurfaceVariant
                       }
 
                       NText {
                         text: keyboardLayout.currentLayout
                         color: Color.mOnSurfaceVariant
-                        pointSize: Style.fontSizeXS * scaling
+                        pointSize: Style.fontSizeM * scaling
                         font.weight: Font.Medium
                       }
                     }
@@ -555,21 +555,21 @@ Loader {
 
                   Rectangle {
                     Layout.fillWidth: true
-                    Layout.preferredHeight: 44 * scaling
-                    radius: 22 * scaling
+                    Layout.preferredHeight: 52 * scaling
+                    radius: 26 * scaling
                     color: Qt.alpha(Color.mSurfaceContainerHighest, 0.6)
                     border.color: passwordInput.activeFocus ? Color.mPrimary : Qt.alpha(Color.mOutline, 0.3)
                     border.width: passwordInput.activeFocus ? 2 : 1
 
                     Row {
                       anchors.left: parent.left
-                      anchors.leftMargin: 16 * scaling
+                      anchors.leftMargin: 20 * scaling
                       anchors.verticalCenter: parent.verticalCenter
-                      spacing: 12 * scaling
+                      spacing: 16 * scaling
 
                       NIcon {
                         icon: "lock"
-                        pointSize: Style.fontSizeM * scaling
+                        pointSize: Style.fontSizeL * scaling
                         color: passwordInput.activeFocus ? Color.mPrimary : Color.mOnSurfaceVariant
                         anchors.verticalCenter: parent.verticalCenter
                       }
@@ -625,7 +625,7 @@ Loader {
                         NText {
                           text: passwordInput.text.length > 0 ? "•".repeat(passwordInput.text.length) : ""
                           color: passwordInput.text.length > 0 ? Color.mOnSurface : Color.mOnSurfaceVariant
-                          pointSize: Style.fontSizeL * scaling
+                          pointSize: Style.fontSizeXL * scaling
                           opacity: passwordInput.text.length > 0 ? 1.0 : 0.6
                         }
 
@@ -654,10 +654,10 @@ Loader {
 
                     Rectangle {
                       anchors.right: parent.right
-                      anchors.rightMargin: 8 * scaling
+                      anchors.rightMargin: 10 * scaling
                       anchors.verticalCenter: parent.verticalCenter
-                      width: 32 * scaling
-                      height: 32 * scaling
+                      width: 38 * scaling
+                      height: 38 * scaling
                       radius: width * 0.5
                       color: submitButtonArea.containsMouse ? Color.mPrimary : Qt.alpha(Color.mPrimary, 0.8)
                       border.color: Color.mPrimary
@@ -667,7 +667,7 @@ Loader {
                       NIcon {
                         anchors.centerIn: parent
                         icon: "arrow-forward"
-                        pointSize: Style.fontSizeS * scaling
+                        pointSize: Style.fontSizeM * scaling
                         color: Color.mOnPrimary
                       }
 
@@ -695,8 +695,8 @@ Loader {
                 // System control buttons
                 RowLayout {
                   Layout.fillWidth: true
-                  Layout.preferredHeight: 44 * scaling
-                  spacing: 8 * scaling
+                  Layout.preferredHeight: 52 * scaling
+                  spacing: 12 * scaling
 
                   Item {
                     Layout.preferredWidth: Style.marginM * scaling
@@ -704,24 +704,24 @@ Loader {
 
                   Rectangle {
                     Layout.fillWidth: true
-                    Layout.preferredHeight: 44 * scaling
-                    radius: 22 * scaling
+                    Layout.preferredHeight: 52 * scaling
+                    radius: 26 * scaling
                     color: logoutButtonArea.containsMouse ? Color.mTertiary : "transparent"
 
                     RowLayout {
                       anchors.centerIn: parent
-                      spacing: 6 * scaling
+                      spacing: 8 * scaling
 
                       NIcon {
                         icon: "logout"
-                        pointSize: Style.fontSizeL * scaling
+                        pointSize: Style.fontSizeXL * scaling
                         color: logoutButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
                       }
 
                       NText {
                         text: I18n.tr("session-menu.logout")
                         color: logoutButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
-                        pointSize: Style.fontSizeM * scaling
+                        pointSize: Style.fontSizeL * scaling
                         font.weight: Font.Medium
                       }
                     }
@@ -743,24 +743,24 @@ Loader {
 
                   Rectangle {
                     Layout.fillWidth: true
-                    Layout.preferredHeight: 44 * scaling
-                    radius: 22 * scaling
+                    Layout.preferredHeight: 52 * scaling
+                    radius: 26 * scaling
                     color: rebootButtonArea.containsMouse ? Color.mTertiary : "transparent"
 
                     RowLayout {
                       anchors.centerIn: parent
-                      spacing: 6 * scaling
+                      spacing: 8 * scaling
 
                       NIcon {
                         icon: "reboot"
-                        pointSize: Style.fontSizeL * scaling
+                        pointSize: Style.fontSizeXL * scaling
                         color: rebootButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
                       }
 
                       NText {
                         text: I18n.tr("session-menu.reboot")
                         color: rebootButtonArea.containsMouse ? Color.mOnTertiary : Color.mOnSurfaceVariant
-                        pointSize: Style.fontSizeM * scaling
+                        pointSize: Style.fontSizeL * scaling
                         font.weight: Font.Medium
                       }
                     }
@@ -782,26 +782,26 @@ Loader {
 
                   Rectangle {
                     Layout.fillWidth: true
-                    Layout.preferredHeight: 44 * scaling
-                    radius: 22 * scaling
+                    Layout.preferredHeight: 52 * scaling
+                    radius: 26 * scaling
                     color: shutdownButtonArea.containsMouse ? Color.mError : "transparent"
                     border.color: shutdownButtonArea.containsMouse ? Color.mError : Color.transparent
                     border.width: 1
 
                     RowLayout {
                       anchors.centerIn: parent
-                      spacing: 6 * scaling
+                      spacing: 8 * scaling
 
                       NIcon {
                         icon: "shutdown"
-                        pointSize: Style.fontSizeL * scaling
+                        pointSize: Style.fontSizeXL * scaling
                         color: shutdownButtonArea.containsMouse ? Color.mOnError : Color.mOnSurfaceVariant
                       }
 
                       NText {
                         text: I18n.tr("session-menu.shutdown")
                         color: shutdownButtonArea.containsMouse ? Color.mOnError : Color.mOnSurfaceVariant
-                        pointSize: Style.fontSizeM * scaling
+                        pointSize: Style.fontSizeL * scaling
                         font.weight: Font.Medium
                       }
                     }