diff --git a/lib/components/generated_form_renderer.dart b/lib/components/generated_form_renderer.dart
index 7e7e20e3..19fe5aae 100644
--- a/lib/components/generated_form_renderer.dart
+++ b/lib/components/generated_form_renderer.dart
@@ -151,7 +151,15 @@ class _FormSwitchRow extends StatelessWidget {
           ),
         ),
         const SizedBox(width: 8),
-        Switch(value: value, onChanged: item.disabled ? null : onChanged),
+        Switch(
+          value: value,
+          onChanged: item.disabled
+              ? null
+              : (v) {
+                  context.read<SettingsProvider>().selectionClick();
+                  onChanged?.call(v);
+                },
+        ),
       ],
     );
   }
diff --git a/lib/components/settings_widgets.dart b/lib/components/settings_widgets.dart
index d3dfd22f..fd9031a0 100644
--- a/lib/components/settings_widgets.dart
+++ b/lib/components/settings_widgets.dart
@@ -73,7 +73,7 @@ class SettingsTile extends StatelessWidget {
         borderRadius ?? BorderRadius.circular(connectedTileBigRadius);
     return Material(
       color: color ?? Theme.of(context).colorScheme.surfaceContainerLow,
-      borderRadius: effectiveRadius,
+      shape: RoundedSuperellipseBorder(borderRadius: effectiveRadius),
       clipBehavior: Clip.antiAlias,
       child: Padding(padding: padding, child: child),
     );
@@ -107,13 +107,13 @@ class SettingsToggleRow extends StatelessWidget {
             onChanged!(v);
           };
     final tileShape = borderRadius != null
-        ? RoundedRectangleBorder(borderRadius: borderRadius!)
+        ? RoundedSuperellipseBorder(borderRadius: borderRadius!)
         : null;
     return SettingsTile(
       padding: EdgeInsets.zero,
       borderRadius: borderRadius,
       child: ListTile(
-        contentPadding: const EdgeInsets.symmetric(horizontal: 16),
+        contentPadding: const EdgeInsets.symmetric(horizontal: 20),
         shape: tileShape,
         title: Text(label),
         subtitle: subtitle,