diff --git a/components/mobileshell/qml/widgets/krunner/KRunnerScreen.qml b/components/mobileshell/qml/widgets/krunner/KRunnerScreen.qml
index 33432592..a0a5d0fd 100644
--- a/components/mobileshell/qml/widgets/krunner/KRunnerScreen.qml
+++ b/components/mobileshell/qml/widgets/krunner/KRunnerScreen.qml
@@ -64,7 +64,7 @@ Item {
                     id: rectBackground
                     anchors.fill: parent
                     color: Kirigami.Theme.backgroundColor
-                    radius: Kirigami.Units.smallSpacing
+                    radius: Kirigami.Units.cornerRadius
                 }
             }
 
diff --git a/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml
index 7afb7ce7..c5be3f8d 100644
--- a/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml
+++ b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml
@@ -161,7 +161,7 @@ Item {
                         id: rectBackground
                         anchors.fill: parent
                         color: Kirigami.Theme.backgroundColor
-                        radius: Kirigami.Units.smallSpacing
+                        radius: Kirigami.Units.cornerRadius
                     }
                 }
 
diff --git a/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml b/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml
index 26f72dad..6d6dca01 100644
--- a/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml
+++ b/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml
@@ -24,7 +24,7 @@ Item {
                 anchors.centerIn: parent
                 width: img.width
                 height: img.height
-                radius: Kirigami.Units.smallSpacing
+                radius: Kirigami.Units.cornerRadius
             }
         }
     }
diff --git a/components/mobileshell/qml/widgets/notifications/NotificationCard.qml b/components/mobileshell/qml/widgets/notifications/NotificationCard.qml
index bbaf4ff5..5d9b6161 100644
--- a/components/mobileshell/qml/widgets/notifications/NotificationCard.qml
+++ b/components/mobileshell/qml/widgets/notifications/NotificationCard.qml
@@ -65,7 +65,7 @@ Item {
         anchors.bottomMargin: -1
 
         color: Qt.darker(Kirigami.Theme.backgroundColor, 1.3)
-        radius: Kirigami.Units.smallSpacing
+        radius: Kirigami.Units.cornerRadius
     }
 
     // card
