diff --git a/quickshell/Modules/Settings/BarWidgetOptions/WorkspaceSwitcherOptions.qml b/quickshell/Modules/Settings/BarWidgetOptions/WorkspaceSwitcherOptions.qml
index 595e66633..89af2c2d6 100644
--- a/quickshell/Modules/Settings/BarWidgetOptions/WorkspaceSwitcherOptions.qml
+++ b/quickshell/Modules/Settings/BarWidgetOptions/WorkspaceSwitcherOptions.qml
@@ -67,31 +67,20 @@ Column {
             onToggled: checked => root.page.set("workspaceIndicatorCompact", checked)
         }
 
-        SettingsToggleRow {
-            id: roundnessRow
-
-            readonly property bool overridden: root.page.value("workspaceIndicatorRoundness") >= 0
-
-            tags: ["workspace", "corner", "radius", "rounded", "square", "circle", "override"]
+        SettingsToggleSliderRow {
+            resetStore: root.page
+            tags: ["workspace", "corner", "radius", "rounded", "square", "circle", "override", "roundness"]
             text: I18n.tr("Override", "verb, toggle to override the global setting for this item")
-            description: I18n.tr("Follows the theme radius strength until overridden", "workspace indicator roundness override description")
-            checked: overridden
+            checked: root.page.value("workspaceIndicatorRoundness") >= 0
+            value: root.indicatorRoundness
+            minimum: 0
+            maximum: 100
+            unit: ""
             onToggled: checked => root.page.set("workspaceIndicatorRoundness", checked ? root.indicatorRoundness : -1)
-
-            body: SettingsSliderRow {
-                width: parent.width
-                enabled: roundnessRow.overridden
-                text: I18n.tr("Roundness", "workspace indicator corner rounding")
-                minimumLabel: I18n.tr("Square")
-                value: root.indicatorRoundness
-                minimum: 0
-                maximum: 100
-                unit: ""
-                onSliderValueChanged: newValue => root.draftRoundness = newValue
-                onSliderDragFinished: finalValue => {
-                    root.page.set("workspaceIndicatorRoundness", finalValue);
-                    root.draftRoundness = -1;
-                }
+            onSliderValueChanged: newValue => root.draftRoundness = newValue
+            onSliderDragFinished: finalValue => {
+                root.page.set("workspaceIndicatorRoundness", finalValue);
+                root.draftRoundness = -1;
             }
         }
 
diff --git a/quickshell/Modules/Settings/CompositorLayoutTab.qml b/quickshell/Modules/Settings/CompositorLayoutTab.qml
index 3d322a22b..4b47c9e5a 100644
--- a/quickshell/Modules/Settings/CompositorLayoutTab.qml
+++ b/quickshell/Modules/Settings/CompositorLayoutTab.qml
@@ -438,23 +438,17 @@ awk '$1 == "xray" { print FILENAME ":" FNR; exit }' $files 2>/dev/null`;
                 onSliderValueChanged: newValue => SettingsData.set("hyprlandLayoutBorderSize", newValue)
             }
 
-            SettingsToggleRow {
-                tags: ["hyprland", "resize", "border", "mouse", "drag"]
+            SettingsToggleSliderRow {
+                tags: ["hyprland", "resize", "border", "mouse", "drag", "grab", "area", "extend_border_grab_area"]
                 settingKey: "hyprlandResizeOnBorder"
+                valueKeys: ["hyprlandBorderGrabArea"]
                 text: I18n.tr("Resize on border")
                 checked: SettingsData.hyprlandResizeOnBorder
-                onToggled: checked => SettingsData.set("hyprlandResizeOnBorder", checked)
-            }
-
-            SettingsSliderRow {
-                tags: ["hyprland", "resize", "border", "grab", "area", "extend_border_grab_area"]
-                settingKey: "hyprlandBorderGrabArea"
-                visible: SettingsData.hyprlandResizeOnBorder
-                text: I18n.tr("Border grab area", "Hyprland slider, extra space around window borders that still starts a resize")
                 value: SettingsData.hyprlandBorderGrabArea
                 minimum: 0
                 maximum: 100
                 unit: "px"
+                onToggled: checked => SettingsData.set("hyprlandResizeOnBorder", checked)
                 onSliderValueChanged: newValue => SettingsData.set("hyprlandBorderGrabArea", newValue)
             }
 
diff --git a/quickshell/translations/settings_search_index.json b/quickshell/translations/settings_search_index.json
index b4ddf310c..3769807c4 100644
--- a/quickshell/translations/settings_search_index.json
+++ b/quickshell/translations/settings_search_index.json
@@ -9668,7 +9668,7 @@
     "optionFile": "KeyboardLayoutOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:13",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:12",
     "label": "Advanced",
     "tabIndex": 22,
     "keywords": [],
@@ -9987,7 +9987,7 @@
     "optionFile": "SystemMonitorOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:20",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:19",
     "label": "Drag to reorder",
     "tabIndex": 22,
     "keywords": [],
@@ -10019,7 +10019,7 @@
     "optionFile": "IslandOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:18",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:17",
     "label": "Follow display focus",
     "tabIndex": 22,
     "keywords": [],
@@ -10051,7 +10051,7 @@
     "optionFile": "WorkspaceSwitcherOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:15",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:14",
     "label": "Group apps",
     "tabIndex": 22,
     "keywords": [],
@@ -10075,7 +10075,7 @@
     "optionFile": "RunningAppsOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:16",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:15",
     "label": "Group on active workspace",
     "tabIndex": 22,
     "keywords": [],
@@ -10107,7 +10107,7 @@
     "optionFile": "SystemUpdateOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:17",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:16",
     "label": "Highlight focused app",
     "tabIndex": 22,
     "keywords": [],
@@ -10155,7 +10155,7 @@
     "optionFile": "AppsDockOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:10",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:9",
     "label": "Icon size",
     "tabIndex": 22,
     "keywords": [],
@@ -10171,7 +10171,7 @@
     "optionFile": "SystemTrayOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:6",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:5",
     "label": "Index numbers",
     "tabIndex": 22,
     "keywords": [],
@@ -10243,7 +10243,7 @@
     "optionFile": "MusicOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:9",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:8",
     "label": "Max apps to show",
     "tabIndex": 22,
     "keywords": [],
@@ -10299,7 +10299,7 @@
     "optionFile": "PrivacyOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:14",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:13",
     "label": "Minimum workspaces",
     "tabIndex": 22,
     "keywords": [],
@@ -10323,7 +10323,7 @@
     "optionFile": "SystemMonitorOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:7",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:6",
     "label": "Names",
     "tabIndex": 22,
     "keywords": [],
@@ -10411,21 +10411,13 @@
     "optionFile": "WorkspaceSwitcherOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:19",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:18",
     "label": "Reverse scroll direction",
     "tabIndex": 22,
     "keywords": [],
     "runtimeType": "barWidgetOption",
     "optionFile": "WorkspaceSwitcherOptions.qml"
   },
-  {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:5",
-    "label": "Roundness",
-    "tabIndex": 22,
-    "keywords": [],
-    "runtimeType": "barWidgetOption",
-    "optionFile": "WorkspaceSwitcherOptions.qml"
-  },
   {
     "section": "barWidgetOption:PrivacyOptions.qml:4",
     "label": "Screen sharing",
@@ -10459,7 +10451,7 @@
     "optionFile": "AppsDockOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:21",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:20",
     "label": "Show all tags",
     "tabIndex": 22,
     "keywords": [],
@@ -10467,7 +10459,7 @@
     "optionFile": "WorkspaceSwitcherOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:8",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:7",
     "label": "Show apps",
     "tabIndex": 22,
     "keywords": [],
@@ -10531,7 +10523,7 @@
     "optionFile": "SystemMonitorOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:11",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:10",
     "label": "Show occupied only",
     "tabIndex": 22,
     "keywords": [],
@@ -10555,7 +10547,7 @@
     "optionFile": "BatteryOptions.qml"
   },
   {
-    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:12",
+    "section": "barWidgetOption:WorkspaceSwitcherOptions.qml:11",
     "label": "Show scratchpads",
     "tabIndex": 22,
     "keywords": [],
@@ -12430,23 +12422,6 @@
     "description": "Styles outside of Default use more GPU",
     "conditionKey": "layoutCapable"
   },
-  {
-    "section": "hyprlandBorderGrabArea",
-    "label": "Border grab area",
-    "tabIndex": 37,
-    "category": "System & integrations",
-    "keywords": [
-      "area",
-      "border",
-      "extend_border_grab_area",
-      "grab",
-      "hyprland",
-      "integrations",
-      "resize",
-      "system"
-    ],
-    "conditionKey": "layoutCapable"
-  },
   {
     "section": "hyprlandBlurAcrylicClarity",
     "label": "Clarity",
@@ -13214,8 +13189,11 @@
     "tabIndex": 37,
     "category": "System & integrations",
     "keywords": [
+      "area",
       "border",
       "drag",
+      "extend_border_grab_area",
+      "grab",
       "hyprland",
       "integrations",
       "mouse",