diff --git a/components/SectionContainer.qml b/components/SectionContainer.qml
index 23767984..8bd256d3 100644
--- a/components/SectionContainer.qml
+++ b/components/SectionContainer.qml
@@ -12,7 +12,7 @@ StyledRect {
     property bool alignTop: false
 
     Layout.fillWidth: true
-    implicitHeight: contentColumn.implicitHeight + Tokens.padding.large * 2
+    implicitHeight: contentColumn.implicitHeight + Tokens.padding.extraLargeIncreased
 
     radius: Tokens.rounding.large
     color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : Colours.palette.m3surfaceContainerHigh
diff --git a/components/controls/CustomSpinBox.qml b/components/controls/CustomSpinBox.qml
index e3707112..b75272f6 100644
--- a/components/controls/CustomSpinBox.qml
+++ b/components/controls/CustomSpinBox.qml
@@ -89,7 +89,7 @@ RowLayout {
         color: Colours.palette.m3primary
 
         implicitWidth: implicitHeight
-        implicitHeight: upIcon.implicitHeight + Tokens.padding.extraSmall * 2
+        implicitHeight: upIcon.implicitHeight + Tokens.padding.small
 
         StateLayer {
             id: upState
@@ -124,7 +124,7 @@ RowLayout {
         color: Colours.palette.m3primary
 
         implicitWidth: implicitHeight
-        implicitHeight: downIcon.implicitHeight + Tokens.padding.extraSmall * 2
+        implicitHeight: downIcon.implicitHeight + Tokens.padding.small
 
         StateLayer {
             id: downState
diff --git a/components/controls/SpinBoxRow.qml b/components/controls/SpinBoxRow.qml
index e11d73b9..497bb75c 100644
--- a/components/controls/SpinBoxRow.qml
+++ b/components/controls/SpinBoxRow.qml
@@ -15,7 +15,7 @@ StyledRect {
     property var onValueModified: function (value) {}
 
     Layout.fillWidth: true
-    implicitHeight: row.implicitHeight + Tokens.padding.large * 2
+    implicitHeight: row.implicitHeight + Tokens.padding.extraLargeIncreased
     radius: Tokens.rounding.large
     color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
diff --git a/components/controls/SplitButtonRow.qml b/components/controls/SplitButtonRow.qml
index 81c26e93..7ba1654c 100644
--- a/components/controls/SplitButtonRow.qml
+++ b/components/controls/SplitButtonRow.qml
@@ -20,7 +20,7 @@ StyledRect {
     signal selected(item: MenuItem)
 
     Layout.fillWidth: true
-    implicitHeight: row.implicitHeight + Tokens.padding.large * 2
+    implicitHeight: row.implicitHeight + Tokens.padding.extraLargeIncreased
     radius: Tokens.rounding.large
     color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
diff --git a/components/controls/StyledInputField.qml b/components/controls/StyledInputField.qml
index 3c33f887..5bed09a4 100644
--- a/components/controls/StyledInputField.qml
+++ b/components/controls/StyledInputField.qml
@@ -21,7 +21,7 @@ Item {
     signal editingFinished
 
     implicitWidth: 70
-    implicitHeight: inputField.implicitHeight + Tokens.padding.extraSmall * 2
+    implicitHeight: inputField.implicitHeight + Tokens.padding.small
 
     StyledRect {
         id: container
diff --git a/components/controls/StyledSwitch.qml b/components/controls/StyledSwitch.qml
index b2a491cb..7215638d 100644
--- a/components/controls/StyledSwitch.qml
+++ b/components/controls/StyledSwitch.qml
@@ -18,7 +18,7 @@ Switch {
         color: root.checked ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHighest, root.cLayer)
 
         implicitWidth: implicitHeight * 1.7
-        implicitHeight: Tokens.font.size.normal + Tokens.padding.small * 2
+        implicitHeight: Tokens.font.size.normal + Tokens.padding.large
 
         StyledRect {
             readonly property real nonAnimWidth: root.pressed ? implicitHeight * 1.3 : implicitHeight
@@ -83,7 +83,7 @@ Switch {
 
                 anchors.centerIn: parent
                 width: height
-                height: parent.implicitHeight - Tokens.padding.extraSmall * 2
+                height: parent.implicitHeight - Tokens.padding.small
                 preferredRendererType: Shape.CurveRenderer
                 asynchronous: true
 
diff --git a/components/controls/SwitchRow.qml b/components/controls/SwitchRow.qml
index 42d4f16e..d502253d 100644
--- a/components/controls/SwitchRow.qml
+++ b/components/controls/SwitchRow.qml
@@ -13,7 +13,7 @@ StyledRect {
     signal toggled(checked: bool)
 
     Layout.fillWidth: true
-    implicitHeight: row.implicitHeight + Tokens.padding.large * 2
+    implicitHeight: row.implicitHeight + Tokens.padding.extraLargeIncreased
     radius: Tokens.rounding.large
     color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
diff --git a/components/controls/ToggleButton.qml b/components/controls/ToggleButton.qml
index ad525fb2..54208557 100644
--- a/components/controls/ToggleButton.qml
+++ b/components/controls/ToggleButton.qml
@@ -24,7 +24,7 @@ StyledRect {
 
     Component.onCompleted: hovered = toggleStateLayer.containsMouse
 
-    Layout.preferredWidth: implicitWidth + (toggleStateLayer.pressed ? Tokens.padding.medium * 2 : toggled ? Tokens.padding.extraSmall * 2 : 0)
+    Layout.preferredWidth: implicitWidth + (toggleStateLayer.pressed ? Tokens.padding.medium * 2 : toggled ? Tokens.padding.small : 0)
     implicitWidth: toggleBtnInner.implicitWidth + horizontalPadding * 2
     implicitHeight: toggleBtnIcon.implicitHeight + verticalPadding * 2
     radius: toggled || toggleStateLayer.pressed ? Tokens.rounding.medium : Math.min(width, height) / 2 * Math.min(1, Tokens.rounding.scale)
diff --git a/components/controls/Tooltip.qml b/components/controls/Tooltip.qml
index b0507074..d6b30843 100644
--- a/components/controls/Tooltip.qml
+++ b/components/controls/Tooltip.qml
@@ -117,7 +117,7 @@ Popup {
         id: tooltipRect
 
         implicitWidth: tooltipText.implicitWidth + Tokens.padding.medium * 2
-        implicitHeight: tooltipText.implicitHeight + Tokens.padding.small * 2
+        implicitHeight: tooltipText.implicitHeight + Tokens.padding.large
 
         color: Colours.palette.m3surfaceContainerHighest
         radius: Tokens.rounding.medium
diff --git a/components/filedialog/HeaderBar.qml b/components/filedialog/HeaderBar.qml
index f1d8d1f5..f4d2dc07 100644
--- a/components/filedialog/HeaderBar.qml
+++ b/components/filedialog/HeaderBar.qml
@@ -25,7 +25,7 @@ StyledRect {
 
         Item {
             implicitWidth: implicitHeight
-            implicitHeight: upIcon.implicitHeight + Tokens.padding.extraSmall * 2
+            implicitHeight: upIcon.implicitHeight + Tokens.padding.small
 
             StateLayer {
                 radius: Tokens.rounding.medium
@@ -84,7 +84,7 @@ StyledRect {
 
                         Item {
                             implicitWidth: homeIcon.implicitWidth + (homeIcon.active ? Tokens.padding.extraSmall : 0) + folderName.implicitWidth + Tokens.padding.medium * 2
-                            implicitHeight: folderName.implicitHeight + Tokens.padding.extraSmall * 2
+                            implicitHeight: folderName.implicitHeight + Tokens.padding.small
 
                             Loader {
                                 asynchronous: true
diff --git a/components/widgets/ExtraIndicator.qml b/components/widgets/ExtraIndicator.qml
index 0fe3a7e3..846a7226 100644
--- a/components/widgets/ExtraIndicator.qml
+++ b/components/widgets/ExtraIndicator.qml
@@ -14,7 +14,7 @@ StyledRect {
     radius: Tokens.rounding.medium
 
     implicitWidth: count.implicitWidth + Tokens.padding.medium * 2
-    implicitHeight: count.implicitHeight + Tokens.padding.extraSmall * 2
+    implicitHeight: count.implicitHeight + Tokens.padding.small
 
     opacity: extra > 0 ? 1 : 0
     scale: extra > 0 ? 1 : 0.5
diff --git a/modules/background/Background.qml b/modules/background/Background.qml
index e5591f5b..c361123f 100644
--- a/modules/background/Background.qml
+++ b/modules/background/Background.qml
@@ -57,8 +57,8 @@ Variants {
             asynchronous: true
             active: Config.background.desktopClock.enabled
 
-            anchors.margins: Tokens.padding.large * 2
-            anchors.leftMargin: Tokens.padding.large * 2 + Tokens.sizes.bar.innerWidth + Math.max(Tokens.padding.small, Config.border.thickness)
+            anchors.margins: Tokens.padding.extraLargeIncreased
+            anchors.leftMargin: Tokens.padding.extraLargeIncreased + Tokens.sizes.bar.innerWidth + Math.max(Tokens.padding.small, Config.border.thickness)
 
             state: Config.background.desktopClock.position
             states: [
diff --git a/modules/background/DesktopClock.qml b/modules/background/DesktopClock.qml
index 1f96a5ed..76bd2d5d 100644
--- a/modules/background/DesktopClock.qml
+++ b/modules/background/DesktopClock.qml
@@ -24,7 +24,7 @@ Item {
     readonly property color safeTertiary: useLightSet ? Colours.palette.m3tertiaryContainer : Colours.palette.m3tertiary
 
     implicitWidth: layout.implicitWidth + (Tokens.padding.large * 4 * root.clockScale)
-    implicitHeight: layout.implicitHeight + (Tokens.padding.large * 2 * root.clockScale)
+    implicitHeight: layout.implicitHeight + (Tokens.padding.extraLargeIncreased * root.clockScale)
 
     Item {
         id: clockContainer
diff --git a/modules/background/Wallpaper.qml b/modules/background/Wallpaper.qml
index 13aa4d65..411c573d 100644
--- a/modules/background/Wallpaper.qml
+++ b/modules/background/Wallpaper.qml
@@ -63,8 +63,8 @@ Item {
                     }
 
                     StyledRect {
-                        implicitWidth: selectWallText.implicitWidth + Tokens.padding.large * 2
-                        implicitHeight: selectWallText.implicitHeight + Tokens.padding.extraSmall * 2
+                        implicitWidth: selectWallText.implicitWidth + Tokens.padding.extraLargeIncreased
+                        implicitHeight: selectWallText.implicitHeight + Tokens.padding.small
 
                         radius: Tokens.rounding.full
                         color: Colours.palette.m3primary
diff --git a/modules/bar/components/Power.qml b/modules/bar/components/Power.qml
index b0ce9776..464fe819 100644
--- a/modules/bar/components/Power.qml
+++ b/modules/bar/components/Power.qml
@@ -8,7 +8,7 @@ Item {
 
     required property DrawerVisibilities visibilities
 
-    implicitWidth: icon.implicitHeight + Tokens.padding.extraSmall * 2
+    implicitWidth: icon.implicitHeight + Tokens.padding.small
     implicitHeight: icon.implicitHeight
 
     StateLayer {
@@ -16,7 +16,7 @@ Item {
         anchors.fill: undefined
         anchors.centerIn: parent
         implicitWidth: implicitHeight
-        implicitHeight: icon.implicitHeight + Tokens.padding.extraSmall * 2
+        implicitHeight: icon.implicitHeight + Tokens.padding.small
         radius: Tokens.rounding.full
         onClicked: root.visibilities.session = !root.visibilities.session
     }
diff --git a/modules/bar/components/Tray.qml b/modules/bar/components/Tray.qml
index 32b42546..ca62d96b 100644
--- a/modules/bar/components/Tray.qml
+++ b/modules/bar/components/Tray.qml
@@ -91,7 +91,7 @@ StyledRect {
 
         sourceComponent: Item {
             implicitWidth: expandIconInner.implicitWidth
-            implicitHeight: expandIconInner.implicitHeight - Tokens.padding.extraSmall * 2
+            implicitHeight: expandIconInner.implicitHeight - Tokens.padding.small
 
             MaterialIcon {
                 id: expandIconInner
diff --git a/modules/bar/components/workspaces/ActiveIndicator.qml b/modules/bar/components/workspaces/ActiveIndicator.qml
index 6806e01c..ad279498 100644
--- a/modules/bar/components/workspaces/ActiveIndicator.qml
+++ b/modules/bar/components/workspaces/ActiveIndicator.qml
@@ -44,7 +44,7 @@ StyledRect {
 
     clip: true
     y: offset + mask.y
-    implicitWidth: Tokens.sizes.bar.innerWidth - Tokens.padding.extraSmall * 2
+    implicitWidth: Tokens.sizes.bar.innerWidth - Tokens.padding.small
     implicitHeight: size
     radius: Tokens.rounding.full
     color: Colours.palette.m3primary
diff --git a/modules/bar/components/workspaces/OccupiedBg.qml b/modules/bar/components/workspaces/OccupiedBg.qml
index ec098493..d971940a 100644
--- a/modules/bar/components/workspaces/OccupiedBg.qml
+++ b/modules/bar/components/workspaces/OccupiedBg.qml
@@ -65,7 +65,7 @@ Item {
             anchors.horizontalCenter: root.horizontalCenter
 
             y: (start?.y ?? 0) - 1
-            implicitWidth: Tokens.sizes.bar.innerWidth - Tokens.padding.extraSmall * 2 + 2
+            implicitWidth: Tokens.sizes.bar.innerWidth - Tokens.padding.small + 2
             implicitHeight: start && end ? end.y + end.size - start.y + 2 : 0
 
             color: Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
diff --git a/modules/bar/components/workspaces/SpecialWorkspaces.qml b/modules/bar/components/workspaces/SpecialWorkspaces.qml
index 11607f73..ed224b61 100644
--- a/modules/bar/components/workspaces/SpecialWorkspaces.qml
+++ b/modules/bar/components/workspaces/SpecialWorkspaces.qml
@@ -284,7 +284,7 @@ Item {
             asynchronous: true
 
             Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-            Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.extraSmall * 2
+            Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.small
 
             sourceComponent: ws.icon.length === 1 ? letterComp : iconComp
 
diff --git a/modules/bar/components/workspaces/Workspace.qml b/modules/bar/components/workspaces/Workspace.qml
index d2212f89..51e54255 100644
--- a/modules/bar/components/workspaces/Workspace.qml
+++ b/modules/bar/components/workspaces/Workspace.qml
@@ -33,7 +33,7 @@ ColumnLayout {
         id: indicator
 
         Layout.alignment: Qt.AlignHCenter | Qt.AlignTop
-        Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.extraSmall * 2
+        Layout.preferredHeight: Tokens.sizes.bar.innerWidth - Tokens.padding.small
 
         animate: true
         text: {
diff --git a/modules/bar/components/workspaces/Workspaces.qml b/modules/bar/components/workspaces/Workspaces.qml
index 91b1a90b..62e46f8a 100644
--- a/modules/bar/components/workspaces/Workspaces.qml
+++ b/modules/bar/components/workspaces/Workspaces.qml
@@ -28,7 +28,7 @@ StyledClippingRect {
     property real blur: onSpecial ? 1 : 0
 
     implicitWidth: Tokens.sizes.bar.innerWidth
-    implicitHeight: layout.implicitHeight + Tokens.padding.extraSmall * 2
+    implicitHeight: layout.implicitHeight + Tokens.padding.small
 
     color: Colours.tPalette.m3surfaceContainer
     radius: Tokens.rounding.full
diff --git a/modules/bar/popouts/ActiveWindow.qml b/modules/bar/popouts/ActiveWindow.qml
index 8a376b7e..d5864b76 100644
--- a/modules/bar/popouts/ActiveWindow.qml
+++ b/modules/bar/popouts/ActiveWindow.qml
@@ -12,7 +12,7 @@ Item {
 
     required property PopoutState popouts
 
-    implicitWidth: Hypr.activeToplevel ? child.implicitWidth : -Tokens.padding.large * 2
+    implicitWidth: Hypr.activeToplevel ? child.implicitWidth : -Tokens.padding.extraLargeIncreased
     implicitHeight: child.implicitHeight
 
     Column {
@@ -59,8 +59,8 @@ Item {
             }
 
             Item {
-                implicitWidth: expandIcon.implicitHeight + Tokens.padding.extraSmall * 2
-                implicitHeight: expandIcon.implicitHeight + Tokens.padding.extraSmall * 2
+                implicitWidth: expandIcon.implicitHeight + Tokens.padding.small
+                implicitHeight: expandIcon.implicitHeight + Tokens.padding.small
 
                 Layout.alignment: Qt.AlignVCenter
 
diff --git a/modules/bar/popouts/Battery.qml b/modules/bar/popouts/Battery.qml
index 383b70bf..d15f6fa5 100644
--- a/modules/bar/popouts/Battery.qml
+++ b/modules/bar/popouts/Battery.qml
@@ -46,7 +46,7 @@ Column {
 
         sourceComponent: StyledRect {
             implicitWidth: child.implicitWidth + Tokens.padding.medium * 2
-            implicitHeight: child.implicitHeight + Tokens.padding.small * 2
+            implicitHeight: child.implicitHeight + Tokens.padding.large
 
             color: Colours.palette.m3error
             radius: Tokens.rounding.large
@@ -110,7 +110,7 @@ Column {
         anchors.horizontalCenter: parent.horizontalCenter
 
         implicitWidth: saver.implicitHeight + balance.implicitHeight + perf.implicitHeight + Tokens.padding.medium * 2 + Tokens.spacing.large * 2
-        implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + Tokens.padding.extraSmall * 2
+        implicitHeight: Math.max(saver.implicitHeight, balance.implicitHeight, perf.implicitHeight) + Tokens.padding.small
 
         color: Colours.tPalette.m3surfaceContainer
         radius: Tokens.rounding.full
@@ -199,8 +199,8 @@ Column {
         required property string icon
         required property int profile
 
-        implicitWidth: icon.implicitHeight + Tokens.padding.extraSmall * 2
-        implicitHeight: icon.implicitHeight + Tokens.padding.extraSmall * 2
+        implicitWidth: icon.implicitHeight + Tokens.padding.small
+        implicitHeight: icon.implicitHeight + Tokens.padding.small
 
         StateLayer {
             radius: Tokens.rounding.full
diff --git a/modules/bar/popouts/Content.qml b/modules/bar/popouts/Content.qml
index 42c5a766..4c9611cb 100644
--- a/modules/bar/popouts/Content.qml
+++ b/modules/bar/popouts/Content.qml
@@ -14,8 +14,8 @@ Item {
     readonly property Popout currentPopout: content.children.find(c => c.shouldBeActive) ?? null
     readonly property Item current: currentPopout?.item ?? null
 
-    implicitWidth: (currentPopout?.implicitWidth ?? 0) + Tokens.padding.large * 2
-    implicitHeight: (currentPopout?.implicitHeight ?? 0) + Tokens.padding.large * 2
+    implicitWidth: (currentPopout?.implicitWidth ?? 0) + Tokens.padding.extraLargeIncreased
+    implicitHeight: (currentPopout?.implicitHeight ?? 0) + Tokens.padding.extraLargeIncreased
 
     Item {
         id: content
diff --git a/modules/bar/popouts/Network.qml b/modules/bar/popouts/Network.qml
index 1ca23aae..0805e6bd 100644
--- a/modules/bar/popouts/Network.qml
+++ b/modules/bar/popouts/Network.qml
@@ -167,7 +167,7 @@ ColumnLayout {
         Layout.preferredHeight: visible ? implicitHeight : 0
         Layout.topMargin: visible ? Tokens.spacing.small : 0
         Layout.fillWidth: true
-        implicitHeight: rescanBtn.implicitHeight + Tokens.padding.extraSmall * 2
+        implicitHeight: rescanBtn.implicitHeight + Tokens.padding.small
 
         radius: Tokens.rounding.full
         color: Colours.palette.m3primaryContainer
@@ -209,7 +209,7 @@ ColumnLayout {
             anchors.centerIn: parent
             strokeWidth: Tokens.padding.extraSmall / 2
             bgColour: "transparent"
-            implicitSize: parent.implicitHeight - Tokens.padding.small * 2
+            implicitSize: parent.implicitHeight - Tokens.padding.large
             running: Nmcli.scanning
         }
     }
diff --git a/modules/bar/popouts/TrayMenu.qml b/modules/bar/popouts/TrayMenu.qml
index 54b93b49..7dc81b42 100644
--- a/modules/bar/popouts/TrayMenu.qml
+++ b/modules/bar/popouts/TrayMenu.qml
@@ -191,7 +191,7 @@ StackView {
                         anchors.fill: parent
                         anchors.margins: -Tokens.padding.extraSmall / 2
                         anchors.leftMargin: -Tokens.padding.small
-                        anchors.rightMargin: -Tokens.padding.small * 2
+                        anchors.rightMargin: -Tokens.padding.large
 
                         radius: Tokens.rounding.full
                         color: Colours.palette.m3secondaryContainer
diff --git a/modules/bar/popouts/WirelessPassword.qml b/modules/bar/popouts/WirelessPassword.qml
index 69ad5476..de1dd54b 100644
--- a/modules/bar/popouts/WirelessPassword.qml
+++ b/modules/bar/popouts/WirelessPassword.qml
@@ -71,7 +71,7 @@ ColumnLayout {
 
     spacing: Tokens.spacing.normal
     implicitWidth: 400
-    implicitHeight: content.implicitHeight + Tokens.padding.large * 2
+    implicitHeight: content.implicitHeight + Tokens.padding.extraLargeIncreased
     visible: shouldBeVisible || isClosing
     enabled: shouldBeVisible && !isClosing
     focus: enabled
@@ -128,7 +128,7 @@ ColumnLayout {
     StyledRect {
         Layout.fillWidth: true
         Layout.preferredWidth: 400
-        implicitHeight: content.implicitHeight + Tokens.padding.large * 2
+        implicitHeight: content.implicitHeight + Tokens.padding.extraLargeIncreased
         radius: Tokens.rounding.large
         color: Colours.tPalette.m3surfaceContainer
         visible: root.shouldBeVisible || root.isClosing
@@ -252,7 +252,7 @@ ColumnLayout {
                 font.pointSize: Tokens.font.size.small
                 font.weight: 400
                 wrapMode: Text.WordWrap
-                Layout.maximumWidth: parent.width - Tokens.padding.large * 2
+                Layout.maximumWidth: parent.width - Tokens.padding.extraLargeIncreased
             }
 
             FocusScope {
diff --git a/modules/bar/popouts/kblayout/KbLayout.qml b/modules/bar/popouts/kblayout/KbLayout.qml
index 5878d591..7ec78242 100644
--- a/modules/bar/popouts/kblayout/KbLayout.qml
+++ b/modules/bar/popouts/kblayout/KbLayout.qml
@@ -88,7 +88,7 @@ ColumnLayout {
             readonly property bool isDisabled: layoutIndex > 3
 
             width: list.width
-            height: Math.max(36, rowText.implicitHeight + Tokens.padding.extraSmall * 2)
+            height: Math.max(36, rowText.implicitHeight + Tokens.padding.small)
             ToolTip.visible: isDisabled && layer.containsMouse
             ToolTip.text: "XKB limitation: maximum 4 layouts allowed"
 
diff --git a/modules/controlcenter/NavRail.qml b/modules/controlcenter/NavRail.qml
index 4306710a..e1e79286 100644
--- a/modules/controlcenter/NavRail.qml
+++ b/modules/controlcenter/NavRail.qml
@@ -15,8 +15,8 @@ Item {
     required property Session session
     required property bool initialOpeningComplete
 
-    implicitWidth: layout.implicitWidth + Tokens.padding.medium * 4
-    implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
+    implicitWidth: layout.implicitWidth + Tokens.padding.extraExtraLarge
+    implicitHeight: layout.implicitHeight + Tokens.padding.extraLargeIncreased
 
     ColumnLayout {
         id: layout
diff --git a/modules/controlcenter/appearance/AppearancePane.qml b/modules/controlcenter/appearance/AppearancePane.qml
index a1e0e42c..058d48d2 100644
--- a/modules/controlcenter/appearance/AppearancePane.qml
+++ b/modules/controlcenter/appearance/AppearancePane.qml
@@ -120,7 +120,7 @@ Item {
 
                     Layout.fillWidth: true
                     Layout.fillHeight: true
-                    Layout.bottomMargin: -Tokens.padding.large * 2
+                    Layout.bottomMargin: -Tokens.padding.extraLargeIncreased
 
                     asynchronous: true
                     active: {
diff --git a/modules/controlcenter/bluetooth/Details.qml b/modules/controlcenter/bluetooth/Details.qml
index e5cedc67..2f94d195 100644
--- a/modules/controlcenter/bluetooth/Details.qml
+++ b/modules/controlcenter/bluetooth/Details.qml
@@ -70,7 +70,7 @@ StyledFlickable {
 
                         StyledRect {
                             Layout.fillWidth: true
-                            implicitHeight: deviceStatus.implicitHeight + Tokens.padding.large * 2
+                            implicitHeight: deviceStatus.implicitHeight + Tokens.padding.extraLargeIncreased
 
                             radius: Tokens.rounding.large
                             color: Colours.tPalette.m3surfaceContainer
@@ -129,7 +129,7 @@ StyledFlickable {
 
                         StyledRect {
                             Layout.fillWidth: true
-                            implicitHeight: deviceProps.implicitHeight + Tokens.padding.large * 2
+                            implicitHeight: deviceProps.implicitHeight + Tokens.padding.extraLargeIncreased
 
                             radius: Tokens.rounding.large
                             color: Colours.tPalette.m3surfaceContainer
@@ -231,7 +231,7 @@ StyledFlickable {
 
                                     StyledRect {
                                         implicitWidth: implicitHeight
-                                        implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.small * 2
+                                        implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.large
 
                                         radius: Tokens.rounding.medium
                                         color: Colours.palette.m3secondaryContainer
@@ -270,7 +270,7 @@ StyledFlickable {
 
                                     StyledRect {
                                         implicitWidth: implicitHeight
-                                        implicitHeight: editIcon.implicitHeight + Tokens.padding.small * 2
+                                        implicitHeight: editIcon.implicitHeight + Tokens.padding.large
 
                                         radius: root.session.bt.editingDeviceName ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
                                         color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingDeviceName ? 1 : 0)
@@ -335,7 +335,7 @@ StyledFlickable {
 
                         StyledRect {
                             Layout.fillWidth: true
-                            implicitHeight: deviceInfo.implicitHeight + Tokens.padding.large * 2
+                            implicitHeight: deviceInfo.implicitHeight + Tokens.padding.extraLargeIncreased
 
                             radius: Tokens.rounding.large
                             color: Colours.tPalette.m3surfaceContainer
@@ -479,7 +479,7 @@ StyledFlickable {
                     when: root.session.bt.fabMenuOpen
 
                     PropertyChanges {
-                        fabMenuItem.implicitWidth: fabMenuItemInner.implicitWidth + root.Tokens.padding.large * 2
+                        fabMenuItem.implicitWidth: fabMenuItemInner.implicitWidth + root.Tokens.padding.extraLargeIncreased
                         fabMenuItem.opacity: 1
                         fabMenuItemInner.opacity: 1
                     }
diff --git a/modules/controlcenter/bluetooth/DeviceList.qml b/modules/controlcenter/bluetooth/DeviceList.qml
index ca86dd55..96e8f323 100644
--- a/modules/controlcenter/bluetooth/DeviceList.qml
+++ b/modules/controlcenter/bluetooth/DeviceList.qml
@@ -211,7 +211,7 @@ DeviceList {
                     id: connectBtn
 
                     implicitWidth: implicitHeight
-                    implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2
+                    implicitHeight: connectIcon.implicitHeight + Tokens.padding.large
 
                     radius: Tokens.rounding.full
                     color: Qt.alpha(Colours.palette.m3primaryContainer, device.connected ? 1 : 0)
diff --git a/modules/controlcenter/bluetooth/Settings.qml b/modules/controlcenter/bluetooth/Settings.qml
index 52de87ee..4c0d2c43 100644
--- a/modules/controlcenter/bluetooth/Settings.qml
+++ b/modules/controlcenter/bluetooth/Settings.qml
@@ -37,7 +37,7 @@ ColumnLayout {
 
     StyledRect {
         Layout.fillWidth: true
-        implicitHeight: adapterStatus.implicitHeight + Tokens.padding.large * 2
+        implicitHeight: adapterStatus.implicitHeight + Tokens.padding.extraLargeIncreased
 
         radius: Tokens.rounding.large
         color: Colours.tPalette.m3surfaceContainer
@@ -98,7 +98,7 @@ ColumnLayout {
 
     StyledRect {
         Layout.fillWidth: true
-        implicitHeight: adapterSettings.implicitHeight + Tokens.padding.large * 2
+        implicitHeight: adapterSettings.implicitHeight + Tokens.padding.extraLargeIncreased
 
         radius: Tokens.rounding.large
         color: Colours.tPalette.m3surfaceContainer
@@ -128,7 +128,7 @@ ColumnLayout {
                     property bool expanded
 
                     implicitWidth: adapterPicker.implicitWidth + Tokens.padding.medium * 2
-                    implicitHeight: adapterPicker.implicitHeight + Tokens.padding.small * 2
+                    implicitHeight: adapterPicker.implicitHeight + Tokens.padding.large
 
                     StateLayer {
                         onClicked: {
@@ -368,7 +368,7 @@ ColumnLayout {
 
                 StyledRect {
                     implicitWidth: implicitHeight
-                    implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.small * 2
+                    implicitHeight: cancelEditIcon.implicitHeight + Tokens.padding.large
 
                     radius: Tokens.rounding.medium
                     color: Colours.palette.m3secondaryContainer
@@ -407,7 +407,7 @@ ColumnLayout {
 
                 StyledRect {
                     implicitWidth: implicitHeight
-                    implicitHeight: editIcon.implicitHeight + Tokens.padding.small * 2
+                    implicitHeight: editIcon.implicitHeight + Tokens.padding.large
 
                     radius: root.session.bt.editingAdapterName ? Tokens.rounding.medium : implicitHeight / 2 * Math.min(1, Tokens.rounding.scale)
                     color: Qt.alpha(Colours.palette.m3primary, root.session.bt.editingAdapterName ? 1 : 0)
@@ -455,7 +455,7 @@ ColumnLayout {
 
     StyledRect {
         Layout.fillWidth: true
-        implicitHeight: adapterInfo.implicitHeight + Tokens.padding.large * 2
+        implicitHeight: adapterInfo.implicitHeight + Tokens.padding.extraLargeIncreased
 
         radius: Tokens.rounding.large
         color: Colours.tPalette.m3surfaceContainer
diff --git a/modules/controlcenter/components/ConnectedButtonGroup.qml b/modules/controlcenter/components/ConnectedButtonGroup.qml
index 3f2f0e3d..1bcc072d 100644
--- a/modules/controlcenter/components/ConnectedButtonGroup.qml
+++ b/modules/controlcenter/components/ConnectedButtonGroup.qml
@@ -16,7 +16,7 @@ StyledRect {
     property int rows: 1 // Number of rows
 
     Layout.fillWidth: true
-    implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
+    implicitHeight: layout.implicitHeight + Tokens.padding.extraLargeIncreased
     radius: Tokens.rounding.large
     color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
     clip: true
diff --git a/modules/controlcenter/components/SplitPaneLayout.qml b/modules/controlcenter/components/SplitPaneLayout.qml
index 905aaf97..8cf23d5c 100644
--- a/modules/controlcenter/components/SplitPaneLayout.qml
+++ b/modules/controlcenter/components/SplitPaneLayout.qml
@@ -87,7 +87,7 @@ RowLayout {
                 id: rightLoader
 
                 anchors.fill: parent
-                anchors.margins: Tokens.padding.large * 2
+                anchors.margins: Tokens.padding.extraLargeIncreased
 
                 asynchronous: true
                 sourceComponent: root.rightContent
diff --git a/modules/controlcenter/launcher/LauncherPane.qml b/modules/controlcenter/launcher/LauncherPane.qml
index 94d05442..6a43684e 100644
--- a/modules/controlcenter/launcher/LauncherPane.qml
+++ b/modules/controlcenter/launcher/LauncherPane.qml
@@ -520,9 +520,9 @@ Item {
             spacing: Tokens.spacing.normal
 
             SettingsHeader {
-                Layout.leftMargin: Tokens.padding.large * 2
-                Layout.rightMargin: Tokens.padding.large * 2
-                Layout.topMargin: Tokens.padding.large * 2
+                Layout.leftMargin: Tokens.padding.extraLargeIncreased
+                Layout.rightMargin: Tokens.padding.extraLargeIncreased
+                Layout.topMargin: Tokens.padding.extraLargeIncreased
                 visible: displayedApp === null
                 icon: "apps"
                 title: qsTr("Launcher Applications")
@@ -530,9 +530,9 @@ Item {
 
             Item {
                 Layout.alignment: Qt.AlignHCenter
-                Layout.leftMargin: Tokens.padding.large * 2
-                Layout.rightMargin: Tokens.padding.large * 2
-                Layout.topMargin: Tokens.padding.large * 2
+                Layout.leftMargin: Tokens.padding.extraLargeIncreased
+                Layout.rightMargin: Tokens.padding.extraLargeIncreased
+                Layout.topMargin: Tokens.padding.extraLargeIncreased
                 visible: displayedApp !== null
                 implicitWidth: Math.max(appIconImage.implicitWidth, appTitleText.implicitWidth)
                 implicitHeight: appIconImage.implicitHeight + Tokens.spacing.normal + appTitleText.implicitHeight
@@ -574,8 +574,8 @@ Item {
                 Layout.fillWidth: true
                 Layout.fillHeight: true
                 Layout.topMargin: Tokens.spacing.large
-                Layout.leftMargin: Tokens.padding.large * 2
-                Layout.rightMargin: Tokens.padding.large * 2
+                Layout.leftMargin: Tokens.padding.extraLargeIncreased
+                Layout.rightMargin: Tokens.padding.extraLargeIncreased
 
                 StyledFlickable {
                     id: detailsFlickable
diff --git a/modules/controlcenter/network/EthernetList.qml b/modules/controlcenter/network/EthernetList.qml
index 50ede0df..dba39ecc 100644
--- a/modules/controlcenter/network/EthernetList.qml
+++ b/modules/controlcenter/network/EthernetList.qml
@@ -141,7 +141,7 @@ DeviceList {
                     id: connectBtn
 
                     implicitWidth: implicitHeight
-                    implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2
+                    implicitHeight: connectIcon.implicitHeight + Tokens.padding.large
 
                     radius: Tokens.rounding.full
                     color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.connected ? 1 : 0)
diff --git a/modules/controlcenter/network/EthernetSettings.qml b/modules/controlcenter/network/EthernetSettings.qml
index 0ffd3b2b..aa7e3774 100644
--- a/modules/controlcenter/network/EthernetSettings.qml
+++ b/modules/controlcenter/network/EthernetSettings.qml
@@ -36,7 +36,7 @@ ColumnLayout {
 
     StyledRect {
         Layout.fillWidth: true
-        implicitHeight: ethernetInfo.implicitHeight + Tokens.padding.large * 2
+        implicitHeight: ethernetInfo.implicitHeight + Tokens.padding.extraLargeIncreased
 
         radius: Tokens.rounding.large
         color: Colours.tPalette.m3surfaceContainer
diff --git a/modules/controlcenter/network/NetworkSettings.qml b/modules/controlcenter/network/NetworkSettings.qml
index d41d88d5..82839122 100644
--- a/modules/controlcenter/network/NetworkSettings.qml
+++ b/modules/controlcenter/network/NetworkSettings.qml
@@ -140,8 +140,8 @@ ColumnLayout {
 
         parent: Overlay.overlay
         anchors.centerIn: parent
-        width: Math.min(600, parent.width - Tokens.padding.large * 2)
-        height: Math.min(700, parent.height - Tokens.padding.large * 2)
+        width: Math.min(600, parent.width - Tokens.padding.extraLargeIncreased)
+        height: Math.min(700, parent.height - Tokens.padding.extraLargeIncreased)
 
         modal: true
         closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
diff --git a/modules/controlcenter/network/VpnDetails.qml b/modules/controlcenter/network/VpnDetails.qml
index b86a8839..01843097 100644
--- a/modules/controlcenter/network/VpnDetails.qml
+++ b/modules/controlcenter/network/VpnDetails.qml
@@ -260,7 +260,7 @@ DeviceDetails {
 
         parent: Overlay.overlay
         anchors.centerIn: parent
-        width: Math.min(400, parent.width - Tokens.padding.large * 2)
+        width: Math.min(400, parent.width - Tokens.padding.extraLargeIncreased)
         padding: Tokens.padding.large * 1.5
 
         modal: true
diff --git a/modules/controlcenter/network/VpnList.qml b/modules/controlcenter/network/VpnList.qml
index 940c2bc6..12f56480 100644
--- a/modules/controlcenter/network/VpnList.qml
+++ b/modules/controlcenter/network/VpnList.qml
@@ -205,7 +205,7 @@ ColumnLayout {
 
                     StyledRect {
                         implicitWidth: implicitHeight
-                        implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2
+                        implicitHeight: connectIcon.implicitHeight + Tokens.padding.large
 
                         radius: Tokens.rounding.full
                         color: Qt.alpha(Colours.palette.m3primaryContainer, VPN.connected && modelData.enabled ? 1 : 0)
@@ -265,7 +265,7 @@ ColumnLayout {
 
                     StyledRect {
                         implicitWidth: implicitHeight
-                        implicitHeight: deleteIcon.implicitHeight + Tokens.padding.small * 2
+                        implicitHeight: deleteIcon.implicitHeight + Tokens.padding.large
 
                         radius: Tokens.rounding.full
                         color: "transparent"
@@ -363,7 +363,7 @@ ColumnLayout {
         parent: Overlay.overlay
         x: Math.round((parent.width - width) / 2)
         y: Math.round((parent.height - height) / 2)
-        implicitWidth: Math.min(400, parent.width - Tokens.padding.large * 2)
+        implicitWidth: Math.min(400, parent.width - Tokens.padding.extraLargeIncreased)
         padding: Tokens.padding.large * 1.5
 
         modal: true
diff --git a/modules/controlcenter/network/WirelessList.qml b/modules/controlcenter/network/WirelessList.qml
index eba49a85..8dcb7930 100644
--- a/modules/controlcenter/network/WirelessList.qml
+++ b/modules/controlcenter/network/WirelessList.qml
@@ -191,7 +191,7 @@ DeviceList {
 
                 StyledRect {
                     implicitWidth: implicitHeight
-                    implicitHeight: connectIcon.implicitHeight + Tokens.padding.small * 2
+                    implicitHeight: connectIcon.implicitHeight + Tokens.padding.large
 
                     radius: Tokens.rounding.full
                     color: Qt.alpha(Colours.palette.m3primaryContainer, modelData.active ? 1 : 0)
diff --git a/modules/controlcenter/network/WirelessPasswordDialog.qml b/modules/controlcenter/network/WirelessPasswordDialog.qml
index 027323c6..1d323dda 100644
--- a/modules/controlcenter/network/WirelessPasswordDialog.qml
+++ b/modules/controlcenter/network/WirelessPasswordDialog.qml
@@ -99,7 +99,7 @@ Item {
         anchors.centerIn: parent
 
         implicitWidth: 400
-        implicitHeight: content.implicitHeight + Tokens.padding.large * 2
+        implicitHeight: content.implicitHeight + Tokens.padding.extraLargeIncreased
 
         radius: Tokens.rounding.large
         color: Colours.tPalette.m3surface
@@ -185,7 +185,7 @@ Item {
                 font.pointSize: Tokens.font.size.small
                 font.weight: 400
                 wrapMode: Text.WordWrap
-                Layout.maximumWidth: parent.width - Tokens.padding.large * 2
+                Layout.maximumWidth: parent.width - Tokens.padding.extraLargeIncreased
             }
 
             Item {
diff --git a/modules/controlcenter/taskbar/TaskbarPane.qml b/modules/controlcenter/taskbar/TaskbarPane.qml
index 0c4bec3c..687fdf66 100644
--- a/modules/controlcenter/taskbar/TaskbarPane.qml
+++ b/modules/controlcenter/taskbar/TaskbarPane.qml
@@ -289,7 +289,7 @@ Item {
 
                             StyledRect {
                                 Layout.fillWidth: true
-                                implicitHeight: workspacesShownRow.implicitHeight + Tokens.padding.large * 2
+                                implicitHeight: workspacesShownRow.implicitHeight + Tokens.padding.extraLargeIncreased
                                 radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
@@ -325,7 +325,7 @@ Item {
 
                             StyledRect {
                                 Layout.fillWidth: true
-                                implicitHeight: workspacesActiveIndicatorRow.implicitHeight + Tokens.padding.large * 2
+                                implicitHeight: workspacesActiveIndicatorRow.implicitHeight + Tokens.padding.extraLargeIncreased
                                 radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
@@ -359,7 +359,7 @@ Item {
 
                             StyledRect {
                                 Layout.fillWidth: true
-                                implicitHeight: workspacesOccupiedBgRow.implicitHeight + Tokens.padding.large * 2
+                                implicitHeight: workspacesOccupiedBgRow.implicitHeight + Tokens.padding.extraLargeIncreased
                                 radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
@@ -393,7 +393,7 @@ Item {
 
                             StyledRect {
                                 Layout.fillWidth: true
-                                implicitHeight: workspacesShowWindowsRow.implicitHeight + Tokens.padding.large * 2
+                                implicitHeight: workspacesShowWindowsRow.implicitHeight + Tokens.padding.extraLargeIncreased
                                 radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
@@ -427,7 +427,7 @@ Item {
 
                             StyledRect {
                                 Layout.fillWidth: true
-                                implicitHeight: workspacesMaxWindowIconsRow.implicitHeight + Tokens.padding.large * 2
+                                implicitHeight: workspacesMaxWindowIconsRow.implicitHeight + Tokens.padding.extraLargeIncreased
                                 radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
@@ -463,7 +463,7 @@ Item {
 
                             StyledRect {
                                 Layout.fillWidth: true
-                                implicitHeight: workspacesPerMonitorRow.implicitHeight + Tokens.padding.large * 2
+                                implicitHeight: workspacesPerMonitorRow.implicitHeight + Tokens.padding.extraLargeIncreased
                                 radius: Tokens.rounding.large
                                 color: Colours.layer(Colours.palette.m3surfaceContainer, 2)
 
diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml
index 825eb07e..64bca2f9 100644
--- a/modules/dashboard/Media.qml
+++ b/modules/dashboard/Media.qml
@@ -18,7 +18,7 @@ Item {
     required property DrawerVisibilities visibilities
     readonly property bool needsKeyboard: lyricMenuOpen
 
-    readonly property real nonAnimHeight: Math.max(cover.implicitHeight + Tokens.sizes.dashboard.mediaVisualiserSize * 2, lyricMenuOpen ? lyricMenu.implicitHeight : details.implicitHeight, bongocat.implicitHeight) + Tokens.padding.large * 2
+    readonly property real nonAnimHeight: Math.max(cover.implicitHeight + Tokens.sizes.dashboard.mediaVisualiserSize * 2, lyricMenuOpen ? lyricMenu.implicitHeight : details.implicitHeight, bongocat.implicitHeight) + Tokens.padding.extraLargeIncreased
     readonly property real detailsHeightWithoutLyrics: details.implicitHeight - lyricsViewInDetails.implicitHeight
 
     property bool lyricMenuOpen: false
@@ -52,7 +52,7 @@ Item {
         }
     }
 
-    implicitWidth: cover.implicitWidth + Tokens.sizes.dashboard.mediaVisualiserSize * 2 + details.implicitWidth + details.anchors.leftMargin + bongocat.implicitWidth + bongocat.anchors.leftMargin * 2 + Tokens.padding.large * 2
+    implicitWidth: cover.implicitWidth + Tokens.sizes.dashboard.mediaVisualiserSize * 2 + details.implicitWidth + details.anchors.leftMargin + bongocat.implicitWidth + bongocat.anchors.leftMargin * 2 + Tokens.padding.extraLargeIncreased
     implicitHeight: nonAnimHeight
 
     Behavior on implicitHeight {
diff --git a/modules/dashboard/Performance.qml b/modules/dashboard/Performance.qml
index 300cd193..dc7c1bc8 100644
--- a/modules/dashboard/Performance.qml
+++ b/modules/dashboard/Performance.qml
@@ -11,7 +11,7 @@ import qs.services
 Item {
     id: root
 
-    readonly property int minWidth: 400 + 400 + Tokens.spacing.normal + 120 + Tokens.padding.large * 2
+    readonly property int minWidth: 400 + 400 + Tokens.spacing.normal + 120 + Tokens.padding.extraLargeIncreased
 
     function displayTemp(temp: real): string {
         return `${Math.ceil(GlobalConfig.services.useFahrenheitPerformance ? temp * 1.8 + 32 : temp)}°${GlobalConfig.services.useFahrenheitPerformance ? "F" : "C"}`;
diff --git a/modules/dashboard/WeatherTab.qml b/modules/dashboard/WeatherTab.qml
index ad9c09ac..3744cbe1 100644
--- a/modules/dashboard/WeatherTab.qml
+++ b/modules/dashboard/WeatherTab.qml
@@ -66,7 +66,7 @@ Item {
 
         StyledRect {
             Layout.fillWidth: true
-            implicitHeight: bigInfoRow.implicitHeight + Tokens.padding.extraSmall * 2
+            implicitHeight: bigInfoRow.implicitHeight + Tokens.padding.small
 
             radius: Tokens.rounding.extraLarge * 2
             color: Colours.tPalette.m3surfaceContainer
diff --git a/modules/dashboard/dash/Calendar.qml b/modules/dashboard/dash/Calendar.qml
index 036e8d3d..6688fa29 100644
--- a/modules/dashboard/dash/Calendar.qml
+++ b/modules/dashboard/dash/Calendar.qml
@@ -46,7 +46,7 @@ CustomMouseArea {
 
             Item {
                 implicitWidth: implicitHeight
-                implicitHeight: prevMonthText.implicitHeight + Tokens.padding.extraSmall * 2
+                implicitHeight: prevMonthText.implicitHeight + Tokens.padding.small
 
                 StateLayer {
                     id: prevMonthStateLayer
@@ -69,8 +69,8 @@ CustomMouseArea {
             Item {
                 Layout.fillWidth: true
 
-                implicitWidth: monthYearDisplay.implicitWidth + Tokens.padding.extraSmall * 2
-                implicitHeight: monthYearDisplay.implicitHeight + Tokens.padding.extraSmall * 2
+                implicitWidth: monthYearDisplay.implicitWidth + Tokens.padding.small
+                implicitHeight: monthYearDisplay.implicitHeight + Tokens.padding.small
 
                 StateLayer {
                     onClicked: {
@@ -103,7 +103,7 @@ CustomMouseArea {
 
             Item {
                 implicitWidth: implicitHeight
-                implicitHeight: nextMonthText.implicitHeight + Tokens.padding.extraSmall * 2
+                implicitHeight: nextMonthText.implicitHeight + Tokens.padding.small
 
                 StateLayer {
                     id: nextMonthStateLayer
@@ -164,7 +164,7 @@ CustomMouseArea {
                     required property var model
 
                     implicitWidth: implicitHeight
-                    implicitHeight: text.implicitHeight + Tokens.padding.extraSmall * 2
+                    implicitHeight: text.implicitHeight + Tokens.padding.small
 
                     StyledText {
                         id: text
diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml
index 2fc9f4c4..ad485e10 100644
--- a/modules/dashboard/dash/Media.qml
+++ b/modules/dashboard/dash/Media.qml
@@ -127,7 +127,7 @@ Item {
         color: Colours.palette.m3primary
         font.pointSize: Tokens.font.size.normal
 
-        width: parent.implicitWidth - Tokens.padding.large * 2
+        width: parent.implicitWidth - Tokens.padding.extraLargeIncreased
         elide: Text.ElideRight
     }
 
@@ -144,7 +144,7 @@ Item {
         color: Colours.palette.m3outline
         font.pointSize: Tokens.font.size.small
 
-        width: parent.implicitWidth - Tokens.padding.large * 2
+        width: parent.implicitWidth - Tokens.padding.extraLargeIncreased
         elide: Text.ElideRight
     }
 
@@ -160,7 +160,7 @@ Item {
         text: (Players.active?.trackArtist ?? qsTr("No media")) || qsTr("Unknown artist")
         color: Colours.palette.m3secondary
 
-        width: parent.implicitWidth - Tokens.padding.large * 2
+        width: parent.implicitWidth - Tokens.padding.extraLargeIncreased
         elide: Text.ElideRight
     }
 
@@ -201,7 +201,7 @@ Item {
         anchors.right: parent.right
         anchors.topMargin: Tokens.spacing.small
         anchors.bottomMargin: Tokens.padding.large
-        anchors.margins: Tokens.padding.large * 2
+        anchors.margins: Tokens.padding.extraLargeIncreased
 
         playing: Players.active?.isPlaying ?? false
         speed: Audio.beatTracker.bpm / Config.general.mediaGifSpeedAdjustment // qmllint disable unresolved-type
diff --git a/modules/dashboard/dash/SmallWeather.qml b/modules/dashboard/dash/SmallWeather.qml
index 998c7125..cb160b7a 100644
--- a/modules/dashboard/dash/SmallWeather.qml
+++ b/modules/dashboard/dash/SmallWeather.qml
@@ -50,7 +50,7 @@ Item {
             text: Weather.description
 
             elide: Text.ElideRight
-            width: Math.min(implicitWidth, root.parent.width - icon.implicitWidth - info.anchors.leftMargin - Tokens.padding.large * 2)
+            width: Math.min(implicitWidth, root.parent.width - icon.implicitWidth - info.anchors.leftMargin - Tokens.padding.extraLargeIncreased)
         }
     }
 }
diff --git a/modules/dashboard/dash/User.qml b/modules/dashboard/dash/User.qml
index 6e0cc4a4..21c8ee73 100644
--- a/modules/dashboard/dash/User.qml
+++ b/modules/dashboard/dash/User.qml
@@ -60,8 +60,8 @@ Row {
             StyledRect {
                 anchors.centerIn: parent
 
-                implicitWidth: selectIcon.implicitHeight + Tokens.padding.extraSmall * 2
-                implicitHeight: selectIcon.implicitHeight + Tokens.padding.extraSmall * 2
+                implicitWidth: selectIcon.implicitHeight + Tokens.padding.small
+                implicitHeight: selectIcon.implicitHeight + Tokens.padding.small
 
                 radius: Tokens.rounding.large
                 color: Colours.palette.m3primary
diff --git a/modules/launcher/items/CalcItem.qml b/modules/launcher/items/CalcItem.qml
index 3b53fc7b..adc91b17 100644
--- a/modules/launcher/items/CalcItem.qml
+++ b/modules/launcher/items/CalcItem.qml
@@ -70,7 +70,7 @@ Item {
             clip: true
 
             implicitWidth: (stateLayer.containsMouse ? label.implicitWidth + label.anchors.rightMargin : 0) + icon.implicitWidth + Tokens.padding.medium * 2
-            implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Tokens.padding.extraSmall * 2
+            implicitHeight: Math.max(label.implicitHeight, icon.implicitHeight) + Tokens.padding.small
 
             Layout.alignment: Qt.AlignVCenter
 
diff --git a/modules/lock/Center.qml b/modules/lock/Center.qml
index dd379908..9ee52b6b 100644
--- a/modules/lock/Center.qml
+++ b/modules/lock/Center.qml
@@ -73,7 +73,7 @@ ColumnLayout {
 
     StyledText {
         Layout.alignment: Qt.AlignHCenter
-        Layout.topMargin: -Tokens.padding.large * 2
+        Layout.topMargin: -Tokens.padding.extraLargeIncreased
 
         text: Time.format("dddd, d MMMM yyyy")
         color: Colours.palette.m3tertiary
@@ -113,7 +113,7 @@ ColumnLayout {
         Layout.alignment: Qt.AlignHCenter
 
         implicitWidth: root.centerWidth * 0.8
-        implicitHeight: input.implicitHeight + Tokens.padding.extraSmall * 2
+        implicitHeight: input.implicitHeight + Tokens.padding.small
 
         color: Colours.tPalette.m3surfaceContainer
         radius: Tokens.rounding.full
@@ -152,7 +152,7 @@ ColumnLayout {
 
             Item {
                 implicitWidth: implicitHeight
-                implicitHeight: fprintIcon.implicitHeight + Tokens.padding.extraSmall * 2
+                implicitHeight: fprintIcon.implicitHeight + Tokens.padding.small
 
                 MaterialIcon {
                     id: fprintIcon
@@ -188,7 +188,7 @@ ColumnLayout {
 
             StyledRect {
                 implicitWidth: implicitHeight
-                implicitHeight: enterIcon.implicitHeight + Tokens.padding.extraSmall * 2
+                implicitHeight: enterIcon.implicitHeight + Tokens.padding.small
 
                 color: root.lock.pam.buffer ? Colours.palette.m3primary : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
                 radius: Tokens.rounding.full
diff --git a/modules/lock/Fetch.qml b/modules/lock/Fetch.qml
index 1dc4dadd..8a070f21 100644
--- a/modules/lock/Fetch.qml
+++ b/modules/lock/Fetch.qml
@@ -13,7 +13,7 @@ ColumnLayout {
     id: root
 
     anchors.fill: parent
-    anchors.margins: Tokens.padding.large * 2
+    anchors.margins: Tokens.padding.extraLargeIncreased
     anchors.topMargin: Tokens.padding.large
 
     spacing: Tokens.spacing.small
diff --git a/modules/lock/LockSurface.qml b/modules/lock/LockSurface.qml
index 9bdcedfe..da7bea54 100644
--- a/modules/lock/LockSurface.qml
+++ b/modules/lock/LockSurface.qml
@@ -216,8 +216,8 @@ WlSessionLockSurface {
             id: content
 
             anchors.centerIn: parent
-            width: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult * Tokens.sizes.lock.ratio - Tokens.padding.large * 2
-            height: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult - Tokens.padding.large * 2
+            width: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult * Tokens.sizes.lock.ratio - Tokens.padding.extraLargeIncreased
+            height: (root.screen?.height ?? 0) * Tokens.sizes.lock.heightMult - Tokens.padding.extraLargeIncreased
 
             lock: root
             opacity: 0
diff --git a/modules/lock/Media.qml b/modules/lock/Media.qml
index cbe81716..162579f3 100644
--- a/modules/lock/Media.qml
+++ b/modules/lock/Media.qml
@@ -150,8 +150,8 @@ Item {
 
         signal clicked
 
-        Layout.preferredWidth: implicitWidth + (controlState.pressed ? Tokens.padding.medium * 2 : active ? Tokens.padding.extraSmall * 2 : 0)
-        implicitWidth: controlIcon.implicitWidth + Tokens.padding.large * 2
+        Layout.preferredWidth: implicitWidth + (controlState.pressed ? Tokens.padding.medium * 2 : active ? Tokens.padding.small : 0)
+        implicitWidth: controlIcon.implicitWidth + Tokens.padding.extraLargeIncreased
         implicitHeight: controlIcon.implicitHeight + Tokens.padding.medium * 2
 
         color: active ? Colours.palette[`m3${colour.toLowerCase()}`] : Colours.palette[`m3${colour.toLowerCase()}Container`]
diff --git a/modules/lock/NotifGroup.qml b/modules/lock/NotifGroup.qml
index 6807a2ef..ced224a1 100644
--- a/modules/lock/NotifGroup.qml
+++ b/modules/lock/NotifGroup.qml
@@ -166,7 +166,7 @@ StyledRect {
                 }
 
                 StyledRect {
-                    implicitWidth: expandBtn.implicitWidth + Tokens.padding.small * 2
+                    implicitWidth: expandBtn.implicitWidth + Tokens.padding.large
                     implicitHeight: groupCount.implicitHeight + Tokens.padding.extraSmall
 
                     color: root.urgency === "critical" ? Colours.palette.m3error : Colours.layer(Colours.palette.m3surfaceContainerHighest, 2)
diff --git a/modules/lock/Resources.qml b/modules/lock/Resources.qml
index 921b51b1..cca2a814 100644
--- a/modules/lock/Resources.qml
+++ b/modules/lock/Resources.qml
@@ -68,7 +68,7 @@ GridLayout {
 
             anchors.fill: parent
             value: res.value
-            padding: Tokens.padding.large * 3
+            padding: Tokens.padding.extraExtraLarge
             fgColour: res.colour
             bgColour: Colours.layer(Colours.palette.m3surfaceContainerHighest, 3)
             strokeWidth: width < 200 ? Tokens.padding.small : Tokens.padding.medium
diff --git a/modules/lock/WeatherInfo.qml b/modules/lock/WeatherInfo.qml
index 23bf5bcb..5883829b 100644
--- a/modules/lock/WeatherInfo.qml
+++ b/modules/lock/WeatherInfo.qml
@@ -13,13 +13,13 @@ ColumnLayout {
 
     anchors.left: parent.left
     anchors.right: parent.right
-    anchors.margins: Tokens.padding.large * 2
+    anchors.margins: Tokens.padding.extraLargeIncreased
 
     spacing: Tokens.spacing.small
 
     Loader {
         asynchronous: true
-        Layout.topMargin: Tokens.padding.large * 2
+        Layout.topMargin: Tokens.padding.extraLargeIncreased
         Layout.bottomMargin: -Tokens.padding.large
         Layout.alignment: Qt.AlignHCenter
 
@@ -110,7 +110,7 @@ ColumnLayout {
 
         asynchronous: true
         Layout.topMargin: Tokens.spacing.smaller
-        Layout.bottomMargin: Tokens.padding.large * 2
+        Layout.bottomMargin: Tokens.padding.extraLargeIncreased
         Layout.fillWidth: true
 
         active: root.rootHeight > 820
diff --git a/modules/notifications/Notification.qml b/modules/notifications/Notification.qml
index a9ad1bff..6b906d90 100644
--- a/modules/notifications/Notification.qml
+++ b/modules/notifications/Notification.qml
@@ -479,9 +479,9 @@ StyledRect {
         color: root.modelData.urgency === NotificationUrgency.Critical ? Colours.palette.m3secondary : Colours.layer(Colours.palette.m3surfaceContainerHigh, 2)
 
         Layout.preferredWidth: actionText.width + Tokens.padding.medium * 2
-        Layout.preferredHeight: actionText.height + Tokens.padding.extraSmall * 2
+        Layout.preferredHeight: actionText.height + Tokens.padding.small
         implicitWidth: actionText.width + Tokens.padding.medium * 2
-        implicitHeight: actionText.height + Tokens.padding.extraSmall * 2
+        implicitHeight: actionText.height + Tokens.padding.small
 
         StateLayer {
             radius: Tokens.rounding.full
diff --git a/modules/osd/Content.qml b/modules/osd/Content.qml
index 3ad3ef88..ff02dcc6 100644
--- a/modules/osd/Content.qml
+++ b/modules/osd/Content.qml
@@ -20,8 +20,8 @@ Item {
     required property bool sourceMuted
     required property real brightness
 
-    implicitWidth: layout.implicitWidth + Tokens.padding.large * 2
-    implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
+    implicitWidth: layout.implicitWidth + Tokens.padding.extraLargeIncreased
+    implicitHeight: layout.implicitHeight + Tokens.padding.extraLargeIncreased
 
     ColumnLayout {
         id: layout
diff --git a/modules/sidebar/NotifActionList.qml b/modules/sidebar/NotifActionList.qml
index cf3ab8cf..24fe2729 100644
--- a/modules/sidebar/NotifActionList.qml
+++ b/modules/sidebar/NotifActionList.qml
@@ -115,7 +115,7 @@ Item {
                     Layout.fillWidth: true
                     Layout.fillHeight: true
                     implicitWidth: actionInner.implicitWidth + Tokens.padding.medium * 2
-                    implicitHeight: actionInner.implicitHeight + Tokens.padding.extraSmall * 2
+                    implicitHeight: actionInner.implicitHeight + Tokens.padding.small
 
                     Layout.preferredWidth: implicitWidth + (actionStateLayer.pressed ? Tokens.padding.large : 0)
                     radius: actionStateLayer.pressed ? Tokens.rounding.medium / 2 : Tokens.rounding.medium
diff --git a/modules/sidebar/NotifGroup.qml b/modules/sidebar/NotifGroup.qml
index 9a5369f1..d821dbea 100644
--- a/modules/sidebar/NotifGroup.qml
+++ b/modules/sidebar/NotifGroup.qml
@@ -186,7 +186,7 @@ StyledRect {
                 }
 
                 StyledRect {
-                    implicitWidth: expandBtn.implicitWidth + Tokens.padding.small * 2
+                    implicitWidth: expandBtn.implicitWidth + Tokens.padding.large
                     implicitHeight: groupCount.implicitHeight + Tokens.padding.extraSmall
 
                     color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3error : Colours.layer(Colours.palette.m3surfaceContainerHigh, 3)
@@ -218,7 +218,7 @@ StyledRect {
                             text: "expand_more"
                             color: root.urgency === NotificationUrgency.Critical ? Colours.palette.m3onError : Colours.palette.m3onSurface
                             rotation: root.expanded ? 180 : 0
-                            Layout.topMargin: root.expanded ? -Math.floor(Tokens.padding.small / 2) : 0
+                            Layout.topMargin: root.expanded ? -Math.floor(Tokens.padding.extraSmall) : 0
 
                             Behavior on rotation {
                                 Anim {
diff --git a/modules/sidebar/Wrapper.qml b/modules/sidebar/Wrapper.qml
index 108c51a2..9eeb9d02 100644
--- a/modules/sidebar/Wrapper.qml
+++ b/modules/sidebar/Wrapper.qml
@@ -36,7 +36,7 @@ Item {
         active: root.shouldBeActive || root.visible
 
         sourceComponent: Content {
-            implicitWidth: Tokens.sizes.sidebar.width - Tokens.padding.large * 2
+            implicitWidth: Tokens.sizes.sidebar.width - Tokens.padding.extraLargeIncreased
             props: root.props
             visibilities: root.visibilities
         }
diff --git a/modules/utilities/RecordingDeleteModal.qml b/modules/utilities/RecordingDeleteModal.qml
index 3eb72ccd..a5ab91f1 100644
--- a/modules/utilities/RecordingDeleteModal.qml
+++ b/modules/utilities/RecordingDeleteModal.qml
@@ -144,9 +144,9 @@ Loader {
             scale: 0
             Component.onCompleted: scale = Qt.binding(() => root.props.recordingConfirmDelete ? 1 : 0)
 
-            width: Math.min(parent.width - Tokens.padding.large * 2, implicitWidth)
-            implicitWidth: deleteConfirmationLayout.implicitWidth + Tokens.padding.large * 3
-            implicitHeight: deleteConfirmationLayout.implicitHeight + Tokens.padding.large * 3
+            width: Math.min(parent.width - Tokens.padding.extraLargeIncreased, implicitWidth)
+            implicitWidth: deleteConfirmationLayout.implicitWidth + Tokens.padding.extraExtraLarge
+            implicitHeight: deleteConfirmationLayout.implicitHeight + Tokens.padding.extraExtraLarge
 
             MouseArea {
                 anchors.fill: parent
diff --git a/modules/utilities/cards/IdleInhibit.qml b/modules/utilities/cards/IdleInhibit.qml
index c4517dcf..b6253441 100644
--- a/modules/utilities/cards/IdleInhibit.qml
+++ b/modules/utilities/cards/IdleInhibit.qml
@@ -9,7 +9,7 @@ StyledRect {
     id: root
 
     Layout.fillWidth: true
-    implicitHeight: layout.implicitHeight + (IdleInhibitor.enabled ? activeChip.implicitHeight + activeChip.anchors.topMargin : 0) + Tokens.padding.large * 2
+    implicitHeight: layout.implicitHeight + (IdleInhibitor.enabled ? activeChip.implicitHeight + activeChip.anchors.topMargin : 0) + Tokens.padding.extraLargeIncreased
 
     radius: Tokens.rounding.large
     color: Colours.tPalette.m3surfaceContainer
@@ -26,7 +26,7 @@ StyledRect {
 
         StyledRect {
             implicitWidth: implicitHeight
-            implicitHeight: icon.implicitHeight + Tokens.padding.small * 2
+            implicitHeight: icon.implicitHeight + Tokens.padding.large
 
             radius: Tokens.rounding.full
             color: IdleInhibitor.enabled ? Colours.palette.m3secondary : Colours.palette.m3secondaryContainer
@@ -84,7 +84,7 @@ StyledRect {
 
         sourceComponent: StyledRect {
             implicitWidth: activeText.implicitWidth + Tokens.padding.medium * 2
-            implicitHeight: activeText.implicitHeight + Tokens.padding.extraSmall * 2
+            implicitHeight: activeText.implicitHeight + Tokens.padding.small
 
             radius: Tokens.rounding.full
             color: Colours.palette.m3primary
diff --git a/modules/utilities/cards/Record.qml b/modules/utilities/cards/Record.qml
index 72dc0679..c3da04c7 100644
--- a/modules/utilities/cards/Record.qml
+++ b/modules/utilities/cards/Record.qml
@@ -33,7 +33,7 @@ StyledRect {
             StyledRect {
                 implicitWidth: implicitHeight
                 implicitHeight: {
-                    const h = icon.implicitHeight + Tokens.padding.small * 2;
+                    const h = icon.implicitHeight + Tokens.padding.large;
                     return h - (h % 2);
                 }
 
@@ -194,7 +194,7 @@ StyledRect {
                 color: Recorder.paused ? Colours.palette.m3tertiary : Colours.palette.m3error
 
                 implicitWidth: recText.implicitWidth + Tokens.padding.medium * 2
-                implicitHeight: recText.implicitHeight + Tokens.padding.small * 2
+                implicitHeight: recText.implicitHeight + Tokens.padding.large
 
                 StyledText {
                     id: recText
diff --git a/modules/utilities/cards/Toggles.qml b/modules/utilities/cards/Toggles.qml
index d2d092c9..0544369f 100644
--- a/modules/utilities/cards/Toggles.qml
+++ b/modules/utilities/cards/Toggles.qml
@@ -38,7 +38,7 @@ StyledRect {
     readonly property bool needExtraRow: quickToggles.length > 6
 
     Layout.fillWidth: true
-    implicitHeight: layout.implicitHeight + Tokens.padding.large * 2
+    implicitHeight: layout.implicitHeight + Tokens.padding.extraLargeIncreased
 
     radius: Tokens.rounding.large
     color: Colours.tPalette.m3surfaceContainer
diff --git a/modules/utilities/toasts/ToastItem.qml b/modules/utilities/toasts/ToastItem.qml
index e89771f6..6e773ba2 100644
--- a/modules/utilities/toasts/ToastItem.qml
+++ b/modules/utilities/toasts/ToastItem.qml
@@ -13,7 +13,7 @@ StyledRect {
 
     anchors.left: parent.left
     anchors.right: parent.right
-    implicitHeight: layout.implicitHeight + Tokens.padding.small * 2
+    implicitHeight: layout.implicitHeight + Tokens.padding.large
 
     radius: Tokens.rounding.large
     color: {
@@ -68,7 +68,7 @@ StyledRect {
             }
 
             implicitWidth: implicitHeight
-            implicitHeight: icon.implicitHeight + Tokens.padding.small * 2
+            implicitHeight: icon.implicitHeight + Tokens.padding.large
 
             MaterialIcon {
                 id: icon
diff --git a/modules/windowinfo/Buttons.qml b/modules/windowinfo/Buttons.qml
index fc21fde3..741481d2 100644
--- a/modules/windowinfo/Buttons.qml
+++ b/modules/windowinfo/Buttons.qml
@@ -33,7 +33,7 @@ ColumnLayout {
             color: Colours.palette.m3primary
             radius: Tokens.rounding.medium
 
-            implicitWidth: moveToWsIcon.implicitWidth + Tokens.padding.extraSmall * 2
+            implicitWidth: moveToWsIcon.implicitWidth + Tokens.padding.small
             implicitHeight: moveToWsIcon.implicitHeight + Tokens.padding.extraSmall
 
             StateLayer {
@@ -56,8 +56,8 @@ ColumnLayout {
 
     WrapperItem {
         Layout.fillWidth: true
-        Layout.leftMargin: Tokens.padding.large * 2
-        Layout.rightMargin: Tokens.padding.large * 2
+        Layout.leftMargin: Tokens.padding.extraLargeIncreased
+        Layout.rightMargin: Tokens.padding.extraLargeIncreased
 
         Layout.preferredHeight: root.moveToWsExpanded ? implicitHeight : 0
         clip: true
@@ -145,7 +145,7 @@ ColumnLayout {
         radius: Tokens.rounding.medium
 
         Layout.fillWidth: true
-        implicitHeight: label.implicitHeight + Tokens.padding.extraSmall * 2
+        implicitHeight: label.implicitHeight + Tokens.padding.small
 
         StateLayer {
             id: stateLayer
diff --git a/modules/windowinfo/Details.qml b/modules/windowinfo/Details.qml
index 1820409f..1c35420f 100644
--- a/modules/windowinfo/Details.qml
+++ b/modules/windowinfo/Details.qml
@@ -14,7 +14,7 @@ ColumnLayout {
     spacing: Tokens.spacing.small
 
     Label {
-        Layout.topMargin: Tokens.padding.large * 2
+        Layout.topMargin: Tokens.padding.extraLargeIncreased
 
         text: root.client?.title ?? qsTr("No active client")
         wrapMode: Text.WrapAtWordBoundaryOrAnywhere
@@ -33,8 +33,8 @@ ColumnLayout {
     StyledRect {
         Layout.fillWidth: true
         Layout.preferredHeight: 1
-        Layout.leftMargin: Tokens.padding.large * 2
-        Layout.rightMargin: Tokens.padding.large * 2
+        Layout.leftMargin: Tokens.padding.extraLargeIncreased
+        Layout.rightMargin: Tokens.padding.extraLargeIncreased
         Layout.topMargin: Tokens.spacing.normal
         Layout.bottomMargin: Tokens.spacing.large
 
diff --git a/modules/windowinfo/Preview.qml b/modules/windowinfo/Preview.qml
index 9f9850ea..d7847afc 100644
--- a/modules/windowinfo/Preview.qml
+++ b/modules/windowinfo/Preview.qml
@@ -15,7 +15,7 @@ Item {
     required property ShellScreen screen
     required property HyprlandToplevel client
 
-    Layout.preferredWidth: preview.implicitWidth + Tokens.padding.large * 2
+    Layout.preferredWidth: preview.implicitWidth + Tokens.padding.extraLargeIncreased
     Layout.fillHeight: true
 
     StyledClippingRect {