diff --git a/app/src/main/java/se/ajpanton/statusbartweak/runtime/features/battery/BatteryBarController.java b/app/src/main/java/se/ajpanton/statusbartweak/runtime/features/battery/BatteryBarController.java
index 0356624..e01daa4 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/runtime/features/battery/BatteryBarController.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/runtime/features/battery/BatteryBarController.java
@@ -12,8 +12,10 @@ import android.graphics.Path;
 import android.graphics.PathMeasure;
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
+import android.graphics.RectF;
 import android.os.BatteryManager;
 import android.view.Gravity;
+import android.view.RoundedCorner;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
@@ -1015,7 +1017,6 @@ final class BatteryBarController {
         private final Path fullCurvePath = new Path();
         private final Path drawPath = new Path();
         private final PathMeasure pathMeasure = new PathMeasure();
-        private final float[] pathPoint = new float[2];
         private ViewGroup host;
         private SbtSettings settings;
         private BatteryBarGeometry geometry;
@@ -1064,6 +1065,17 @@ final class BatteryBarController {
                     : BatteryBarGeometry.global(settings);
             int thickness = Math.max(1, dpToPx(getContext(), activeGeometry.thicknessDp));
             int edgeOffset = Math.max(0, dpToPx(getContext(), settings.batteryBarEdgeOffsetDp));
+            float fraction = resolveFraction(batteryLevel, settings);
+            if (shouldDrawCurvedTop(activeGeometry)) {
+                buildCurvedPath(
+                        width,
+                        height,
+                        thickness,
+                        edgeOffset,
+                        fraction,
+                        activeGeometry.alignment);
+                return;
+            }
             int left = edgeOffset;
             int right = width - edgeOffset;
             if (right <= left) {
@@ -1074,11 +1086,6 @@ final class BatteryBarController {
             if (bottom <= top) {
                 return;
             }
-            float fraction = resolveFraction(batteryLevel, settings);
-            if (shouldDrawCurvedTop(activeGeometry)) {
-                buildCurvedPath(left, right, height, thickness, fraction, activeGeometry.alignment);
-                return;
-            }
             int availableWidth = right - left;
             int barWidth = Math.round(availableWidth * fraction);
             if (barWidth <= 0) {
@@ -1100,53 +1107,47 @@ final class BatteryBarController {
                 return false;
             }
             return !SbtSettings.BATTERY_BAR_CURVED_GEOMETRY_OFF.equals(
-                    settings.batteryBarCurvedGeometryMode);
+                    geometry.curvedGeometryMode);
         }
 
         private void buildCurvedPath(
-                int left,
-                int right,
+                int width,
                 int height,
                 int thickness,
+                int edgeOffset,
                 float fraction,
                 String alignment
         ) {
-            if (fraction <= 0f || right <= left || height <= 0 || thickness <= 0) {
+            if (fraction <= 0f || width <= 0 || height <= 0 || thickness <= 0) {
                 return;
             }
-            float halfStroke = thickness / 2f;
-            float leftCenter = left + halfStroke;
-            float rightCenter = right - halfStroke;
-            if (rightCenter <= leftCenter) {
-                return;
-            }
-            buildFullCurvePath(leftCenter, rightCenter, height, thickness);
+            buildFullCurvePath(width, height, thickness);
             pathMeasure.setPath(fullCurvePath, false);
             float fullLength = pathMeasure.getLength();
             if (fullLength <= 0f) {
                 return;
             }
-            float targetLength = SbtSettings.BATTERY_BAR_CURVED_GEOMETRY_LENGTH.equals(
-                    settings.batteryBarCurvedGeometryMode)
-                    ? fullLength * fraction
-                    : targetDistanceForHorizontalFraction(
-                            leftCenter,
-                            rightCenter,
-                            fullLength,
-                            fraction);
+            float pathOffset = Math.min(Math.max(0f, edgeOffset), fullLength / 2f);
+            float usableStart = pathOffset;
+            float usableEnd = fullLength - pathOffset;
+            float usableLength = usableEnd - usableStart;
+            if (usableLength <= 0f) {
+                return;
+            }
+            float targetLength = usableLength * fraction;
             if (targetLength <= 0f) {
                 return;
             }
-            targetLength = Math.min(fullLength, targetLength);
-            float start = 0f;
-            float end = targetLength;
+            targetLength = Math.min(usableLength, targetLength);
+            float start = usableStart;
+            float end = usableStart + targetLength;
             if ("rtl".equals(alignment)) {
-                start = fullLength - targetLength;
-                end = fullLength;
+                start = usableEnd - targetLength;
+                end = usableEnd;
             } else if ("center".equals(alignment)) {
-                float center = fullLength / 2f;
-                start = Math.max(0f, center - targetLength / 2f);
-                end = Math.min(fullLength, center + targetLength / 2f);
+                float center = (usableStart + usableEnd) / 2f;
+                start = Math.max(usableStart, center - targetLength / 2f);
+                end = Math.min(usableEnd, center + targetLength / 2f);
             }
             if (end <= start) {
                 return;
@@ -1156,64 +1157,103 @@ final class BatteryBarController {
             pathStrokeWidth = thickness;
         }
 
-        private void buildFullCurvePath(float left, float right, int height, int thickness) {
+        private void buildFullCurvePath(int width, int height, int thickness) {
             fullCurvePath.reset();
             float halfStroke = thickness / 2f;
+            if (width <= thickness) {
+                return;
+            }
             float topY = halfStroke;
             float bottomY = Math.max(topY, height - halfStroke);
             float verticalSpan = bottomY - topY;
-            float radius = Math.min(verticalSpan, (right - left) / 2f);
-            fullCurvePath.moveTo(left, bottomY);
-            if (radius <= 0f) {
-                fullCurvePath.lineTo(right, topY);
+            float outerRadius = Math.min(
+                    resolveTopCornerRadius(verticalSpan + halfStroke),
+                    width / 2f);
+            float curveRadius = outerRadius - halfStroke;
+            if (curveRadius <= 0f) {
+                buildSharpTopPath(width, topY, bottomY, halfStroke);
                 return;
             }
-            fullCurvePath.lineTo(left, topY + radius);
-            fullCurvePath.quadTo(left, topY, left + radius, topY);
-            fullCurvePath.lineTo(right - radius, topY);
-            fullCurvePath.quadTo(right, topY, right, topY + radius);
-            fullCurvePath.lineTo(right, bottomY);
+            float leftTopX = outerRadius;
+            float rightTopX = width - outerRadius;
+            if (rightTopX <= leftTopX) {
+                buildSharpTopPath(width, topY, bottomY, halfStroke);
+                return;
+            }
+            RectF leftCorner = new RectF(
+                    halfStroke,
+                    halfStroke,
+                    outerRadius + curveRadius,
+                    outerRadius + curveRadius);
+            RectF rightCorner = new RectF(
+                    width - outerRadius - curveRadius,
+                    halfStroke,
+                    width - halfStroke,
+                    outerRadius + curveRadius);
+
+            float leftStartAngle = leftCornerStartAngle(bottomY, outerRadius, curveRadius);
+            float leftStartX = cornerX(leftCorner.centerX(), curveRadius, leftStartAngle);
+            float leftStartY = cornerY(leftCorner.centerY(), curveRadius, leftStartAngle);
+            fullCurvePath.moveTo(halfStroke, bottomY);
+            fullCurvePath.lineTo(leftStartX, leftStartY);
+            fullCurvePath.arcTo(leftCorner, leftStartAngle, 270f - leftStartAngle);
+            fullCurvePath.lineTo(rightTopX, topY);
+
+            float rightEndAngle = rightCornerEndAngle(bottomY, outerRadius, curveRadius);
+            fullCurvePath.arcTo(rightCorner, 270f, rightEndAngle - 270f);
+            fullCurvePath.lineTo(width - halfStroke, bottomY);
         }
 
-        private float targetDistanceForHorizontalFraction(
-                float left,
-                float right,
-                float fullLength,
-                float fraction
-        ) {
-            if (fraction >= 1f) {
-                return fullLength;
+        private float resolveTopCornerRadius(float fallback) {
+            WindowInsets insets = getRootWindowInsets();
+            if (insets == null) {
+                return fallback;
             }
-            float horizontalSpan = right - left;
-            if (horizontalSpan <= 0f) {
-                return fullLength * fraction;
+            int leftRadius = roundedCornerRadius(insets, RoundedCorner.POSITION_TOP_LEFT);
+            int rightRadius = roundedCornerRadius(insets, RoundedCorner.POSITION_TOP_RIGHT);
+            if (leftRadius > 0 && rightRadius > 0) {
+                return Math.min(leftRadius, rightRadius);
             }
-            float targetHorizontal = horizontalSpan * fraction;
-            if (targetHorizontal <= 0f) {
-                return 0f;
+            if (leftRadius > 0 || rightRadius > 0) {
+                return Math.max(leftRadius, rightRadius);
             }
-            int steps = Math.max(32, Math.min(512, Math.round(fullLength / 2f)));
-            float previousDistance = 0f;
-            float previousX = left;
-            float accumulatedHorizontal = 0f;
-            for (int step = 1; step <= steps; step++) {
-                float distance = fullLength * step / steps;
-                if (!pathMeasure.getPosTan(distance, pathPoint, null)) {
-                    continue;
-                }
-                float dx = Math.abs(pathPoint[0] - previousX);
-                if (accumulatedHorizontal + dx >= targetHorizontal) {
-                    if (dx <= 0f) {
-                        return distance;
-                    }
-                    float ratio = (targetHorizontal - accumulatedHorizontal) / dx;
-                    return previousDistance + (distance - previousDistance) * ratio;
-                }
-                accumulatedHorizontal += dx;
-                previousDistance = distance;
-                previousX = pathPoint[0];
+            return 0f;
+        }
+
+        private int roundedCornerRadius(WindowInsets insets, int position) {
+            RoundedCorner corner = insets.getRoundedCorner(position);
+            return corner != null ? Math.max(0, corner.getRadius()) : 0;
+        }
+
+        private void buildSharpTopPath(int width, float topY, float bottomY, float halfStroke) {
+            fullCurvePath.moveTo(halfStroke, bottomY);
+            fullCurvePath.lineTo(halfStroke, topY);
+            fullCurvePath.lineTo(width - halfStroke, topY);
+            fullCurvePath.lineTo(width - halfStroke, bottomY);
+        }
+
+        private float leftCornerStartAngle(float bottomY, float outerRadius, float curveRadius) {
+            if (bottomY >= outerRadius) {
+                return 180f;
             }
-            return fullLength;
+            float ratio = Math.max(-1f, Math.min(1f, (outerRadius - bottomY) / curveRadius));
+            return 180f + (float) Math.toDegrees(Math.asin(ratio));
+        }
+
+        private float rightCornerEndAngle(float bottomY, float outerRadius, float curveRadius) {
+            if (bottomY >= outerRadius) {
+                return 360f;
+            }
+            float ratio = Math.max(-1f, Math.min(1f, (outerRadius - bottomY) / curveRadius));
+            return 360f - (float) Math.toDegrees(Math.asin(ratio));
+        }
+
+        private float cornerX(float centerX, float radius, float angleDegrees) {
+            return centerX + radius * (float) Math.cos(Math.toRadians(angleDegrees));
+        }
+
+        private float cornerY(float centerY, float radius, float angleDegrees) {
+            return centerY + radius * (float) Math.sin(Math.toRadians(angleDegrees));
         }
 
         private int resolveTop(BatteryBarGeometry geometry, int thickness, int height) {
diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/AppIconRules.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/AppIconRules.java
index cc12dc0..81ffbda 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/AppIconRules.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/AppIconRules.java
@@ -417,7 +417,7 @@ public final class AppIconRules {
                 continue;
             }
             String[] parts = entry.split("\\|", -1);
-            if (parts.length != 2 && parts.length != 4) {
+            if (parts.length != 4) {
                 continue;
             }
             String pkg = parts[0];
@@ -429,13 +429,8 @@ public final class AppIconRules {
             int lastSeenOffsetMinutes;
             try {
                 firstSeen = Long.parseLong(parts[1]);
-                if (parts.length == 4) {
-                    lastSeen = Long.parseLong(parts[2]);
-                    lastSeenOffsetMinutes = Integer.parseInt(parts[3]);
-                } else {
-                    lastSeen = firstSeen;
-                    lastSeenOffsetMinutes = currentTimezoneOffsetMinutes();
-                }
+                lastSeen = Long.parseLong(parts[2]);
+                lastSeenOffsetMinutes = Integer.parseInt(parts[3]);
             } catch (NumberFormatException ignored) {
                 continue;
             }
diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/BatteryBarGeometry.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/BatteryBarGeometry.java
index df8a53b..5eda403 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/BatteryBarGeometry.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/BatteryBarGeometry.java
@@ -21,11 +21,21 @@ public final class BatteryBarGeometry {
     public final String position;
     public final String alignment;
     public final int thicknessDp;
+    public final String curvedGeometryMode;
 
     public BatteryBarGeometry(
             String position,
             String alignment,
             int thicknessDp
+    ) {
+        this(position, alignment, thicknessDp, SbtDefaults.BATTERY_BAR_CURVED_GEOMETRY_MODE_DEFAULT);
+    }
+
+    public BatteryBarGeometry(
+            String position,
+            String alignment,
+            int thicknessDp,
+            String curvedGeometryMode
     ) {
         this.position = sanitizePosition(position);
         this.alignment = sanitizeAlignment(alignment);
@@ -33,6 +43,7 @@ public final class BatteryBarGeometry {
                 thicknessDp,
                 SbtDefaults.BATTERY_BAR_THICKNESS_DP_MIN,
                 SbtDefaults.BATTERY_BAR_THICKNESS_DP_MAX);
+        this.curvedGeometryMode = sanitizeCurvedGeometryMode(curvedGeometryMode);
     }
 
     public static BatteryBarGeometry global(SbtSettings settings) {
@@ -45,7 +56,8 @@ public final class BatteryBarGeometry {
         return new BatteryBarGeometry(
                 settings.batteryBarPosition,
                 settings.batteryBarAlignment,
-                settings.batteryBarThicknessDp);
+                settings.batteryBarThicknessDp,
+                settings.batteryBarCurvedGeometryMode);
     }
 
     public static BatteryBarGeometry resolve(
@@ -68,17 +80,18 @@ public final class BatteryBarGeometry {
             return safeFallback;
         }
         String[] parts = value.split("\\|", -1);
-        if (parts.length != 3 && parts.length != 4) {
+        if (parts.length != 4) {
             return safeFallback;
         }
         return new BatteryBarGeometry(
                 parts[0],
                 parts[1],
-                parseInt(parts[2], safeFallback.thicknessDp));
+                parseInt(parts[2], safeFallback.thicknessDp),
+                parts[3]);
     }
 
     public String encode() {
-        return position + "|" + alignment + "|" + thicknessDp;
+        return position + "|" + alignment + "|" + thicknessDp + "|" + curvedGeometryMode;
     }
 
     public String signature() {
@@ -104,6 +117,13 @@ public final class BatteryBarGeometry {
         return "ltr";
     }
 
+    private static String sanitizeCurvedGeometryMode(String mode) {
+        if ("length".equals(mode)) {
+            return "length";
+        }
+        return "off";
+    }
+
     private static int parseInt(String value, int fallback) {
         try {
             return Integer.parseInt(value);
diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/SbtSettings.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/SbtSettings.java
index 9a0cbd9..b7c9d9d 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/SbtSettings.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/SbtSettings.java
@@ -84,7 +84,6 @@ public final class SbtSettings {
     public static final String KEY_BATTERY_BAR_DEFAULT_CHARGE_COLOR = "battery_bar_default_charge_color";
     public static final String KEY_BATTERY_BAR_THRESHOLDS = "battery_bar_thresholds";
     public static final String BATTERY_BAR_CURVED_GEOMETRY_OFF = "off";
-    public static final String BATTERY_BAR_CURVED_GEOMETRY_HORIZONTAL = "horizontal";
     public static final String BATTERY_BAR_CURVED_GEOMETRY_LENGTH = "length";
     public static final String KEY_CLOCK_ENABLED = "clock_enabled";
     public static final String KEY_CLOCK_ENABLED_LOCKSCREEN = "clock_enabled_lockscreen";
@@ -173,7 +172,6 @@ public final class SbtSettings {
     public static final String KEY_LAYOUT_STATUS_VERTICAL_OFFSET_PX = "layout_status_vertical_offset_px";
     public static final String KEY_LAYOUT_STATUS_ICON_HEIGHT_STEPS = "layout_status_icon_height_steps";
     public static final String KEY_SYSTEM_ICON_BLOCKED_MODES = SystemIconRules.PREF_KEY_BLOCKED_MODES;
-    public static final String KEY_SYSTEM_ICON_HIDE_SLOTS = "system_icon_hide_slots";
     public static final String KEY_SYSTEM_ICON_DUAL_SIM_SIGNAL_MODE = "system_icon_dual_sim_signal_mode";
     public static final String SYSTEM_ICON_DUAL_SIM_SEPARATE = "separate";
     public static final String SYSTEM_ICON_DUAL_SIM_FIRST = "first";
@@ -1017,8 +1015,7 @@ public final class SbtSettings {
     }
 
     public static String readBatteryBarCurvedGeometryMode(String mode) {
-        if (BATTERY_BAR_CURVED_GEOMETRY_HORIZONTAL.equals(mode)
-                || BATTERY_BAR_CURVED_GEOMETRY_LENGTH.equals(mode)) {
+        if (BATTERY_BAR_CURVED_GEOMETRY_LENGTH.equals(mode)) {
             return mode;
         }
         return BATTERY_BAR_CURVED_GEOMETRY_OFF;
@@ -1316,9 +1313,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         prefs,
                         KEY_LAYOUT_NOTIF_UNLOCKED_COUNT,
-                        KEY_LAYOUT_NOTIF_ENABLED_UNLOCKED,
-                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_NOTIF_ENABLED_UNLOCKED_DEFAULT),
+                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromPrefs(
                         prefs,
                         SbtSettings::layoutNotifPositionKey,
@@ -1334,9 +1329,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         prefs,
                         KEY_LAYOUT_NOTIF_LOCK_COUNT,
-                        KEY_LAYOUT_NOTIF_ENABLED_LOCKSCREEN,
-                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_NOTIF_ENABLED_LOCKSCREEN_DEFAULT),
+                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromPrefs(
                         prefs,
                         SbtSettings::layoutLockNotifPositionKey,
@@ -1352,9 +1345,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         prefs,
                         KEY_LAYOUT_NOTIF_AOD_COUNT,
-                        KEY_LAYOUT_NOTIF_ENABLED_AOD,
-                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_NOTIF_ENABLED_AOD_DEFAULT),
+                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromPrefs(
                         prefs,
                         SbtSettings::layoutAodNotifPositionKey,
@@ -1391,9 +1382,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         prefs,
                         KEY_LAYOUT_STATUS_UNLOCKED_COUNT,
-                        KEY_LAYOUT_STATUS_ENABLED_UNLOCKED,
-                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_STATUS_ENABLED_UNLOCKED_DEFAULT),
+                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromPrefs(
                         prefs,
                         SbtSettings::layoutStatusPositionKey,
@@ -1409,9 +1398,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         prefs,
                         KEY_LAYOUT_STATUS_LOCK_COUNT,
-                        KEY_LAYOUT_STATUS_ENABLED_LOCKSCREEN,
-                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_STATUS_ENABLED_LOCKSCREEN_DEFAULT),
+                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromPrefs(
                         prefs,
                         SbtSettings::layoutLockStatusPositionKey,
@@ -1427,9 +1414,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         prefs,
                         KEY_LAYOUT_STATUS_AOD_COUNT,
-                        KEY_LAYOUT_STATUS_ENABLED_AOD,
-                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_STATUS_ENABLED_AOD_DEFAULT),
+                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromPrefs(
                         prefs,
                         SbtSettings::layoutAodStatusPositionKey,
@@ -1635,9 +1620,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         bundle,
                         KEY_LAYOUT_NOTIF_UNLOCKED_COUNT,
-                        KEY_LAYOUT_NOTIF_ENABLED_UNLOCKED,
-                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_NOTIF_ENABLED_UNLOCKED_DEFAULT),
+                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromBundle(
                         bundle,
                         SbtSettings::layoutNotifPositionKey,
@@ -1653,9 +1636,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         bundle,
                         KEY_LAYOUT_NOTIF_LOCK_COUNT,
-                        KEY_LAYOUT_NOTIF_ENABLED_LOCKSCREEN,
-                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_NOTIF_ENABLED_LOCKSCREEN_DEFAULT),
+                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromBundle(
                         bundle,
                         SbtSettings::layoutLockNotifPositionKey,
@@ -1671,9 +1652,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         bundle,
                         KEY_LAYOUT_NOTIF_AOD_COUNT,
-                        KEY_LAYOUT_NOTIF_ENABLED_AOD,
-                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_NOTIF_ENABLED_AOD_DEFAULT),
+                        SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromBundle(
                         bundle,
                         SbtSettings::layoutAodNotifPositionKey,
@@ -1710,9 +1689,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         bundle,
                         KEY_LAYOUT_STATUS_UNLOCKED_COUNT,
-                        KEY_LAYOUT_STATUS_ENABLED_UNLOCKED,
-                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_STATUS_ENABLED_UNLOCKED_DEFAULT),
+                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromBundle(
                         bundle,
                         SbtSettings::layoutStatusPositionKey,
@@ -1728,9 +1705,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         bundle,
                         KEY_LAYOUT_STATUS_LOCK_COUNT,
-                        KEY_LAYOUT_STATUS_ENABLED_LOCKSCREEN,
-                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_STATUS_ENABLED_LOCKSCREEN_DEFAULT),
+                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromBundle(
                         bundle,
                         SbtSettings::layoutLockStatusPositionKey,
@@ -1746,9 +1721,7 @@ public final class SbtSettings {
                 readIconContainerCount(
                         bundle,
                         KEY_LAYOUT_STATUS_AOD_COUNT,
-                        KEY_LAYOUT_STATUS_ENABLED_AOD,
-                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT,
-                        SbtDefaults.LAYOUT_STATUS_ENABLED_AOD_DEFAULT),
+                        SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT),
                 readStringArrayFromBundle(
                         bundle,
                         SbtSettings::layoutAodStatusPositionKey,
@@ -1822,35 +1795,21 @@ public final class SbtSettings {
     private static int readIconContainerCount(
             SharedPreferences prefs,
             String countKey,
-            String legacyEnabledKey,
-            int defaultCount,
-            boolean legacyEnabledDefault
+            int defaultCount
     ) {
-        int fallback = iconContainerCountFallback(
-                prefs.getBoolean(legacyEnabledKey, legacyEnabledDefault),
-                defaultCount);
-        int value = prefs.getInt(countKey, fallback);
+        int value = prefs.getInt(countKey, defaultCount);
         return clampIconContainerCount(value);
     }
 
     private static int readIconContainerCount(
             Bundle bundle,
             String countKey,
-            String legacyEnabledKey,
-            int defaultCount,
-            boolean legacyEnabledDefault
+            int defaultCount
     ) {
-        int fallback = iconContainerCountFallback(
-                bundle.getBoolean(legacyEnabledKey, legacyEnabledDefault),
-                defaultCount);
-        int value = bundle.getInt(countKey, fallback);
+        int value = bundle.getInt(countKey, defaultCount);
         return clampIconContainerCount(value);
     }
 
-    private static int iconContainerCountFallback(boolean legacyEnabled, int defaultCount) {
-        return legacyEnabled ? defaultCount : 0;
-    }
-
     private static String[] readStringArrayFromPrefs(
             SharedPreferences prefs,
             IndexedKey key,
@@ -2035,9 +1994,7 @@ public final class SbtSettings {
         }
         Map<String, Integer> parsed = SystemIconRules.parseBlockedModes(
                 readStringSetFromPrefs(prefs, KEY_SYSTEM_ICON_BLOCKED_MODES));
-        HashMap<String, Integer> merged = new HashMap<>(parsed);
-        mergeLegacySystemIconHidden(merged, readStringSetFromPrefs(prefs, KEY_SYSTEM_ICON_HIDE_SLOTS));
-        return merged.isEmpty() ? Collections.emptyMap() : merged;
+        return parsed.isEmpty() ? Collections.emptyMap() : parsed;
     }
 
     private static Map<String, Integer> readSystemIconBlockedModesFromBundle(Bundle bundle) {
@@ -2046,20 +2003,7 @@ public final class SbtSettings {
         }
         Map<String, Integer> parsed = SystemIconRules.parseBlockedModes(
                 readStringSetFromBundle(bundle, KEY_SYSTEM_ICON_BLOCKED_MODES));
-        HashMap<String, Integer> merged = new HashMap<>(parsed);
-        mergeLegacySystemIconHidden(merged, readStringSetFromBundle(bundle, KEY_SYSTEM_ICON_HIDE_SLOTS));
-        return merged.isEmpty() ? Collections.emptyMap() : merged;
-    }
-
-    private static void mergeLegacySystemIconHidden(HashMap<String, Integer> merged, Set<String> legacyHidden) {
-        if (merged == null || legacyHidden == null || legacyHidden.isEmpty()) {
-            return;
-        }
-        for (String slot : legacyHidden) {
-            SystemIconRules.setModeBlocked(merged, slot,
-                    SystemIconRules.MODE_AOD | SystemIconRules.MODE_LOCK | SystemIconRules.MODE_UNLOCK,
-                    true);
-        }
+        return parsed.isEmpty() ? Collections.emptyMap() : parsed;
     }
 
     public static void ensureReadable(Context context) {
diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/SbtSettingsProvider.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/SbtSettingsProvider.java
index 2ec312e..a65372e 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/SbtSettingsProvider.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/settings/SbtSettingsProvider.java
@@ -261,11 +261,7 @@ public class SbtSettingsProvider extends ContentProvider {
                             SbtDefaults.LAYOUT_NOTIF_ENABLED_UNLOCKED_DEFAULT));
             out.putInt(SbtSettings.KEY_LAYOUT_NOTIF_UNLOCKED_COUNT,
                     prefs.getInt(SbtSettings.KEY_LAYOUT_NOTIF_UNLOCKED_COUNT,
-                            prefs.getBoolean(
-                                    SbtSettings.KEY_LAYOUT_NOTIF_ENABLED_UNLOCKED,
-                                    SbtDefaults.LAYOUT_NOTIF_ENABLED_UNLOCKED_DEFAULT)
-                                    ? SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT
-                                    : 0));
+                            SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT));
             out.putString(SbtSettings.KEY_LAYOUT_NOTIF_MIDDLE_SIDE,
                     prefs.getString(SbtSettings.KEY_LAYOUT_NOTIF_MIDDLE_SIDE,
                             SbtDefaults.LAYOUT_NOTIF_MIDDLE_SIDE_DEFAULT));
@@ -286,11 +282,7 @@ public class SbtSettingsProvider extends ContentProvider {
                     SbtDefaults.LAYOUT_NOTIF_VERTICAL_OFFSET_PX_DEFAULT);
             out.putInt(SbtSettings.KEY_LAYOUT_NOTIF_LOCK_COUNT,
                     prefs.getInt(SbtSettings.KEY_LAYOUT_NOTIF_LOCK_COUNT,
-                            prefs.getBoolean(
-                                    SbtSettings.KEY_LAYOUT_NOTIF_ENABLED_LOCKSCREEN,
-                                    SbtDefaults.LAYOUT_NOTIF_ENABLED_LOCKSCREEN_DEFAULT)
-                                    ? SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT
-                                    : 0));
+                            SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT));
             out.putInt(SbtSettings.layoutLockNotifIconHeightKey(),
                     prefs.getInt(SbtSettings.layoutLockNotifIconHeightKey(),
                             SbtDefaults.LAYOUT_NOTIF_LOCK_ICON_HEIGHT_STEPS_DEFAULT));
@@ -305,11 +297,7 @@ public class SbtSettingsProvider extends ContentProvider {
                     SbtDefaults.LAYOUT_NOTIF_VERTICAL_OFFSET_PX_DEFAULT);
             out.putInt(SbtSettings.KEY_LAYOUT_NOTIF_AOD_COUNT,
                     prefs.getInt(SbtSettings.KEY_LAYOUT_NOTIF_AOD_COUNT,
-                            prefs.getBoolean(
-                                    SbtSettings.KEY_LAYOUT_NOTIF_ENABLED_AOD,
-                                    SbtDefaults.LAYOUT_NOTIF_ENABLED_AOD_DEFAULT)
-                                    ? SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT
-                                    : 0));
+                            SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT));
             out.putInt(SbtSettings.layoutAodNotifIconHeightKey(),
                     prefs.getInt(SbtSettings.layoutAodNotifIconHeightKey(),
                             SbtDefaults.LAYOUT_NOTIF_AOD_ICON_HEIGHT_STEPS_DEFAULT));
@@ -336,11 +324,7 @@ public class SbtSettingsProvider extends ContentProvider {
                             SbtDefaults.LAYOUT_STATUS_ENABLED_UNLOCKED_DEFAULT));
             out.putInt(SbtSettings.KEY_LAYOUT_STATUS_UNLOCKED_COUNT,
                     prefs.getInt(SbtSettings.KEY_LAYOUT_STATUS_UNLOCKED_COUNT,
-                            prefs.getBoolean(
-                                    SbtSettings.KEY_LAYOUT_STATUS_ENABLED_UNLOCKED,
-                                    SbtDefaults.LAYOUT_STATUS_ENABLED_UNLOCKED_DEFAULT)
-                                    ? SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT
-                                    : 0));
+                            SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT));
             out.putString(SbtSettings.KEY_LAYOUT_STATUS_MIDDLE_SIDE,
                     prefs.getString(SbtSettings.KEY_LAYOUT_STATUS_MIDDLE_SIDE,
                             SbtDefaults.LAYOUT_STATUS_MIDDLE_SIDE_DEFAULT));
@@ -365,11 +349,7 @@ public class SbtSettingsProvider extends ContentProvider {
                             SbtDefaults.SYSTEM_ICON_DUAL_SIM_SIGNAL_MODE_DEFAULT)));
             out.putInt(SbtSettings.KEY_LAYOUT_STATUS_LOCK_COUNT,
                     prefs.getInt(SbtSettings.KEY_LAYOUT_STATUS_LOCK_COUNT,
-                            prefs.getBoolean(
-                                    SbtSettings.KEY_LAYOUT_STATUS_ENABLED_LOCKSCREEN,
-                                    SbtDefaults.LAYOUT_STATUS_ENABLED_LOCKSCREEN_DEFAULT)
-                                    ? SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT
-                                    : 0));
+                            SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT));
             out.putInt(SbtSettings.layoutLockStatusIconHeightKey(),
                     prefs.getInt(SbtSettings.layoutLockStatusIconHeightKey(),
                             SbtDefaults.LAYOUT_STATUS_ICON_HEIGHT_STEPS_DEFAULT));
@@ -384,11 +364,7 @@ public class SbtSettingsProvider extends ContentProvider {
                     SbtDefaults.LAYOUT_STATUS_VERTICAL_OFFSET_PX_DEFAULT);
             out.putInt(SbtSettings.KEY_LAYOUT_STATUS_AOD_COUNT,
                     prefs.getInt(SbtSettings.KEY_LAYOUT_STATUS_AOD_COUNT,
-                            prefs.getBoolean(
-                                    SbtSettings.KEY_LAYOUT_STATUS_ENABLED_AOD,
-                                    SbtDefaults.LAYOUT_STATUS_ENABLED_AOD_DEFAULT)
-                                    ? SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT
-                                    : 0));
+                            SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT));
             out.putInt(SbtSettings.layoutAodStatusIconHeightKey(),
                     prefs.getInt(SbtSettings.layoutAodStatusIconHeightKey(),
                             SbtDefaults.LAYOUT_STATUS_ICON_HEIGHT_STEPS_DEFAULT));
@@ -403,7 +379,6 @@ public class SbtSettingsProvider extends ContentProvider {
                     SbtDefaults.LAYOUT_STATUS_VERTICAL_OFFSET_PX_DEFAULT);
             putStringSetArrayList(out, prefs, SbtSettings.KEY_CLOCK_CAMERA_TYPE_OVERRIDES);
             putStringSetArrayList(out, prefs, SbtSettings.KEY_SYSTEM_ICON_BLOCKED_MODES);
-            putStringSetArrayList(out, prefs, SbtSettings.KEY_SYSTEM_ICON_HIDE_SLOTS);
             out.putBoolean(SbtSettings.KEY_STATUS_CHIPS_HIDE_ALL,
                     prefs.getBoolean(SbtSettings.KEY_STATUS_CHIPS_HIDE_ALL, false));
             out.putBoolean(SbtSettings.KEY_STATUS_CHIPS_HIDE_MEDIA_UNLOCKED,
diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/BatteryBarFragment.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/BatteryBarFragment.java
index be64d06..cd88156 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/BatteryBarFragment.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/BatteryBarFragment.java
@@ -56,6 +56,7 @@ public final class BatteryBarFragment extends Fragment {
                 .getSharedPreferences(SbtSettings.PREFS_NAME, Context.MODE_PRIVATE);
 
         SwitchMaterial enabled = root.findViewById(R.id.battery_bar_enabled_switch);
+        RadioButton positionFollow = root.findViewById(R.id.battery_bar_curved_geometry_length);
         RadioButton positionTop = root.findViewById(R.id.battery_bar_position_top);
         RadioButton positionBottom = root.findViewById(R.id.battery_bar_position_bottom);
         RadioGroup positionGroup = root.findViewById(R.id.battery_bar_position_group);
@@ -71,11 +72,6 @@ public final class BatteryBarFragment extends Fragment {
         EditText edgeOffsetInput = root.findViewById(R.id.battery_bar_edge_offset_input);
         MaterialButton edgeOffsetMinus = root.findViewById(R.id.battery_bar_edge_offset_minus);
         MaterialButton edgeOffsetPlus = root.findViewById(R.id.battery_bar_edge_offset_plus);
-        RadioGroup curvedGeometryGroup = root.findViewById(R.id.battery_bar_curved_geometry_group);
-        RadioButton curvedGeometryOff = root.findViewById(R.id.battery_bar_curved_geometry_off);
-        RadioButton curvedGeometryHorizontal =
-                root.findViewById(R.id.battery_bar_curved_geometry_horizontal);
-        RadioButton curvedGeometryLength = root.findViewById(R.id.battery_bar_curved_geometry_length);
         MaterialButton minLevelMinus = root.findViewById(R.id.battery_bar_min_level_minus);
         MaterialButton minLevelPlus = root.findViewById(R.id.battery_bar_min_level_plus);
         MaterialButton maxLevelMinus = root.findViewById(R.id.battery_bar_max_level_minus);
@@ -105,11 +101,15 @@ public final class BatteryBarFragment extends Fragment {
                 SbtSettings.KEY_BATTERY_BAR_ENABLED,
                 SbtDefaults.BATTERY_BAR_ENABLED_DEFAULT));
         applyPositionSelection(
+                positionFollow,
                 positionTop,
                 positionBottom,
                 prefs.getString(
                         SbtSettings.KEY_BATTERY_BAR_POSITION,
-                        SbtDefaults.BATTERY_BAR_POSITION_DEFAULT));
+                        SbtDefaults.BATTERY_BAR_POSITION_DEFAULT),
+                prefs.getString(
+                        SbtSettings.KEY_BATTERY_BAR_CURVED_GEOMETRY_MODE,
+                        SbtDefaults.BATTERY_BAR_CURVED_GEOMETRY_MODE_DEFAULT));
         applyAlignmentSelection(
                 alignLtr,
                 alignRtl,
@@ -123,13 +123,6 @@ public final class BatteryBarFragment extends Fragment {
         setIntInput(edgeOffsetInput, prefs.getInt(
                 SbtSettings.KEY_BATTERY_BAR_EDGE_OFFSET_DP,
                 SbtDefaults.BATTERY_BAR_EDGE_OFFSET_DP_DEFAULT));
-        applyCurvedGeometrySelection(
-                curvedGeometryOff,
-                curvedGeometryHorizontal,
-                curvedGeometryLength,
-                prefs.getString(
-                        SbtSettings.KEY_BATTERY_BAR_CURVED_GEOMETRY_MODE,
-                        SbtDefaults.BATTERY_BAR_CURVED_GEOMETRY_MODE_DEFAULT));
         setMapping(
                 prefs.getInt(SbtSettings.KEY_BATTERY_BAR_MIN_LEVEL, SbtDefaults.BATTERY_BAR_MIN_LEVEL_DEFAULT),
                 prefs.getInt(SbtSettings.KEY_BATTERY_BAR_MAX_LEVEL, SbtDefaults.BATTERY_BAR_MAX_LEVEL_DEFAULT),
@@ -167,6 +160,9 @@ public final class BatteryBarFragment extends Fragment {
         positionGroup.setOnCheckedChangeListener((group, checkedId) -> {
             prefs.edit()
                     .putString(SbtSettings.KEY_BATTERY_BAR_POSITION, positionValue(checkedId))
+                    .putString(
+                            SbtSettings.KEY_BATTERY_BAR_CURVED_GEOMETRY_MODE,
+                            curvedGeometryValue(checkedId))
                     .apply();
             SbtSettings.ensureReadable(requireContext());
         });
@@ -196,16 +192,6 @@ public final class BatteryBarFragment extends Fragment {
                 SbtDefaults.BATTERY_BAR_EDGE_OFFSET_DP_MIN,
                 SbtDefaults.BATTERY_BAR_EDGE_OFFSET_DP_MAX,
                 SbtDefaults.BATTERY_BAR_EDGE_OFFSET_DP_DEFAULT);
-        if (curvedGeometryGroup != null) {
-            curvedGeometryGroup.setOnCheckedChangeListener((group, checkedId) -> {
-                prefs.edit()
-                        .putString(
-                                SbtSettings.KEY_BATTERY_BAR_CURVED_GEOMETRY_MODE,
-                                curvedGeometryValue(checkedId))
-                        .apply();
-                SbtSettings.ensureReadable(requireContext());
-            });
-        }
         renderScenarioOverrides(scenarioOverridesContainer, prefs);
         setSectionEnabled(geometrySection, enabled.isChecked());
 
@@ -634,7 +620,7 @@ public final class BatteryBarFragment extends Fragment {
         if (summary != null) {
             summary.setText(getString(
                     R.string.battery_bar_override_summary,
-                    geometry.position,
+                    batteryBarPositionLabel(geometry),
                     geometry.alignment,
                     geometry.thicknessDp));
             summary.setAlpha(enabled ? 1f : 0.65f);
@@ -666,7 +652,10 @@ public final class BatteryBarFragment extends Fragment {
                         SbtDefaults.BATTERY_BAR_ALIGNMENT_DEFAULT),
                 prefs.getInt(
                         SbtSettings.KEY_BATTERY_BAR_THICKNESS_DP,
-                        SbtDefaults.BATTERY_BAR_THICKNESS_DP_DEFAULT));
+                        SbtDefaults.BATTERY_BAR_THICKNESS_DP_DEFAULT),
+                prefs.getString(
+                        SbtSettings.KEY_BATTERY_BAR_CURVED_GEOMETRY_MODE,
+                        SbtDefaults.BATTERY_BAR_CURVED_GEOMETRY_MODE_DEFAULT));
     }
 
     private BatteryBarGeometry scenarioGeometryFromPrefs(
@@ -708,11 +697,17 @@ public final class BatteryBarFragment extends Fragment {
         TextView positionTitle = dialogLabel(R.string.battery_bar_position_title);
         content.addView(positionTitle);
         RadioGroup positionGroup = new RadioGroup(requireContext());
+        RadioButton positionFollow = dialogRadio(R.string.battery_bar_curved_geometry_length);
         RadioButton positionTop = dialogRadio(R.string.battery_bar_position_top);
         RadioButton positionBottom = dialogRadio(R.string.battery_bar_position_bottom);
+        positionFollow.setId(R.id.battery_bar_curved_geometry_length);
+        positionTop.setId(R.id.battery_bar_position_top);
+        positionBottom.setId(R.id.battery_bar_position_bottom);
+        positionGroup.addView(positionFollow);
         positionGroup.addView(positionTop);
         positionGroup.addView(positionBottom);
-        applyPositionSelection(positionTop, positionBottom, current.position);
+        applyPositionSelection(positionFollow, positionTop, positionBottom,
+                current.position, current.curvedGeometryMode);
         content.addView(positionGroup);
 
         TextView alignmentTitle = dialogLabel(R.string.battery_bar_alignment_title);
@@ -737,15 +732,17 @@ public final class BatteryBarFragment extends Fragment {
                 .setView(content)
                 .setNegativeButton(android.R.string.cancel, null)
                 .setPositiveButton(android.R.string.ok, (dialogInterface, which) -> {
+                    int checkedPosition = positionGroup.getCheckedRadioButtonId();
                     BatteryBarGeometry updated = new BatteryBarGeometry(
-                            positionBottom.isChecked() ? "bottom" : "top",
+                            positionValue(checkedPosition),
                             alignmentRtl.isChecked()
                                     ? "rtl"
                                     : alignmentCenter.isChecked() ? "center" : "ltr",
                             ViewTreeSupport.clamp(
                                     ViewTreeSupport.parseInt(thicknessInput, current.thicknessDp),
                                     SbtDefaults.BATTERY_BAR_THICKNESS_DP_MIN,
-                                    SbtDefaults.BATTERY_BAR_THICKNESS_DP_MAX));
+                                    SbtDefaults.BATTERY_BAR_THICKNESS_DP_MAX),
+                            curvedGeometryValue(checkedPosition));
                     SharedPreferences.Editor editor = prefs.edit();
                     for (BatteryBarGeometry.Scenario scenario : scenarioGroup.scenarios()) {
                         editor.putString(BatteryBarGeometry.valueKey(scenario), updated.encode());
@@ -1255,14 +1252,23 @@ public final class BatteryBarFragment extends Fragment {
         }
     }
 
-    private void applyPositionSelection(RadioButton top,
+    private void applyPositionSelection(RadioButton follow,
+                                        RadioButton top,
                                         RadioButton bottom,
-                                        String position) {
+                                        String position,
+                                        String curvedGeometryMode) {
+        boolean bottomSelected = "bottom".equals(position);
+        boolean followSelected = !bottomSelected
+                && SbtSettings.BATTERY_BAR_CURVED_GEOMETRY_LENGTH.equals(
+                        SbtSettings.readBatteryBarCurvedGeometryMode(curvedGeometryMode));
+        if (follow != null) {
+            follow.setChecked(followSelected);
+        }
         if (top != null) {
-            top.setChecked(!"bottom".equals(position));
+            top.setChecked(!bottomSelected && !followSelected);
         }
         if (bottom != null) {
-            bottom.setChecked("bottom".equals(position));
+            bottom.setChecked(bottomSelected);
         }
     }
 
@@ -1273,29 +1279,19 @@ public final class BatteryBarFragment extends Fragment {
         return "top";
     }
 
-    private void applyCurvedGeometrySelection(
-            RadioButton off,
-            RadioButton horizontal,
-            RadioButton length,
-            String mode
-    ) {
-        String safeMode = SbtSettings.readBatteryBarCurvedGeometryMode(mode);
-        if (off != null) {
-            off.setChecked(SbtSettings.BATTERY_BAR_CURVED_GEOMETRY_OFF.equals(safeMode));
+    private String batteryBarPositionLabel(BatteryBarGeometry geometry) {
+        if (geometry != null && "bottom".equals(geometry.position)) {
+            return getString(R.string.battery_bar_position_bottom);
         }
-        if (horizontal != null) {
-            horizontal.setChecked(
-                    SbtSettings.BATTERY_BAR_CURVED_GEOMETRY_HORIZONTAL.equals(safeMode));
-        }
-        if (length != null) {
-            length.setChecked(SbtSettings.BATTERY_BAR_CURVED_GEOMETRY_LENGTH.equals(safeMode));
+        if (geometry != null
+                && SbtSettings.BATTERY_BAR_CURVED_GEOMETRY_LENGTH.equals(
+                        geometry.curvedGeometryMode)) {
+            return getString(R.string.battery_bar_curved_geometry_length);
         }
+        return getString(R.string.battery_bar_position_top);
     }
 
     private String curvedGeometryValue(int checkedId) {
-        if (checkedId == R.id.battery_bar_curved_geometry_horizontal) {
-            return SbtSettings.BATTERY_BAR_CURVED_GEOMETRY_HORIZONTAL;
-        }
         if (checkedId == R.id.battery_bar_curved_geometry_length) {
             return SbtSettings.BATTERY_BAR_CURVED_GEOMETRY_LENGTH;
         }
diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/LayoutFragment.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/LayoutFragment.java
index 4700125..74e8b03 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/LayoutFragment.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/LayoutFragment.java
@@ -148,8 +148,6 @@ public final class LayoutFragment extends Fragment {
                 R.string.layout_notification_position_title,
                 SbtSettings.KEY_LAYOUT_NOTIF_UNLOCKED_COUNT,
                 SbtDefaults.LAYOUT_NOTIF_UNLOCKED_COUNT_DEFAULT,
-                SbtSettings.KEY_LAYOUT_NOTIF_ENABLED_UNLOCKED,
-                SbtDefaults.LAYOUT_NOTIF_ENABLED_UNLOCKED_DEFAULT,
                 SbtSettings::layoutNotifPositionKey,
                 SbtSettings::layoutNotifMiddleSideKey,
                 SbtSettings::layoutNotifVerticalOffsetKey,
@@ -166,8 +164,6 @@ public final class LayoutFragment extends Fragment {
                 R.string.layout_status_position_title,
                 SbtSettings.KEY_LAYOUT_STATUS_UNLOCKED_COUNT,
                 SbtDefaults.LAYOUT_STATUS_UNLOCKED_COUNT_DEFAULT,
-                SbtSettings.KEY_LAYOUT_STATUS_ENABLED_UNLOCKED,
-                SbtDefaults.LAYOUT_STATUS_ENABLED_UNLOCKED_DEFAULT,
                 SbtSettings::layoutStatusPositionKey,
                 SbtSettings::layoutStatusMiddleSideKey,
                 SbtSettings::layoutStatusVerticalOffsetKey,
@@ -187,8 +183,6 @@ public final class LayoutFragment extends Fragment {
             int sectionTitleId,
             String countKey,
             int countDefault,
-            String legacyEnabledKey,
-            boolean legacyEnabledDefault,
             SbtSettings.IndexedKey positionKey,
             SbtSettings.IndexedKey middleSideKey,
             SbtSettings.IndexedKey verticalOffsetKey,
@@ -223,9 +217,7 @@ public final class LayoutFragment extends Fragment {
             int count = ViewTreeSupport.iconContainerCount(
                     prefs,
                     countKey,
-                    legacyEnabledKey,
-                    countDefault,
-                    legacyEnabledDefault);
+                    countDefault);
             LayoutXmlCardSupport.setIndexedCardTitle(requireContext(), sourceCard, sectionTitleId, 0, count);
             setCompatPadding(sourceCard, count <= 1);
             boolean cardsMode = LockedNotificationModeUi.MODE_CARDS.equals(
@@ -242,12 +234,11 @@ public final class LayoutFragment extends Fragment {
             countContainer.addView(ViewTreeSupport.iconContainerCountControl(
                     requireContext(),
                     count,
-                    value -> ViewTreeSupport.persistIconContainerCount(
-                            requireContext(),
-                            prefs,
-                            countKey,
-                            legacyEnabledKey,
-                            value),
+                            value -> ViewTreeSupport.persistIconContainerCount(
+                                    requireContext(),
+                                    prefs,
+                                    countKey,
+                                    value),
                     () -> {
                         if (rebuild[0] != null) {
                             rebuild[0].run();
diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/LockedSceneLayoutFragment.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/LockedSceneLayoutFragment.java
index 5795642..956e450 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/LockedSceneLayoutFragment.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/LockedSceneLayoutFragment.java
@@ -173,8 +173,6 @@ abstract class LockedSceneLayoutFragment extends Fragment {
                 R.id.status_vertical_offset_plus_fast,
                 R.id.status_vertical_offset_reset,
                 R.string.layout_status_position_title,
-                aod ? SbtSettings.KEY_LAYOUT_STATUS_ENABLED_AOD : SbtSettings.KEY_LAYOUT_STATUS_ENABLED_LOCKSCREEN,
-                aod ? SbtDefaults.LAYOUT_STATUS_ENABLED_AOD_DEFAULT : SbtDefaults.LAYOUT_STATUS_ENABLED_LOCKSCREEN_DEFAULT,
                 SbtDefaults.LAYOUT_STATUS_POSITION_DEFAULT,
                 SbtDefaults.LAYOUT_STATUS_MIDDLE_SIDE_DEFAULT,
                 SbtDefaults.LAYOUT_STATUS_VERTICAL_OFFSET_PX_DEFAULT,
@@ -205,8 +203,6 @@ abstract class LockedSceneLayoutFragment extends Fragment {
                     R.id.notif_vertical_offset_plus_fast,
                     R.id.notif_vertical_offset_reset,
                     R.string.layout_notification_position_title,
-                    aod ? SbtSettings.KEY_LAYOUT_NOTIF_ENABLED_AOD : SbtSettings.KEY_LAYOUT_NOTIF_ENABLED_LOCKSCREEN,
-                    aod ? SbtDefaults.LAYOUT_NOTIF_ENABLED_AOD_DEFAULT : SbtDefaults.LAYOUT_NOTIF_ENABLED_LOCKSCREEN_DEFAULT,
                     SbtDefaults.LAYOUT_NOTIF_POSITION_DEFAULT,
                     SbtDefaults.LAYOUT_NOTIF_MIDDLE_SIDE_DEFAULT,
                     SbtDefaults.LAYOUT_NOTIF_VERTICAL_OFFSET_PX_DEFAULT,
@@ -305,8 +301,6 @@ abstract class LockedSceneLayoutFragment extends Fragment {
             int verticalPlusFastId,
             int verticalResetId,
             int titleId,
-            String legacyEnabledKey,
-            boolean legacyEnabledDefault,
             String positionDefault,
             String middleSideDefault,
             int verticalOffsetDefault,
@@ -324,9 +318,7 @@ abstract class LockedSceneLayoutFragment extends Fragment {
             int count = ViewTreeSupport.iconContainerCount(
                     prefs,
                     countKey,
-                    legacyEnabledKey,
-                    1,
-                    legacyEnabledDefault);
+                    1);
             View primary = configuredIconContainerCard(
                     context,
                     prefs,
@@ -354,7 +346,6 @@ abstract class LockedSceneLayoutFragment extends Fragment {
                     verticalOffsetDefault,
                     iconHeightKey,
                     iconHeightDefault,
-                    legacyEnabledKey,
                     countKey,
                     count,
                     rebuild[0]);
@@ -390,7 +381,6 @@ abstract class LockedSceneLayoutFragment extends Fragment {
                         null,
                         0,
                         null,
-                        null,
                         count,
                         null);
                 setTopMargin(context, copy, 0);
@@ -452,7 +442,6 @@ abstract class LockedSceneLayoutFragment extends Fragment {
             int verticalOffsetDefault,
             @Nullable String iconHeightKey,
             int iconHeightDefault,
-            @Nullable String legacyEnabledKey,
             @Nullable String countKey,
             int count,
             @Nullable Runnable onCountChanged
@@ -470,7 +459,6 @@ abstract class LockedSceneLayoutFragment extends Fragment {
                                     context,
                                     prefs,
                                     countKey,
-                                    legacyEnabledKey,
                                     value),
                             onCountChanged),
                     insertIndex);
diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/SystemIconsFragment.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/SystemIconsFragment.java
index deedf44..7efad6d 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/SystemIconsFragment.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/SystemIconsFragment.java
@@ -477,8 +477,6 @@ public class SystemIconsFragment extends Fragment {
         Set<String> encoded = SystemIconRules.encodeBlockedModes(blockedModes);
         prefs.edit()
                 .putStringSet(SbtSettings.KEY_SYSTEM_ICON_BLOCKED_MODES, encoded)
-                // Clear legacy key so migration does not keep re-forcing stale global hides.
-                .putStringSet(SbtSettings.KEY_SYSTEM_ICON_HIDE_SLOTS, Collections.emptySet())
                 .apply();
         SbtSettings.ensureReadable(requireContext());
     }
diff --git a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/ViewTreeSupport.java b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/ViewTreeSupport.java
index f7263a6..a34d524 100644
--- a/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/ViewTreeSupport.java
+++ b/app/src/main/java/se/ajpanton/statusbartweak/shell/ui/ViewTreeSupport.java
@@ -238,25 +238,20 @@ final class ViewTreeSupport {
     static int iconContainerCount(
             SharedPreferences prefs,
             String countKey,
-            String legacyEnabledKey,
-            int defaultCount,
-            boolean legacyEnabledDefault
+            int defaultCount
     ) {
-        int fallback = prefs.getBoolean(legacyEnabledKey, legacyEnabledDefault) ? defaultCount : 0;
-        return SbtSettings.clampIconContainerCount(prefs.getInt(countKey, fallback));
+        return SbtSettings.clampIconContainerCount(prefs.getInt(countKey, defaultCount));
     }
 
     static void persistIconContainerCount(
             Context context,
             SharedPreferences prefs,
             String countKey,
-            String legacyEnabledKey,
             int count
     ) {
         int clamped = SbtSettings.clampIconContainerCount(count);
         prefs.edit()
                 .putInt(countKey, clamped)
-                .putBoolean(legacyEnabledKey, clamped > 0)
                 .apply();
         SbtSettings.ensureReadable(context);
     }
diff --git a/app/src/main/res/layout/fragment_battery_bar.xml b/app/src/main/res/layout/fragment_battery_bar.xml
index 0893075..77ca2ed 100644
--- a/app/src/main/res/layout/fragment_battery_bar.xml
+++ b/app/src/main/res/layout/fragment_battery_bar.xml
@@ -84,6 +84,13 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="8dp">
 
+                        <RadioButton
+                            android:id="@+id/battery_bar_curved_geometry_length"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:minHeight="36dp"
+                            android:text="@string/battery_bar_curved_geometry_length" />
+
                         <RadioButton
                             android:id="@+id/battery_bar_position_top"
                             android:layout_width="match_parent"
@@ -183,40 +190,6 @@
                             android:text="+" />
                     </LinearLayout>
 
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:text="@string/battery_bar_curved_geometry_title"
-                        android:textAppearance="?attr/textAppearanceBody2" />
-
-                    <RadioGroup
-                        android:id="@+id/battery_bar_curved_geometry_group"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp">
-
-                        <RadioButton
-                            android:id="@+id/battery_bar_curved_geometry_off"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:minHeight="36dp"
-                            android:text="@string/battery_bar_curved_geometry_off" />
-
-                        <RadioButton
-                            android:id="@+id/battery_bar_curved_geometry_horizontal"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:minHeight="36dp"
-                            android:text="@string/battery_bar_curved_geometry_horizontal" />
-
-                        <RadioButton
-                            android:id="@+id/battery_bar_curved_geometry_length"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:minHeight="36dp"
-                            android:text="@string/battery_bar_curved_geometry_length" />
-                    </RadioGroup>
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 34d564b..14359ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -137,7 +137,7 @@
     <string name="battery_bar_master_toggle_title">Master toggle</string>
     <string name="battery_bar_enabled">Enable battery bar</string>
     <string name="battery_bar_position_title">Position</string>
-    <string name="battery_bar_position_top">Top</string>
+    <string name="battery_bar_position_top">Top edge of screen</string>
     <string name="battery_bar_position_bottom">Bottom of status bar</string>
     <string name="battery_bar_alignment_title">Alignment</string>
     <string name="battery_bar_alignment_ltr">&#8594;</string>
@@ -145,10 +145,7 @@
     <string name="battery_bar_alignment_center">&#8596;</string>
     <string name="battery_bar_thickness_title">Thickness (dp)</string>
     <string name="battery_bar_edge_offset_title">Edge offset (dp)</string>
-    <string name="battery_bar_curved_geometry_title">Curved top geometry</string>
-    <string name="battery_bar_curved_geometry_off">Off</string>
-    <string name="battery_bar_curved_geometry_horizontal">On, horizontal position only</string>
-    <string name="battery_bar_curved_geometry_length">On, actual curve length</string>
+    <string name="battery_bar_curved_geometry_length">Follow screen edges</string>
     <string name="battery_bar_scenario_overrides_title">Scenario overrides</string>
     <string name="battery_bar_scenario_overrides_hint">Optional geometry overrides. Disabled scenarios use the default geometry above.</string>
     <string name="battery_bar_scenario_group_unlocked">Unlocked</string>