diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml
index 2872c861..97e9cb61 100644
--- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml
+++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml
@@ -106,8 +106,8 @@ MobileShell.BaseItem {
                 property real fullHeight: height + Layout.topMargin
                 Layout.fillWidth: true
                 Layout.topMargin: Kirigami.Units.smallSpacing
-                Layout.leftMargin: Kirigami.Units.gridUnit
-                Layout.rightMargin: Kirigami.Units.gridUnit
+                Layout.leftMargin: Kirigami.Units.largeSpacing
+                Layout.rightMargin: Kirigami.Units.largeSpacing
             }
             
             Handle {
diff --git a/components/mobileshell/qml/widgets/notifications/NotificationCard.qml b/components/mobileshell/qml/widgets/notifications/NotificationCard.qml
index 8de94def..141be0dd 100644
--- a/components/mobileshell/qml/widgets/notifications/NotificationCard.qml
+++ b/components/mobileshell/qml/widgets/notifications/NotificationCard.qml
@@ -26,7 +26,7 @@ Item {
     onContentItemChanged: {
         contentItem.parent = contentParent;
         contentItem.anchors.fill = contentParent;
-        contentItem.anchors.margins = Kirigami.Units.gridUnit;
+        contentItem.anchors.margins = Kirigami.Units.largeSpacing;
         contentParent.children.push(contentItem);
     }
     
diff --git a/components/mobileshell/qml/widgets/notifications/NotificationItem.qml b/components/mobileshell/qml/widgets/notifications/NotificationItem.qml
index 2f212b0a..06c058b1 100644
--- a/components/mobileshell/qml/widgets/notifications/NotificationItem.qml
+++ b/components/mobileshell/qml/widgets/notifications/NotificationItem.qml
@@ -52,7 +52,7 @@ BaseNotificationItem {
     // notification
     NotificationCard {
         id: mainCard
-        anchors.topMargin: notificationHeading.visible ? Kirigami.Units.gridUnit : 0
+        anchors.topMargin: notificationHeading.visible ? Kirigami.Units.largeSpacing : 0
         anchors.top: notificationHeading.bottom
         anchors.left: parent.left
         anchors.right: parent.right
@@ -148,7 +148,7 @@ BaseNotificationItem {
             // thumbnails
             Loader {
                 id: thumbnailStripLoader
-                Layout.topMargin: Kirigami.Units.gridUnit
+                Layout.topMargin: Kirigami.Units.largeSpacing
                 Layout.fillWidth: true
                 active: notificationItem.urls.length > 0
                 visible: active
diff --git a/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml b/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml
index 7558f921..04e06140 100644
--- a/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml
+++ b/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml
@@ -158,7 +158,7 @@ Item {
         }
                 
         boundsBehavior: Flickable.StopAtBounds
-        spacing: Kirigami.Units.gridUnit
+        spacing: Kirigami.Units.largeSpacing
 
         // TODO keyboard focus
         highlightMoveDuration: 0
@@ -363,8 +363,8 @@ Item {
                 top: spacer.bottom
                 right: parent.right
                 left: parent.left
-                leftMargin: Kirigami.Units.gridUnit
-                rightMargin: Kirigami.Units.gridUnit
+                leftMargin: PlasmaCore.Units.largeSpacing
+                rightMargin: PlasmaCore.Units.largeSpacing
                 topMargin: list.spacing
                 bottomMargin: list.spacing
             }
diff --git a/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml b/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml
index 651ff2bd..63593950 100644
--- a/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml
+++ b/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml
@@ -35,7 +35,7 @@ MobileShell.GridView {
     readonly property int reservedSpaceForLabel: metrics.height
     readonly property real effectiveContentWidth: width - leftMargin - rightMargin
     
-    cellWidth: gridView.effectiveContentWidth / Math.min(Math.floor(effectiveContentWidth / (Kirigami.Units.iconSizes.large + Kirigami.Units.gridUnit * 2)), 8)
+    cellWidth: gridView.effectiveContentWidth / Math.min(Math.floor(effectiveContentWidth / (Kirigami.Units.iconSizes.large + Kirigami.Units.largeSpacing * 2)), 8)
     cellHeight: cellWidth + reservedSpaceForLabel
 
     property int columns: Math.floor(effectiveContentWidth / cellWidth)
diff --git a/initialstart/modules/cellular/package/contents/ui/main.qml b/initialstart/modules/cellular/package/contents/ui/main.qml
index 29d1aca5..67324ad3 100644
--- a/initialstart/modules/cellular/package/contents/ui/main.qml
+++ b/initialstart/modules/cellular/package/contents/ui/main.qml
@@ -33,7 +33,7 @@ Item {
         anchors {
             fill: parent
             topMargin: Kirigami.Units.gridUnit
-            bottomMargin: Kirigami.Units.gridUnit
+            bottomMargin: Kirigami.Units.largeSpacing
         }
         width: root.width
         spacing: Kirigami.Units.gridUnit
diff --git a/initialstart/modules/time/package/contents/ui/main.qml b/initialstart/modules/time/package/contents/ui/main.qml
index ef1fbca5..d44d68fc 100644
--- a/initialstart/modules/time/package/contents/ui/main.qml
+++ b/initialstart/modules/time/package/contents/ui/main.qml
@@ -19,7 +19,7 @@ Item {
         anchors {
             fill: parent
             topMargin: Kirigami.Units.gridUnit
-            bottomMargin: Kirigami.Units.gridUnit
+            bottomMargin: Kirigami.Units.largeSpacing
         }
 
         width: root.width
@@ -71,10 +71,10 @@ Item {
 
                 header: Control {
                     width: listView.width
-                    leftPadding: Kirigami.Units.gridUnit
-                    rightPadding: Kirigami.Units.gridUnit
-                    topPadding: Kirigami.Units.gridUnit
-                    bottomPadding: Kirigami.Units.gridUnit
+                    leftPadding: Kirigami.Units.largeSpacing
+                    rightPadding: Kirigami.Units.largeSpacing
+                    topPadding: Kirigami.Units.largeSpacing
+                    bottomPadding: Kirigami.Units.largeSpacing
 
                     contentItem: Kirigami.SearchField {
                         id: searchField
diff --git a/initialstart/modules/wifi/package/contents/ui/ConnectDialog.qml b/initialstart/modules/wifi/package/contents/ui/ConnectDialog.qml
index e5c376de..5947abff 100644
--- a/initialstart/modules/wifi/package/contents/ui/ConnectDialog.qml
+++ b/initialstart/modules/wifi/package/contents/ui/ConnectDialog.qml
@@ -43,7 +43,7 @@ Kirigami.PromptDialog {
 
     ColumnLayout {
         id: column
-        spacing: Kirigami.Units.gridUnit
+        spacing: Kirigami.Units.largeSpacing
 
         PasswordField {
             id: passwordField
diff --git a/initialstart/modules/wifi/package/contents/ui/ConnectionItemDelegate.qml b/initialstart/modules/wifi/package/contents/ui/ConnectionItemDelegate.qml
index e6653f86..5ff657ef 100644
--- a/initialstart/modules/wifi/package/contents/ui/ConnectionItemDelegate.qml
+++ b/initialstart/modules/wifi/package/contents/ui/ConnectionItemDelegate.qml
@@ -47,7 +47,7 @@ FormCard.AbstractFormDelegate {
     }
 
     contentItem: RowLayout {
-        spacing: Kirigami.Units.gridUnit
+        spacing: Kirigami.Units.largeSpacing
 
         Item {
             Layout.preferredWidth: Kirigami.Units.gridUnit
diff --git a/initialstart/modules/wifi/package/contents/ui/main.qml b/initialstart/modules/wifi/package/contents/ui/main.qml
index 0589de4d..32b3bb76 100644
--- a/initialstart/modules/wifi/package/contents/ui/main.qml
+++ b/initialstart/modules/wifi/package/contents/ui/main.qml
@@ -53,7 +53,7 @@ Item {
     ColumnLayout {
         anchors.fill: parent
         anchors.topMargin: Kirigami.Units.gridUnit
-        anchors.bottomMargin: Kirigami.Units.gridUnit
+        anchors.bottomMargin: Kirigami.Units.largeSpacing
         width: root.width
         spacing: Kirigami.Units.gridUnit
 
diff --git a/initialstart/qml/LandingComponent.qml b/initialstart/qml/LandingComponent.qml
index b7745f0b..0abb2911 100644
--- a/initialstart/qml/LandingComponent.qml
+++ b/initialstart/qml/LandingComponent.qml
@@ -70,7 +70,7 @@ Item {
 
     ColumnLayout {
         opacity: root.contentOpacity
-        spacing: Kirigami.Units.gridUnit
+        spacing: Kirigami.Units.largeSpacing
 
         anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
diff --git a/initialstart/qml/Wizard.qml b/initialstart/qml/Wizard.qml
index 6ace5131..363dc813 100644
--- a/initialstart/qml/Wizard.qml
+++ b/initialstart/qml/Wizard.qml
@@ -290,8 +290,8 @@ Kirigami.Page {
 
                     topPadding: Kirigami.Units.largeSpacing
                     bottomPadding: Kirigami.Units.largeSpacing
-                    leftPadding: Kirigami.Units.largeSpacing
-                    rightPadding: Kirigami.Units.largeSpacing
+                    leftPadding: Kirigami.Units.gridUnit
+                    rightPadding: Kirigami.Units.gridUnit
 
                     text: i18n("Back")
                     icon.name: "arrow-left"
@@ -308,8 +308,8 @@ Kirigami.Page {
 
                     topPadding: Kirigami.Units.largeSpacing
                     bottomPadding: Kirigami.Units.largeSpacing
-                    leftPadding: Kirigami.Units.largeSpacing
-                    rightPadding: Kirigami.Units.largeSpacing
+                    leftPadding: Kirigami.Units.gridUnit
+                    rightPadding: Kirigami.Units.gridUnit
 
                     visible: !root.onFinalPage
                     text: i18n("Next")
@@ -325,8 +325,8 @@ Kirigami.Page {
 
                     topPadding: Kirigami.Units.largeSpacing
                     bottomPadding: Kirigami.Units.largeSpacing
-                    leftPadding: Kirigami.Units.largeSpacing
-                    rightPadding: Kirigami.Units.largeSpacing
+                    leftPadding: Kirigami.Units.gridUnit
+                    rightPadding: Kirigami.Units.gridUnit
 
                     visible: root.onFinalPage
                     text: i18n("Finish")
diff --git a/kcms/cellularnetwork/ui/AvailableNetworks.qml b/kcms/cellularnetwork/ui/AvailableNetworks.qml
index 790723bf..5c5d3170 100644
--- a/kcms/cellularnetwork/ui/AvailableNetworks.qml
+++ b/kcms/cellularnetwork/ui/AvailableNetworks.qml
@@ -25,7 +25,7 @@ Kirigami.ScrollablePage {
             MessagesList {
                 visible: count != 0
                 Layout.fillWidth: true
-                Layout.margins: Kirigami.Units.gridUnit
+                Layout.margins: Kirigami.Units.largeSpacing
                 model: kcm.messages
             }
         }
diff --git a/kcms/cellularnetwork/ui/MessagesList.qml b/kcms/cellularnetwork/ui/MessagesList.qml
index 31a3d509..a77487c4 100644
--- a/kcms/cellularnetwork/ui/MessagesList.qml
+++ b/kcms/cellularnetwork/ui/MessagesList.qml
@@ -23,7 +23,7 @@ ColumnLayout {
         model: root.model
         
         delegate: Kirigami.InlineMessage {
-            Layout.bottomMargin: Kirigami.Units.gridUnit
+            Layout.bottomMargin: Kirigami.Units.largeSpacing
             Layout.fillWidth: true
             visible: true
             text: modelData.message
diff --git a/kcms/cellularnetwork/ui/PopupDialog.qml b/kcms/cellularnetwork/ui/PopupDialog.qml
index 7a414716..4045b2df 100644
--- a/kcms/cellularnetwork/ui/PopupDialog.qml
+++ b/kcms/cellularnetwork/ui/PopupDialog.qml
@@ -29,7 +29,7 @@ Controls.Dialog {
     
     header: Item {
         transform: Translate { y: dialog.translateY }
-        implicitHeight: heading.implicitHeight + Kirigami.Units.gridUnit * 2
+        implicitHeight: heading.implicitHeight + Kirigami.Units.largeSpacing * 2
 
         Kirigami.Heading {
             id: heading
@@ -38,7 +38,7 @@ Controls.Dialog {
             elide: Text.ElideRight
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.leftMargin: Kirigami.Units.gridUnit
+            anchors.leftMargin: Kirigami.Units.largeSpacing
             anchors.verticalCenter: parent.verticalCenter
             
             // use tooltip for long text that is elided
diff --git a/kcms/cellularnetwork/ui/ProfileList.qml b/kcms/cellularnetwork/ui/ProfileList.qml
index 95a21747..68a247ee 100644
--- a/kcms/cellularnetwork/ui/ProfileList.qml
+++ b/kcms/cellularnetwork/ui/ProfileList.qml
@@ -21,7 +21,7 @@ Kirigami.ScrollablePage {
             anchors.centerIn: parent
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.margins: Kirigami.Units.gridUnit
+            anchors.margins: Kirigami.Units.largeSpacing
             visible: profileListView.count === 0
             text: i18n("No APNs configured")
             icon.name: "globe"
@@ -52,14 +52,14 @@ Kirigami.ScrollablePage {
                 id: messagesList
                 visible: count != 0
                 Layout.fillWidth: true
-                Layout.margins: Kirigami.Units.gridUnit
+                Layout.margins: Kirigami.Units.largeSpacing
                 model: kcm.messages
             }
             
             Kirigami.InlineMessage {
                 id: cannotFindWarning
-                Layout.margins: visible ? Kirigami.Units.gridUnit : 0
-                Layout.topMargin: visible && !messagesList.visible ? Kirigami.Units.gridUnit : 0
+                Layout.margins: visible ? Kirigami.Units.largeSpacing : 0
+                Layout.topMargin: visible && !messagesList.visible ? Kirigami.Units.largeSpacing : 0
                 Layout.fillWidth: true
                 
                 visible: false
diff --git a/kcms/cellularnetwork/ui/SimLockPage.qml b/kcms/cellularnetwork/ui/SimLockPage.qml
index 2ab87b82..a67801b8 100644
--- a/kcms/cellularnetwork/ui/SimLockPage.qml
+++ b/kcms/cellularnetwork/ui/SimLockPage.qml
@@ -81,8 +81,8 @@ FormCard.FormCardPage {
         }
 
         Kirigami.Separator {
-            Layout.leftMargin: Kirigami.Units.gridUnit
-            Layout.rightMargin: Kirigami.Units.gridUnit
+            Layout.leftMargin: Kirigami.Units.largeSpacing
+            Layout.rightMargin: Kirigami.Units.largeSpacing
             opacity: (!disableSimLockButton.controlHovered && !changePinButton.controlHovered) ? 0.5 : 0
         }
 
@@ -105,7 +105,7 @@ FormCard.FormCardPage {
             id: unlockPinDialog
             title: i18n("Unlock SIM")
             standardButtons: Controls.Dialog.Ok | Controls.Dialog.Cancel
-            padding: Kirigami.Units.gridUnit
+            padding: Kirigami.Units.largeSpacing
 
             onAccepted: sim.sendPin(unlockPinCurPin.text)
 
@@ -125,7 +125,7 @@ FormCard.FormCardPage {
             id: changePinDialog
             title: i18n("Change SIM PIN")
             standardButtons: isValid ? Controls.Dialog.Ok | Controls.Dialog.Cancel : Controls.Dialog.Cancel
-            padding: Kirigami.Units.gridUnit
+            padding: Kirigami.Units.largeSpacing
 
             property bool isValid: changePinNewPin.text == changePinConfirmPin.text &&
                                    changePinNewPin.text.length >= 4 && changePinNewPin.text.length <= 8 // SIM PINs are between 4-8 digits
@@ -173,7 +173,7 @@ FormCard.FormCardPage {
             id: removePinDialog
             title: i18n("Remove SIM PIN")
             standardButtons: Controls.Dialog.Ok | Controls.Dialog.Cancel
-            padding: Kirigami.Units.gridUnit
+            padding: Kirigami.Units.largeSpacing
 
             onAccepted: sim.togglePinEnabled(removePinCurPin.text);
 
@@ -190,7 +190,7 @@ FormCard.FormCardPage {
             id: createPinDialog
             title: i18n("Add SIM PIN")
             standardButtons: isValid ? Controls.Dialog.Ok | Controls.Dialog.Cancel : Controls.Dialog.Cancel
-            padding: Kirigami.Units.gridUnit
+            padding: Kirigami.Units.largeSpacing
 
             property bool isValid: createPinNewPin.text == createPinConfirmPin.text &&
                                    createPinNewPin.text.length >= 4 && createPinNewPin.text.length <= 8 // SIM PINs are between 4-8 digits
diff --git a/kcms/cellularnetwork/ui/main.qml b/kcms/cellularnetwork/ui/main.qml
index 727fab41..4c15f5b3 100644
--- a/kcms/cellularnetwork/ui/main.qml
+++ b/kcms/cellularnetwork/ui/main.qml
@@ -59,7 +59,7 @@ KCM.SimpleKCM {
 
         MessagesList {
             Layout.fillWidth: true
-            Layout.margins: Kirigami.Units.gridUnit
+            Layout.margins: Kirigami.Units.largeSpacing
             model: kcm.messages
         }
 
diff --git a/kcms/hotspot/ui/main.qml b/kcms/hotspot/ui/main.qml
index 93a13f86..7e849695 100644
--- a/kcms/hotspot/ui/main.qml
+++ b/kcms/hotspot/ui/main.qml
@@ -53,8 +53,8 @@ SimpleKCM {
         }
 
         FormCard.FormCard {
-            Layout.topMargin: Kirigami.Units.gridUnit
-            Layout.bottomMargin: Kirigami.Units.gridUnit
+            Layout.topMargin: Kirigami.Units.largeSpacing
+            Layout.bottomMargin: Kirigami.Units.largeSpacing
 
             FormCard.FormTextFieldDelegate {
                 label: i18n("Hotspot SSID")
diff --git a/kcms/mobileshell/ui/QuickSettingsForm.qml b/kcms/mobileshell/ui/QuickSettingsForm.qml
index 0c9ba7f1..bcd6c313 100644
--- a/kcms/mobileshell/ui/QuickSettingsForm.qml
+++ b/kcms/mobileshell/ui/QuickSettingsForm.qml
@@ -28,7 +28,7 @@ FormCard.FormCardPage {
         contentItem: RowLayout {
             Kirigami.ListItemDragHandle {
                 visible: qsDelegate.isEnabled
-                Layout.rightMargin: Kirigami.Units.gridUnit
+                Layout.rightMargin: Kirigami.Units.largeSpacing
                 listItem: qsDelegate
                 listView: qsDelegate.ListView.view
                 onMoveRequested: savedQuickSettings.enabledModel.moveRow(oldIndex, newIndex)
diff --git a/kcms/powermanagement/ui/main.qml b/kcms/powermanagement/ui/main.qml
index 8b32d6ba..c0d0f4aa 100644
--- a/kcms/powermanagement/ui/main.qml
+++ b/kcms/powermanagement/ui/main.qml
@@ -48,7 +48,7 @@ SimpleKCM {
                         Kirigami.Icon {
                             implicitWidth: Kirigami.Units.iconSizes.smallMedium
                             implicitHeight: Kirigami.Units.iconSizes.smallMedium
-                            Layout.rightMargin: Kirigami.Units.gridUnit
+                            Layout.rightMargin: Kirigami.Units.largeSpacing
                             source: {
                                 switch (model.battery.type) {
                                     case 3: return model.battery.chargeState === 1 ? "battery-full-charging" : "battery-full"
diff --git a/kcms/virtualkeyboard/ui/main.qml b/kcms/virtualkeyboard/ui/main.qml
index 6fe95ee1..0333f499 100644
--- a/kcms/virtualkeyboard/ui/main.qml
+++ b/kcms/virtualkeyboard/ui/main.qml
@@ -29,7 +29,7 @@ KCM.SimpleKCM {
         width: parent.width
 
         FormCard.FormCard {
-            Layout.topMargin: Kirigami.Units.gridUnit
+            Layout.topMargin: Kirigami.Units.largeSpacing
 
             FormCard.FormTextFieldDelegate {
                 label: i18n("Type anything here…")
diff --git a/kcms/wifi/ui/ConnectDialog.qml b/kcms/wifi/ui/ConnectDialog.qml
index b8e2edda..a7f7ca9f 100644
--- a/kcms/wifi/ui/ConnectDialog.qml
+++ b/kcms/wifi/ui/ConnectDialog.qml
@@ -103,7 +103,7 @@ Controls.Dialog {
     
     header: Item {
         transform: Translate { y: dialogRoot.translateY }
-        implicitHeight: heading.implicitHeight + Kirigami.Units.gridUnit * 2
+        implicitHeight: heading.implicitHeight + Kirigami.Units.largeSpacing * 2
 
         Kirigami.Heading {
             id: heading
@@ -112,7 +112,7 @@ Controls.Dialog {
             wrapMode: Text.WordWrap
             anchors.left: parent.left
             anchors.right: parent.right
-            anchors.leftMargin: Kirigami.Units.gridUnit
+            anchors.leftMargin: Kirigami.Units.largeSpacing
             anchors.verticalCenter: parent.verticalCenter
         }
     }
@@ -122,7 +122,7 @@ Controls.Dialog {
     ColumnLayout {
         id: column
         transform: Translate { y: dialogRoot.translateY }
-        spacing: Kirigami.Units.gridUnit
+        spacing: Kirigami.Units.largeSpacing
         
         PasswordField {
             id: passwordField
diff --git a/kcms/wifi/ui/ConnectionItemDelegate.qml b/kcms/wifi/ui/ConnectionItemDelegate.qml
index 35675242..1e93b838 100644
--- a/kcms/wifi/ui/ConnectionItemDelegate.qml
+++ b/kcms/wifi/ui/ConnectionItemDelegate.qml
@@ -23,8 +23,8 @@ Kirigami.SwipeListItem {
                                                      SecurityType == PlasmaNM.Enums.SAE)
 
     RowLayout {
-        anchors.leftMargin: Kirigami.Units.gridUnit * 5
-        spacing: Kirigami.Units.gridUnit
+        anchors.leftMargin: Kirigami.Units.largeSpacing * 5
+        spacing: Kirigami.Units.largeSpacing
         Kirigami.Separator {}
 
         Item {
diff --git a/kcms/wifi/ui/main.qml b/kcms/wifi/ui/main.qml
index 002785d2..258842c8 100644
--- a/kcms/wifi/ui/main.qml
+++ b/kcms/wifi/ui/main.qml
@@ -77,7 +77,7 @@ ScrollViewKCM {
 
         Kirigami.PlaceholderMessage {
             anchors.centerIn: parent
-            width: parent.width - (Kirigami.Units.gridUnit * 4)
+            width: parent.width - (Kirigami.Units.largeSpacing * 4)
             visible: !enabledConnections.wirelessEnabled
             text: i18n("Wi-Fi is disabled")
             icon.name: "network-wireless-disconnected"
diff --git a/lookandfeel/contents/lockscreen/LockScreen.qml b/lookandfeel/contents/lockscreen/LockScreen.qml
index 337c0286..370c4129 100644
--- a/lookandfeel/contents/lockscreen/LockScreen.qml
+++ b/lookandfeel/contents/lockscreen/LockScreen.qml
@@ -181,8 +181,8 @@ Item {
                     // info notification text
                     Label {
                         Layout.fillWidth: true
-                        Layout.rightMargin: Kirigami.Units.gridUnit
-                        Layout.leftMargin: Kirigami.Units.gridUnit
+                        Layout.rightMargin: Kirigami.Units.largeSpacing
+                        Layout.leftMargin: Kirigami.Units.largeSpacing
                         Layout.bottomMargin: Kirigami.Units.smallSpacing * 2
                         font.pointSize: 9
 
diff --git a/lookandfeel/contents/systemdialog/SystemDialog.qml b/lookandfeel/contents/systemdialog/SystemDialog.qml
index 78b06220..16ac278e 100644
--- a/lookandfeel/contents/systemdialog/SystemDialog.qml
+++ b/lookandfeel/contents/systemdialog/SystemDialog.qml
@@ -149,10 +149,10 @@ Item {
             contentItem: RowLayout {
                 Kirigami.Heading {
                     Layout.fillWidth: true
-                    Layout.topMargin: Kirigami.Units.gridUnit
-                    Layout.bottomMargin: Kirigami.Units.gridUnit
-                    Layout.leftMargin: Kirigami.Units.gridUnit
-                    Layout.rightMargin: Kirigami.Units.gridUnit
+                    Layout.topMargin: Kirigami.Units.largeSpacing
+                    Layout.bottomMargin: Kirigami.Units.largeSpacing
+                    Layout.leftMargin: Kirigami.Units.largeSpacing
+                    Layout.rightMargin: Kirigami.Units.largeSpacing
                     Layout.alignment: Qt.AlignVCenter
                     level: 2
                     text: root.mainText
@@ -184,8 +184,8 @@ Item {
                 Label {
                     id: subtitleLabel
                     Layout.fillWidth: true
-                    Layout.topMargin: Kirigami.Units.gridUnit
-                    Layout.bottomMargin: Kirigami.Units.gridUnit
+                    Layout.topMargin: Kirigami.Units.largeSpacing
+                    Layout.bottomMargin: Kirigami.Units.largeSpacing
                     Layout.leftMargin: Kirigami.Units.gridUnit * 3
                     Layout.rightMargin: Kirigami.Units.gridUnit * 3
                     visible: root.subtitle !== ""
diff --git a/lookandfeel/contents/systemdialog/private/MobileSystemDialogButton.qml b/lookandfeel/contents/systemdialog/private/MobileSystemDialogButton.qml
index d222f6e5..0cee3809 100644
--- a/lookandfeel/contents/systemdialog/private/MobileSystemDialogButton.qml
+++ b/lookandfeel/contents/systemdialog/private/MobileSystemDialogButton.qml
@@ -50,10 +50,10 @@ AbstractButton {
         }
     }
     
-    leftPadding: Kirigami.Units.gridUnit
-    rightPadding: Kirigami.Units.gridUnit
-    topPadding: Kirigami.Units.gridUnit
-    bottomPadding: Kirigami.Units.gridUnit
+    leftPadding: Kirigami.Units.largeSpacing
+    rightPadding: Kirigami.Units.largeSpacing
+    topPadding: Kirigami.Units.largeSpacing
+    bottomPadding: Kirigami.Units.largeSpacing
     
     contentItem: Item {
         implicitHeight: row.height + Kirigami.Units.smallSpacing
diff --git a/shell/contents/configuration/ConfigurationAppletPage.qml b/shell/contents/configuration/ConfigurationAppletPage.qml
index 612ca16f..fef0f8dd 100644
--- a/shell/contents/configuration/ConfigurationAppletPage.qml
+++ b/shell/contents/configuration/ConfigurationAppletPage.qml
@@ -31,7 +31,7 @@ Kirigami.ScrollablePage {
 
     implicitHeight: loader.height
 
-    padding: Kirigami.Units.gridUnit
+    padding: Kirigami.Units.largeSpacing
     bottomPadding: 0
 
     Loader {