diff --git a/Commons/Style.qml b/Commons/Style.qml
index aaad61287..b37318055 100644
--- a/Commons/Style.qml
+++ b/Commons/Style.qml
@@ -37,9 +37,9 @@ Singleton {
   property int screenRadius: Math.round(20 * Settings.data.general.screenRadiusRatio)
 
   // Border
-  property int borderS: Math.round(1 * uiScaleRatio)
-  property int borderM: Math.round(2 * uiScaleRatio)
-  property int borderL: Math.round(3 * uiScaleRatio)
+  property int borderS: Math.max(1, Math.round(1 * uiScaleRatio))
+  property int borderM: Math.max(1, Math.round(2 * uiScaleRatio))
+  property int borderL: Math.max(1, Math.round(3 * uiScaleRatio))
 
   // Margins (for margins and spacing)
   property int marginXXS: Math.round(2 * uiScaleRatio)
diff --git a/Modules/Bar/Bluetooth/BluetoothDevicesList.qml b/Modules/Bar/Bluetooth/BluetoothDevicesList.qml
index 311bfeb48..7c9703e63 100644
--- a/Modules/Bar/Bluetooth/BluetoothDevicesList.qml
+++ b/Modules/Bar/Bluetooth/BluetoothDevicesList.qml
@@ -54,7 +54,7 @@ ColumnLayout {
       Layout.preferredHeight: deviceLayout.implicitHeight + (Style.marginM * 2)
       radius: Style.radiusM
       color: Color.mSurface
-      border.width: Math.max(1, Style.borderS)
+      border.width: Style.borderS
       border.color: getContentColor(Color.mOutline)
 
       RowLayout {
diff --git a/Modules/Bar/Extras/TrayMenu.qml b/Modules/Bar/Extras/TrayMenu.qml
index 007551843..4a66ccb65 100644
--- a/Modules/Bar/Extras/TrayMenu.qml
+++ b/Modules/Bar/Extras/TrayMenu.qml
@@ -88,7 +88,7 @@ PopupWindow {
     anchors.fill: parent
     color: Color.mSurface
     border.color: Color.mOutline
-    border.width: Math.max(1, Style.borderS)
+    border.width: Style.borderS
     radius: Style.radiusM
   }
 
diff --git a/Modules/Bar/WiFi/WiFiPanel.qml b/Modules/Bar/WiFi/WiFiPanel.qml
index 9bab6f254..90e40b43a 100644
--- a/Modules/Bar/WiFi/WiFiPanel.qml
+++ b/Modules/Bar/WiFi/WiFiPanel.qml
@@ -79,9 +79,9 @@ NPanel {
         visible: NetworkService.lastError.length > 0
         Layout.fillWidth: true
         Layout.preferredHeight: errorRow.implicitHeight + (Style.marginM * 2)
-        color: Qt.rgba(Color.mError.r, Color.mError.g, Color.mError.b, 0.1)
+        color: Qt.alpha(Color.mError, 0.1)
         radius: Style.radiusS
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
         border.color: Color.mError
 
         RowLayout {
@@ -218,7 +218,7 @@ NPanel {
                 opacity: (NetworkService.disconnectingFrom === modelData.ssid || NetworkService.forgettingNetwork === modelData.ssid) ? 0.6 : 1.0
 
                 color: modelData.connected ? Qt.rgba(Color.mPrimary.r, Color.mPrimary.g, Color.mPrimary.b, 0.05) : Color.mSurface
-                border.width: Math.max(1, Style.borderS)
+                border.width: Style.borderS
                 border.color: modelData.connected ? Color.mPrimary : Color.mOutline
 
                 // Smooth opacity animation
@@ -339,7 +339,7 @@ NPanel {
                           visible: modelData.cached && !modelData.connected && NetworkService.forgettingNetwork !== modelData.ssid && NetworkService.disconnectingFrom !== modelData.ssid
                           color: Color.transparent
                           border.color: Color.mOutline
-                          border.width: Math.max(1, Style.borderS)
+                          border.width: Style.borderS
                           radius: height * 0.5
                           width: savedText.implicitWidth + (Style.marginS * 2)
                           height: savedText.implicitHeight + (Style.marginXXS * 2)
@@ -415,7 +415,7 @@ NPanel {
                     height: passwordRow.implicitHeight + Style.marginS * 2
                     color: Color.mSurfaceVariant
                     border.color: Color.mOutline
-                    border.width: Math.max(1, Style.borderS)
+                    border.width: Style.borderS
                     radius: Style.radiusS
 
                     RowLayout {
@@ -430,7 +430,7 @@ NPanel {
                         radius: Style.radiusXS
                         color: Color.mSurface
                         border.color: pwdInput.activeFocus ? Color.mSecondary : Color.mOutline
-                        border.width: Math.max(1, Style.borderS)
+                        border.width: Style.borderS
 
                         TextInput {
                           id: pwdInput
@@ -497,7 +497,7 @@ NPanel {
                     height: forgetRow.implicitHeight + Style.marginS * 2
                     color: Color.mSurfaceVariant
                     radius: Style.radiusS
-                    border.width: Math.max(1, Style.borderS)
+                    border.width: Style.borderS
                     border.color: Color.mOutline
 
                     RowLayout {
diff --git a/Modules/ControlCenter/Cards/ProfileCard.qml b/Modules/ControlCenter/Cards/ProfileCard.qml
index 7c8911825..1eaffb3a7 100644
--- a/Modules/ControlCenter/Cards/ProfileCard.qml
+++ b/Modules/ControlCenter/Cards/ProfileCard.qml
@@ -30,7 +30,7 @@ NBox {
       imagePath: Settings.preprocessPath(Settings.data.general.avatarImage)
       fallbackIcon: "person"
       borderColor: Color.mPrimary
-      borderWidth: Math.max(1, Style.borderM)
+      borderWidth: Style.borderM
     }
 
     ColumnLayout {
diff --git a/Modules/Dock/Dock.qml b/Modules/Dock/Dock.qml
index 8e60bbf33..59345a756 100644
--- a/Modules/Dock/Dock.qml
+++ b/Modules/Dock/Dock.qml
@@ -289,7 +289,7 @@ Variants {
             color: Qt.alpha(Color.mSurface, Settings.data.dock.backgroundOpacity)
             anchors.centerIn: parent
             radius: Style.radiusL
-            border.width: Math.max(1, Style.borderS)
+            border.width: Style.borderS
             border.color: Qt.alpha(Color.mOutline, Settings.data.dock.backgroundOpacity)
 
             MouseArea {
diff --git a/Modules/Dock/DockMenu.qml b/Modules/Dock/DockMenu.qml
index 63ad8017e..c495cbaca 100644
--- a/Modules/Dock/DockMenu.qml
+++ b/Modules/Dock/DockMenu.qml
@@ -210,7 +210,7 @@ PopupWindow {
     color: Color.mSurfaceVariant
     radius: Style.radiusS
     border.color: Color.mOutline
-    border.width: Math.max(1, Style.borderS)
+    border.width: Style.borderS
 
     // Single MouseArea to handle both auto-close and menu interactions
     MouseArea {
diff --git a/Modules/LockScreen/LockScreen.qml b/Modules/LockScreen/LockScreen.qml
index 2b8add420..be86b62b5 100644
--- a/Modules/LockScreen/LockScreen.qml
+++ b/Modules/LockScreen/LockScreen.qml
@@ -690,7 +690,7 @@ Loader {
                           fallbackIcon: "disc"
                           fallbackIconSize: Style.fontSizeM
                           borderColor: Color.mOutline
-                          borderWidth: Math.max(1, Style.borderS)
+                          borderWidth: Style.borderS
                         }
                       }
 
diff --git a/Modules/Notification/Notification.qml b/Modules/Notification/Notification.qml
index e6ea07023..a609e038d 100644
--- a/Modules/Notification/Notification.qml
+++ b/Modules/Notification/Notification.qml
@@ -186,7 +186,7 @@ Variants {
 
             radius: Style.radiusL
             border.color: Color.mOutline
-            border.width: Math.max(1, Style.borderS)
+            border.width: Style.borderS
             color: Color.mSurface
 
             // Optimized progress bar container
diff --git a/Modules/Notification/NotificationHistoryPanel.qml b/Modules/Notification/NotificationHistoryPanel.qml
index b41211993..235617045 100644
--- a/Modules/Notification/NotificationHistoryPanel.qml
+++ b/Modules/Notification/NotificationHistoryPanel.qml
@@ -145,7 +145,7 @@ NPanel {
           radius: Style.radiusM
           color: Color.mSurfaceVariant
           border.color: Qt.alpha(Color.mOutline, Style.opacityMedium)
-          border.width: Math.max(1, Style.borderS)
+          border.width: Style.borderS
 
           Behavior on height {
             enabled: !Settings.data.general.animationDisabled
diff --git a/Modules/Settings/Bar/BarWidgetSettingsDialog.qml b/Modules/Settings/Bar/BarWidgetSettingsDialog.qml
index ed7562e41..77024bb54 100644
--- a/Modules/Settings/Bar/BarWidgetSettingsDialog.qml
+++ b/Modules/Settings/Bar/BarWidgetSettingsDialog.qml
@@ -44,7 +44,7 @@ Popup {
     color: Color.mSurface
     radius: Style.radiusL
     border.color: Color.mPrimary
-    border.width: Math.max(1, Style.borderM)
+    border.width: Style.borderM
   }
 
   contentItem: ColumnLayout {
diff --git a/Modules/Settings/Bar/WidgetSettings/ClockSettings.qml b/Modules/Settings/Bar/WidgetSettings/ClockSettings.qml
index 9729ccce3..e385b5c29 100644
--- a/Modules/Settings/Bar/WidgetSettings/ClockSettings.qml
+++ b/Modules/Settings/Bar/WidgetSettings/ClockSettings.qml
@@ -181,7 +181,7 @@ ColumnLayout {
         color: Color.mSurfaceVariant
         radius: Style.radiusM
         border.color: Color.mSecondary
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
 
         Behavior on border.color {
           ColorAnimation {
diff --git a/Modules/Settings/Bar/WidgetSettings/TraySettings.qml b/Modules/Settings/Bar/WidgetSettings/TraySettings.qml
index a9a412431..dc3a4ef45 100644
--- a/Modules/Settings/Bar/WidgetSettings/TraySettings.qml
+++ b/Modules/Settings/Bar/WidgetSettings/TraySettings.qml
@@ -100,7 +100,7 @@ ColumnLayout {
         anchors.margins: Style.marginXS
         color: Color.transparent // Make background transparent
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
         radius: Style.radiusS
         visible: model.rule !== undefined && model.rule !== "" // Only visible if rule exists
       }
diff --git a/Modules/Settings/SettingsPanel.qml b/Modules/Settings/SettingsPanel.qml
index 47ebc40a0..a3369e0c6 100644
--- a/Modules/Settings/SettingsPanel.qml
+++ b/Modules/Settings/SettingsPanel.qml
@@ -362,7 +362,7 @@ NPanel {
           Layout.alignment: Qt.AlignTop
           color: Color.mSurfaceVariant
           border.color: Color.mOutline
-          border.width: Math.max(1, Style.borderS)
+          border.width: Style.borderS
           radius: Style.radiusM
 
           MouseArea {
@@ -464,7 +464,7 @@ NPanel {
           radius: Style.radiusM
           color: Color.mSurfaceVariant
           border.color: Color.mOutline
-          border.width: Math.max(1, Style.borderS)
+          border.width: Style.borderS
 
           ColumnLayout {
             id: contentLayout
diff --git a/Modules/Settings/Tabs/AboutTab.qml b/Modules/Settings/Tabs/AboutTab.qml
index 1faf3a538..6892b1ce1 100644
--- a/Modules/Settings/Tabs/AboutTab.qml
+++ b/Modules/Settings/Tabs/AboutTab.qml
@@ -194,7 +194,7 @@ ColumnLayout {
             anchors.margins: Style.marginXS
             fallbackIcon: "person"
             borderColor: contributorArea.containsMouse ? Color.mOnTertiary : Color.mPrimary
-            borderWidth: Math.max(1, Style.borderM)
+            borderWidth: Style.borderM
 
             Behavior on borderColor {
               ColorAnimation {
diff --git a/Modules/Settings/Tabs/AudioTab.qml b/Modules/Settings/Tabs/AudioTab.qml
index ef73bbdd1..14237df37 100644
--- a/Modules/Settings/Tabs/AudioTab.qml
+++ b/Modules/Settings/Tabs/AudioTab.qml
@@ -297,7 +297,7 @@ ColumnLayout {
             // Visuals
             color: Qt.alpha(Color.mOnSurface, 0.125)
             border.color: Qt.alpha(Color.mOnSurface, Style.opacityLight)
-            border.width: Math.max(1, Style.borderS)
+            border.width: Style.borderS
 
             // Content
             RowLayout {
diff --git a/Modules/Settings/Tabs/ColorSchemeTab.qml b/Modules/Settings/Tabs/ColorSchemeTab.qml
index 1649d54b1..1b0ff7dc2 100644
--- a/Modules/Settings/Tabs/ColorSchemeTab.qml
+++ b/Modules/Settings/Tabs/ColorSchemeTab.qml
@@ -334,10 +334,10 @@ ColumnLayout {
 
           Layout.fillWidth: true
           Layout.alignment: Qt.AlignHCenter
-          height: 50
+          height: 50 * Style.uiScaleRatio
           radius: Style.radiusS
           color: root.getSchemeColor(schemeName, "mSurface")
-          border.width: Math.max(1, Style.borderL)
+          border.width: Style.borderL
           border.color: {
             if (Settings.data.colorSchemes.predefinedScheme === schemeName) {
               return Color.mSecondary
@@ -421,7 +421,7 @@ ColumnLayout {
             height: 20
             radius: width * 0.5
             color: Color.mSecondary
-            border.width: Math.max(1, Style.borderS)
+            border.width: Style.borderS
             border.color: Color.mOnSecondary
 
             NIcon {
diff --git a/Modules/Settings/Tabs/DisplayTab.qml b/Modules/Settings/Tabs/DisplayTab.qml
index d1823fa14..7efaf6d7c 100644
--- a/Modules/Settings/Tabs/DisplayTab.qml
+++ b/Modules/Settings/Tabs/DisplayTab.qml
@@ -67,7 +67,7 @@ ColumnLayout {
         radius: Style.radiusM
         color: Color.mSurfaceVariant
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
 
         property var brightnessMonitor: BrightnessService.getMonitorForScreen(modelData)
 
diff --git a/Modules/Settings/Tabs/GeneralTab.qml b/Modules/Settings/Tabs/GeneralTab.qml
index d750f3c7d..e01bb567d 100644
--- a/Modules/Settings/Tabs/GeneralTab.qml
+++ b/Modules/Settings/Tabs/GeneralTab.qml
@@ -26,7 +26,7 @@ ColumnLayout {
       imagePath: Settings.preprocessPath(Settings.data.general.avatarImage)
       fallbackIcon: "person"
       borderColor: Color.mPrimary
-      borderWidth: Math.max(1, Style.borderM)
+      borderWidth: Style.borderM
       Layout.alignment: Qt.AlignTop
     }
 
diff --git a/Modules/Settings/Tabs/WallpaperTab.qml b/Modules/Settings/Tabs/WallpaperTab.qml
index c93c60da9..775fa95e3 100644
--- a/Modules/Settings/Tabs/WallpaperTab.qml
+++ b/Modules/Settings/Tabs/WallpaperTab.qml
@@ -59,7 +59,7 @@ ColumnLayout {
       radius: Style.radiusM
       color: Color.mSurfaceVariant
       border.color: Color.mOutline
-      border.width: Math.max(1, Style.borderS)
+      border.width: Style.borderS
       implicitHeight: contentCol.implicitHeight + Style.marginL * 2
 
       ColumnLayout {
diff --git a/Modules/SetupWizard/SetupAppearanceStep.qml b/Modules/SetupWizard/SetupAppearanceStep.qml
index a59b2ad37..8ff521024 100644
--- a/Modules/SetupWizard/SetupAppearanceStep.qml
+++ b/Modules/SetupWizard/SetupAppearanceStep.qml
@@ -417,7 +417,7 @@ ColumnLayout {
               height: 50
               radius: Style.radiusS
               color: root.cacheVersion >= 0 ? root.getSchemeColor(schemeName, "mSurface") : root.getSchemeColor(schemeName, "mSurface")
-              border.width: Math.max(1, Style.borderL)
+              border.width: Style.borderL
               border.color: itemMouseArea.containsMouse ? Color.mTertiary : (Settings.data.colorSchemes.predefinedScheme === schemeName ? Color.mSecondary : Color.mOutline)
 
               RowLayout {
diff --git a/Modules/Tooltip/Tooltip.qml b/Modules/Tooltip/Tooltip.qml
index 00c139b6e..f30306d3b 100644
--- a/Modules/Tooltip/Tooltip.qml
+++ b/Modules/Tooltip/Tooltip.qml
@@ -393,7 +393,7 @@ PopupWindow {
       anchors.fill: parent
       color: Color.mSurface
       border.color: Color.mOutline
-      border.width: Math.max(1, Style.borderS)
+      border.width: Style.borderS
       radius: Style.radiusS
 
       // Only show content when we have text
diff --git a/Modules/Wallpaper/WallpaperPanel.qml b/Modules/Wallpaper/WallpaperPanel.qml
index 2dcfe18ed..6711fbef6 100644
--- a/Modules/Wallpaper/WallpaperPanel.qml
+++ b/Modules/Wallpaper/WallpaperPanel.qml
@@ -140,7 +140,7 @@ NPanel {
             background: Rectangle {
               color: screenTabBar.currentIndex === index ? Color.mSecondary : Color.transparent
               radius: Style.radiusS
-              border.width: screenTabBar.currentIndex === index ? 0 : Math.max(1, Style.borderS)
+              border.width: screenTabBar.currentIndex === index ? 0 : Style.borderS
               border.color: Color.mOutline
 
               Behavior on color {
@@ -417,7 +417,7 @@ NPanel {
               radius: width / 2
               color: Color.mSecondary
               border.color: Color.mOutline
-              border.width: Math.max(1, Style.borderS)
+              border.width: Style.borderS
               visible: isSelected
 
               NIcon {
@@ -476,7 +476,7 @@ NPanel {
         color: Color.mSurface
         radius: Style.radiusM
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
         visible: (filteredWallpapers.length === 0 && !WallpaperService.scanning) || WallpaperService.scanning
         Layout.fillWidth: true
         Layout.preferredHeight: 130
diff --git a/Widgets/NBox.qml b/Widgets/NBox.qml
index 72ab90f01..576d11cf2 100644
--- a/Widgets/NBox.qml
+++ b/Widgets/NBox.qml
@@ -14,5 +14,5 @@ Rectangle {
   color: Color.mSurfaceVariant
   radius: Style.radiusM
   border.color: Color.mOutline
-  border.width: Math.max(1, Style.borderS)
+  border.width: Style.borderS
 }
diff --git a/Widgets/NButton.qml b/Widgets/NButton.qml
index 9b97b5d2b..0e4fd6e3d 100644
--- a/Widgets/NButton.qml
+++ b/Widgets/NButton.qml
@@ -45,7 +45,7 @@ Rectangle {
     return outlined ? Color.transparent : backgroundColor
   }
 
-  border.width: outlined ? Math.max(1, Style.borderS) : 0
+  border.width: outlined ? Style.borderS : 0
   border.color: {
     if (!enabled)
       return Color.mOutline
diff --git a/Widgets/NCheckbox.qml b/Widgets/NCheckbox.qml
index 9fe63be90..5da2ae4ce 100644
--- a/Widgets/NCheckbox.qml
+++ b/Widgets/NCheckbox.qml
@@ -40,7 +40,7 @@ RowLayout {
     radius: Style.radiusXS
     color: root.checked ? root.activeColor : Color.mSurface
     border.color: Color.mOutline
-    border.width: Math.max(1, Style.borderS)
+    border.width: Style.borderS
 
     Behavior on color {
       ColorAnimation {
diff --git a/Widgets/NCircleStat.qml b/Widgets/NCircleStat.qml
index 3279084e1..ad5a69715 100644
--- a/Widgets/NCircleStat.qml
+++ b/Widgets/NCircleStat.qml
@@ -22,7 +22,7 @@ Rectangle {
   color: flat ? Color.transparent : Color.mSurface
   radius: Style.radiusS
   border.color: flat ? Color.transparent : Color.mSurfaceVariant
-  border.width: flat ? 0 : Math.max(1, Style.borderS)
+  border.width: flat ? 0 : Style.borderS
 
   // Repaint gauge when the bound value changes
   onValueChanged: gauge.requestPaint()
diff --git a/Widgets/NCollapsible.qml b/Widgets/NCollapsible.qml
index 3834220e2..4520ceaf0 100644
--- a/Widgets/NCollapsible.qml
+++ b/Widgets/NCollapsible.qml
@@ -29,7 +29,7 @@ ColumnLayout {
 
     // Subtle border
     border.color: root.expanded ? Color.mOnSecondary : Color.mOutline
-    border.width: Math.max(1, Style.borderS)
+    border.width: Style.borderS
 
     // Smooth color transitions
     Behavior on color {
@@ -151,7 +151,7 @@ ColumnLayout {
     color: Color.mSurface
     radius: Style.radiusL
     border.color: Color.mOutline
-    border.width: Math.max(1, Style.borderS)
+    border.width: Style.borderS
 
     // Dynamic height based on content
     Layout.preferredHeight: visible ? contentLayout.implicitHeight + (Style.marginL * 2) : 0
diff --git a/Widgets/NColorPicker.qml b/Widgets/NColorPicker.qml
index 4aa9b46fb..a035facd0 100644
--- a/Widgets/NColorPicker.qml
+++ b/Widgets/NColorPicker.qml
@@ -18,7 +18,7 @@ Rectangle {
   radius: Style.radiusM
   color: Color.mSurface
   border.color: Color.mOutline
-  border.width: Math.max(1, Style.borderS)
+  border.width: Style.borderS
 
   // Minimized Look
   MouseArea {
@@ -53,7 +53,7 @@ Rectangle {
         radius: Layout.preferredWidth * 0.5
         color: root.selectedColor
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
       }
 
       NText {
diff --git a/Widgets/NColorPickerDialog.qml b/Widgets/NColorPickerDialog.qml
index 364dd8f92..adf701a6d 100644
--- a/Widgets/NColorPickerDialog.qml
+++ b/Widgets/NColorPickerDialog.qml
@@ -114,7 +114,7 @@ Popup {
     color: Color.mSurface
     radius: Style.radiusS
     border.color: Color.mPrimary
-    border.width: Math.max(1, Style.borderM)
+    border.width: Style.borderM
   }
 
   contentItem: NScrollView {
@@ -166,7 +166,7 @@ Popup {
         radius: Style.radiusS
         color: root.selectedColor
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
 
         ColumnLayout {
           spacing: 0
diff --git a/Widgets/NComboBox.qml b/Widgets/NComboBox.qml
index 1a626bed9..f73eb68d8 100644
--- a/Widgets/NComboBox.qml
+++ b/Widgets/NComboBox.qml
@@ -76,7 +76,7 @@ RowLayout {
       implicitHeight: preferredHeight
       color: Color.mSurface
       border.color: combo.activeFocus ? Color.mSecondary : Color.mOutline
-      border.width: Math.max(1, Style.borderS)
+      border.width: Style.borderS
       radius: Style.radiusM
 
       Behavior on border.color {
@@ -177,7 +177,7 @@ RowLayout {
       background: Rectangle {
         color: Color.mSurfaceVariant
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
         radius: Style.radiusM
       }
     }
diff --git a/Widgets/NContextMenu.qml b/Widgets/NContextMenu.qml
index 9f8e833e0..342f62154 100644
--- a/Widgets/NContextMenu.qml
+++ b/Widgets/NContextMenu.qml
@@ -22,7 +22,7 @@ Popup {
   background: Rectangle {
     color: Color.mSurfaceVariant
     border.color: Color.mOutline
-    border.width: Math.max(1, Style.borderS)
+    border.width: Style.borderS
     radius: Style.radiusM
   }
 
diff --git a/Widgets/NDateTimeTokens.qml b/Widgets/NDateTimeTokens.qml
index 4f6c2b9e8..6c5d7c52e 100644
--- a/Widgets/NDateTimeTokens.qml
+++ b/Widgets/NDateTimeTokens.qml
@@ -7,7 +7,7 @@ Rectangle {
   id: root
   color: Color.mSurface
   border.color: Color.mOutline
-  border.width: Math.max(1, Style.borderS)
+  border.width: Style.borderS
   radius: Style.radiusM
 
   property date sampleDate: new Date() // Dec 25, 2023, 2:30:45.123 PM
@@ -296,7 +296,7 @@ Rectangle {
             color: tokenMouseArea.containsMouse ? Color.mPrimary : Color.mOnSurfaceVariant
             radius: Style.radiusS
             border.color: tokenMouseArea.containsMouse ? Color.mPrimary : Color.mOutline
-            border.width: Math.max(1, Style.borderS)
+            border.width: Style.borderS
 
             Behavior on color {
               ColorAnimation {
diff --git a/Widgets/NDivider.qml b/Widgets/NDivider.qml
index 98f4d1d45..d11e82c77 100644
--- a/Widgets/NDivider.qml
+++ b/Widgets/NDivider.qml
@@ -6,7 +6,7 @@ import qs.Services
 
 Rectangle {
   width: parent.width
-  height: Math.max(1, Style.borderS)
+  height: Style.borderS
   gradient: Gradient {
     orientation: Gradient.Horizontal
     GradientStop {
diff --git a/Widgets/NFilePicker.qml b/Widgets/NFilePicker.qml
index 4b82e77dd..e8ea92127 100644
--- a/Widgets/NFilePicker.qml
+++ b/Widgets/NFilePicker.qml
@@ -147,7 +147,7 @@ Popup {
     color: Color.mSurfaceVariant
     radius: Style.radiusL
     border.color: Color.mOutline
-    border.width: Math.max(1, Style.borderS)
+    border.width: Style.borderS
   }
 
   Rectangle {
@@ -244,7 +244,7 @@ Popup {
         color: Color.mSurfaceVariant
         radius: Style.radiusS
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
 
         RowLayout {
           anchors.left: parent.left
@@ -371,7 +371,7 @@ Popup {
         color: Color.mSurface
         radius: Style.radiusM
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
 
         FolderListModel {
           id: folderModel
@@ -493,7 +493,7 @@ Popup {
               color: Color.transparent
               radius: parent.radius
               border.color: isSelected ? Color.mSecondary : Color.mSurface
-              border.width: Math.max(1, Style.borderL)
+              border.width: Style.borderL
               Behavior on color {
                 ColorAnimation {
                   duration: Style.animationFast
@@ -506,7 +506,7 @@ Popup {
               color: (mouseArea.containsMouse && !isSelected) ? Color.mTertiary : Color.transparent
               radius: parent.radius
               border.color: (mouseArea.containsMouse && !isSelected) ? Color.mTertiary : Color.transparent
-              border.width: Math.max(1, Style.borderS)
+              border.width: Style.borderS
               Behavior on color {
                 ColorAnimation {
                   duration: Style.animationFast
@@ -592,7 +592,7 @@ Popup {
                   radius: width / 2
                   color: Color.mSecondary
                   border.color: Color.mOutline
-                  border.width: Math.max(1, Style.borderS)
+                  border.width: Style.borderS
                   visible: isSelected
                   NIcon {
                     icon: "filepicker-check"
diff --git a/Widgets/NIconButton.qml b/Widgets/NIconButton.qml
index 4a61c1dfa..c6b095e43 100644
--- a/Widgets/NIconButton.qml
+++ b/Widgets/NIconButton.qml
@@ -38,7 +38,7 @@ Rectangle {
   color: root.enabled && root.hovering ? colorBgHover : colorBg
   radius: width * 0.5
   border.color: root.enabled && root.hovering ? colorBorderHover : colorBorder
-  border.width: Math.max(1, Style.borderS)
+  border.width: Style.borderS
 
   Behavior on color {
     ColorAnimation {
diff --git a/Widgets/NIconButtonHot.qml b/Widgets/NIconButtonHot.qml
index 18df3bac1..6107c3f2c 100644
--- a/Widgets/NIconButtonHot.qml
+++ b/Widgets/NIconButtonHot.qml
@@ -62,7 +62,7 @@ Rectangle {
   }
   radius: width * 0.5
   border.color: root.enabled && root.hovering ? colorBorderHover : colorBorder
-  border.width: Math.max(1, Style.borderS)
+  border.width: Style.borderS
 
   Behavior on color {
     ColorAnimation {
diff --git a/Widgets/NPanel.qml b/Widgets/NPanel.qml
index 527f31c69..f7a4f91c2 100644
--- a/Widgets/NPanel.qml
+++ b/Widgets/NPanel.qml
@@ -198,7 +198,7 @@ Loader {
         color: panelBackgroundColor
         radius: Style.radiusL
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
         // Dragging support
         property bool draggable: root.draggable
         property bool isDragged: false
@@ -457,7 +457,7 @@ Loader {
           anchors.margins: 0
           color: Color.transparent
           border.color: Color.mPrimary
-          border.width: Math.max(2, Style.borderL)
+          border.width: Style.borderL
           radius: parent.radius
           visible: panelBackground.isDragged && dragHandler.active
           opacity: 0.8
@@ -469,7 +469,7 @@ Loader {
             anchors.margins: 0
             color: Color.transparent
             border.color: Color.mPrimary
-            border.width: Math.max(1, Style.borderS)
+            border.width: Style.borderS
             radius: parent.radius
             opacity: 0.3
           }
diff --git a/Widgets/NRadioButton.qml b/Widgets/NRadioButton.qml
index 59ff22051..a6f8048c7 100644
--- a/Widgets/NRadioButton.qml
+++ b/Widgets/NRadioButton.qml
@@ -15,7 +15,7 @@ RadioButton {
     radius: width * 0.5
     color: Color.transparent
     border.color: root.checked ? Color.mPrimary : Color.mOnSurface
-    border.width: Math.max(1, Style.borderM)
+    border.width: Style.borderM
     anchors.verticalCenter: parent.verticalCenter
 
     Rectangle {
diff --git a/Widgets/NReorderCheckboxes.qml b/Widgets/NReorderCheckboxes.qml
index a7d959272..a245c5155 100644
--- a/Widgets/NReorderCheckboxes.qml
+++ b/Widgets/NReorderCheckboxes.qml
@@ -195,7 +195,7 @@ Item {
           radius: Style.radiusXS
           color: delegateItem.enabled ? root.activeColor : Color.mSurface
           border.color: delegateItem.required ? root.activeColor : Color.mOutline
-          border.width: Math.max(1, Style.borderS)
+          border.width: Style.borderS
           opacity: delegateItem.required ? 0.7 : 1.0
 
           Behavior on color {
diff --git a/Widgets/NSearchableComboBox.qml b/Widgets/NSearchableComboBox.qml
index 7d662278c..dfb428141 100644
--- a/Widgets/NSearchableComboBox.qml
+++ b/Widgets/NSearchableComboBox.qml
@@ -126,7 +126,7 @@ RowLayout {
       implicitHeight: preferredHeight
       color: Color.mSurface
       border.color: combo.activeFocus ? Color.mSecondary : Color.mOutline
-      border.width: Math.max(1, Style.borderS)
+      border.width: Style.borderS
       radius: Style.radiusM
 
       Behavior on border.color {
@@ -272,7 +272,7 @@ RowLayout {
       background: Rectangle {
         color: Color.mSurfaceVariant
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
         radius: Style.radiusM
       }
     }
diff --git a/Widgets/NSectionEditor.qml b/Widgets/NSectionEditor.qml
index 59b77d85d..9aa6d9b64 100644
--- a/Widgets/NSectionEditor.qml
+++ b/Widgets/NSectionEditor.qml
@@ -177,7 +177,7 @@ NBox {
             radius: Style.radiusL
             color: root.getWidgetColor(modelData)[0]
             border.color: Color.mOutline
-            border.width: Math.max(1, Style.borderS)
+            border.width: Style.borderS
 
             // Store the widget index for drag operations
             property int widgetIndex: index
@@ -332,7 +332,7 @@ NBox {
         radius: Style.radiusL
         color: Color.transparent
         border.color: Color.mOutline
-        border.width: Math.max(1, Style.borderS)
+        border.width: Style.borderS
         opacity: 0.7
         visible: flowDragArea.dragStarted
         z: 2000
diff --git a/Widgets/NSlider.qml b/Widgets/NSlider.qml
index fb9b03129..dbcb22304 100644
--- a/Widgets/NSlider.qml
+++ b/Widgets/NSlider.qml
@@ -33,7 +33,7 @@ Slider {
     radius: height / 2
     color: Qt.alpha(Color.mSurface, 0.5)
     border.color: Qt.alpha(Color.mOutline, 0.5)
-    border.width: Math.max(1, Style.borderS)
+    border.width: Style.borderS
 
     // A container composite shape that puts a semicircle on the end
     Item {
@@ -119,7 +119,7 @@ Slider {
       radius: width / 2
       color: root.pressed ? Color.mTertiary : Color.mSurface
       border.color: Color.mPrimary
-      border.width: Math.max(1, Style.borderL)
+      border.width: Style.borderL
       anchors.centerIn: parent
 
       Behavior on color {
diff --git a/Widgets/NTextInput.qml b/Widgets/NTextInput.qml
index f11f9ca43..f9ba4f05e 100644
--- a/Widgets/NTextInput.qml
+++ b/Widgets/NTextInput.qml
@@ -54,7 +54,7 @@ ColumnLayout {
       radius: Style.radiusM
       color: Color.mSurface
       border.color: input.activeFocus ? Color.mSecondary : Color.mOutline
-      border.width: Math.max(1, Style.borderS)
+      border.width: Style.borderS
 
       Behavior on border.color {
         ColorAnimation {
diff --git a/Widgets/NToggle.qml b/Widgets/NToggle.qml
index 45ad8bc36..8ec1f6976 100644
--- a/Widgets/NToggle.qml
+++ b/Widgets/NToggle.qml
@@ -34,7 +34,7 @@ RowLayout {
     radius: height * 0.5
     color: root.checked ? Color.mPrimary : Color.mSurface
     border.color: Color.mOutline
-    border.width: Math.max(1, Style.borderS)
+    border.width: Style.borderS
 
     Behavior on color {
       ColorAnimation {
@@ -55,7 +55,7 @@ RowLayout {
       radius: height * 0.5
       color: root.checked ? Color.mOnPrimary : Color.mPrimary
       border.color: root.checked ? Color.mSurface : Color.mSurface
-      border.width: Math.max(1, Style.borderM)
+      border.width: Style.borderM
       anchors.verticalCenter: parent.verticalCenter
       anchors.verticalCenterOffset: 0
       x: root.checked ? switcher.width - width - 3 : 3