@@ -78,7 +78,7 @@ Item {
         anchors.top: parent.top
 
         color: (root.tapEnabled && mouseArea.pressed) ? Qt.darker(Kirigami.Theme.backgroundColor, 1.1) : Kirigami.Theme.backgroundColor
-        radius: Kirigami.Units.smallSpacing
+        radius: Kirigami.Units.cornerRadius
         implicitHeight: contentParent.implicitHeight
 
         // clip
diff --git a/containments/homescreens/folio/package/contents/ui/HomeScreenPage.qml b/containments/homescreens/folio/package/contents/ui/HomeScreenPage.qml
index 9eff7789..314a774e 100644
--- a/containments/homescreens/folio/package/contents/ui/HomeScreenPage.qml
+++ b/containments/homescreens/folio/package/contents/ui/HomeScreenPage.qml
@@ -72,7 +72,7 @@ Item {
                     dropDelegateIsWidget &&
                     pageModel.canAddDelegate(dropPosition.pageRow, dropPosition.pageColumn, dropDelegate)
 
-        radius: Kirigami.Units.smallSpacing
+        radius: Kirigami.Units.cornerRadius
         color: Qt.rgba(255, 255, 255, 0.3)
 
         x: dropPosition.pageColumn * folio.HomeScreenState.pageCellWidth
diff --git a/containments/homescreens/folio/package/contents/ui/PlaceholderDelegate.qml b/containments/homescreens/folio/package/contents/ui/PlaceholderDelegate.qml
index e59e019a..9b22ba10 100644
--- a/containments/homescreens/folio/package/contents/ui/PlaceholderDelegate.qml
+++ b/containments/homescreens/folio/package/contents/ui/PlaceholderDelegate.qml
@@ -25,7 +25,7 @@ Item {
         Rectangle {
             id: loader
             color: Qt.rgba(255, 255, 255, 0.3)
-            radius: Kirigami.Units.largeSpacing
+            radius: Kirigami.Units.cornerRadius
 
             Layout.alignment: Qt.AlignHCenter | Qt.AlignBottom
             Layout.minimumWidth: folio.FolioSettings.delegateIconSize
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/AppDelegate.qml b/containments/homescreens/folio/package/contents/ui/delegate/AppDelegate.qml
index 9e7529c0..bbbab535 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/AppDelegate.qml
+++ b/containments/homescreens/folio/package/contents/ui/delegate/AppDelegate.qml
@@ -53,7 +53,7 @@ AbstractDelegate {
         // background for folder creation animation
         Rectangle {
             id: rect
-            radius: Kirigami.Units.largeSpacing
+            radius: Kirigami.Units.cornerRadius
             color: Qt.rgba(255, 255, 255, 0.3)
             anchors.fill: parent
 
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/DelegateFolderIcon.qml b/containments/homescreens/folio/package/contents/ui/delegate/DelegateFolderIcon.qml
index 81b2e4af..172e02e8 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/DelegateFolderIcon.qml
+++ b/containments/homescreens/folio/package/contents/ui/delegate/DelegateFolderIcon.qml
@@ -23,7 +23,7 @@ Item {
 
     Rectangle {
         id: rect
-        radius: Kirigami.Units.largeSpacing
+        radius: Kirigami.Units.cornerRadius
         color: Qt.rgba(255, 255, 255, 0.3)
         anchors.fill: parent
 
diff --git a/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegate.qml b/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegate.qml
index 892e3fbc..ebb81ebc 100644
--- a/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegate.qml
+++ b/containments/homescreens/folio/package/contents/ui/delegate/WidgetDelegate.qml
@@ -95,7 +95,7 @@ Folio.WidgetContainer {
             anchors.fill: parent
             visible: root.widget && !root.widget.applet
             color: Qt.rgba(255, 255, 255, 0.3)
-            radius: Kirigami.Units.smallSpacing
+            radius: Kirigami.Units.cornerRadius
         }
 
         Item {
diff --git a/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml b/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml
index 83007953..c461d21e 100644
--- a/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml
+++ b/containments/homescreens/folio/package/contents/ui/private/WidgetResizeHandleFrame.qml
@@ -171,7 +171,7 @@ Item {
         id: resizeOutline
         color: 'transparent'
         border.color: 'white'
-        radius: Kirigami.Units.smallSpacing
+        radius: Kirigami.Units.cornerRadius
         border.width: 1
 
         anchors.fill: handleContainer
diff --git a/containments/homescreens/folio/package/contents/ui/settings/AppletListViewer.qml b/containments/homescreens/folio/package/contents/ui/settings/AppletListViewer.qml
index ad5863a7..b02bb312 100644
--- a/containments/homescreens/folio/package/contents/ui/settings/AppletListViewer.qml
+++ b/containments/homescreens/folio/package/contents/ui/settings/AppletListViewer.qml
@@ -136,7 +136,7 @@ MouseArea {
                 id: background
                 color: Qt.rgba(255, 255, 255, 0.3)
                 visible: delegate.containsMouse
-                radius: Kirigami.Units.smallSpacing
+                radius: Kirigami.Units.cornerRadius
                 anchors.fill: parent
             }
 
diff --git a/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml b/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml
index 504ae373..2b15683c 100644
--- a/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml
+++ b/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml
@@ -263,7 +263,7 @@ Item {
                 anchors.fill: parent
                 anchors.margins: Kirigami.Units.smallSpacing
                 color: Qt.rgba(255, 255, 255, 0.2)
-                radius: Kirigami.Units.smallSpacing
+                radius: Kirigami.Units.cornerRadius
                 opacity: delegate.dragFolderAnimationProgress
             }
 
@@ -311,7 +311,7 @@ Item {
                 anchors.fill: parent
                 anchors.margins: Kirigami.Units.smallSpacing
                 color: Qt.rgba(255, 255, 255, 0.2)
-                radius: Kirigami.Units.smallSpacing
+                radius: Kirigami.Units.cornerRadius
 
                 transform: Scale {
                     origin.x: rect.width / 2
diff --git a/kcms/time/ui/TimePicker.qml b/kcms/time/ui/TimePicker.qml
index 5b5cf829..a25172ed 100644
--- a/kcms/time/ui/TimePicker.qml
+++ b/kcms/time/ui/TimePicker.qml
@@ -95,7 +95,7 @@ RowLayout {
             }
 
             background: Rectangle {
-                radius: Kirigami.Units.smallSpacing
+                radius: Kirigami.Units.cornerRadius
                 border.color: {
                     if (amPmToggle.enabled && (amPmToggle.visualFocus || amPmToggle.hovered || amPmToggle.down)) {
                         return Kirigami.Theme.focusColor
diff --git a/lookandfeel/contents/logout/ActionButton.qml b/lookandfeel/contents/logout/ActionButton.qml
index 628aa7c0..7b560950 100644
--- a/lookandfeel/contents/logout/ActionButton.qml
+++ b/lookandfeel/contents/logout/ActionButton.qml
@@ -35,7 +35,7 @@ Item {
         id: buttonRect
         width: root.width
         height: iconSize * 2.2
-        radius: Kirigami.Units.smallSpacing
+        radius: Kirigami.Units.cornerRadius
         color: Kirigami.Theme.backgroundColor
         opacity: mouseArea.containsPress ? 1 : 0.6
         border {