diff --git a/AGENTS.md b/AGENTS.md
index c0b6edfe..251ab173 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -174,6 +174,7 @@ triage). **Always-on** rules every edit must honor stay in `AGENTS.md` or
 - **Image snapshots are the exception: one bundle per module, one shared scheme.** Each module owning image references has its own `*SnapshotTests` target over its `SnapshotTests/` folder, all listed in the single shared **StuffSnapshotTests** scheme and its dedicated CI `snapshot` job — slow and LFS-backed, so deliberately **out of** `Stuff-iOS-Tests`. References under any `__Snapshots__/` directory are Git LFS (`.gitattributes`; the CI job checks out with `lfs: true`). Framework halves: `Shared/SnapshotKit` (shippable matrix + previews) and `Shared/SnapshotKitTesting` (test-only pipeline, whose own regression bundle **SnapshotKitTestingTests** pixel-probes without LFS and runs in `Stuff-iOS-Tests`).
 - **A new image suite gets a target, not a scheme.** Add the `*SnapshotTests` target, list only `SnapshotKitTesting` in `extraPackageProducts`, and add it to the `StuffSnapshotTests` scheme's build and test lists — never a scheme or CI job of its own. An image bundle links only what its module needs (the Periscope and Inspector suites don't build against WhereUI at all); references follow the sources automatically via `#filePath`.
 - **Separate snapshot bundles are safe because each `.xctest` gets its own `StuffTestHost` process** (measured on Xcode 27 — `ProcessInfo.processIdentifier` probes; details in the snapshot-bundle comment in [`Project.swift`](Project.swift)). Each bundle statically embeds its own copy of `SnapshotKitTesting`'s capture state, and two copies in one process would corrupt each other. Tripwire: if a toolchain ever shares one host process across bundles, re-measure before adding another image bundle.
+- **Snapshots containing scrolling content use full-content intrinsic height.** Any image snapshot whose rendered subject contains a `ScrollView`, `List`, `Form`, or equivalent UIKit-backed scrolling container uses SnapshotKit's full-content device presets, which keep the normal device viewport as their minimum height and grow to fit taller content; fixed-height device frames are reserved for subjects without scrolling content. Preserve production navigation, tab, sheet, search, and toolbar chrome when intrinsic measurement converges; an intentionally bounded/greedy container instead snapshots its shared scrolling child directly, never snapshot-only production layout (see `SnapshotConfiguration.Frame.fullContent`).
 
 ### Never double-link a product WhereUI already carries
 
diff --git a/Shared/Flyover/SnapshotTests/FlyoverSnapshotTests.swift b/Shared/Flyover/SnapshotTests/FlyoverSnapshotTests.swift
index b4965095..8f576f0a 100644
--- a/Shared/Flyover/SnapshotTests/FlyoverSnapshotTests.swift
+++ b/Shared/Flyover/SnapshotTests/FlyoverSnapshotTests.swift
@@ -12,7 +12,7 @@ struct FlyoverSnapshotTests {
             of: FlyoverView(catalog: catalog),
             named: "FlyoverCanvas",
             configurations: SnapshotConfiguration.combinations(
-                devices: [.iPad],
+                devices: [.iPadFullContent],
                 colorSchemes: [.light, .dark],
             ),
             // Canvas previews load serially, so a cold CI host can still be resolving
@@ -24,7 +24,7 @@ struct FlyoverSnapshotTests {
             of: FlyoverView(catalog: catalog),
             named: "FlyoverCompact",
             configurations: SnapshotConfiguration.combinations(
-                devices: [.iPhone],
+                devices: [.iPhoneFullContent],
             ),
         )
 
@@ -37,7 +37,7 @@ struct FlyoverSnapshotTests {
                 },
             named: "FlyoverList",
             configurations: SnapshotConfiguration.combinations(
-                devices: [.iPad],
+                devices: [.iPadFullContent],
             ),
         )
     }
diff --git a/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCanvas_iPad.png b/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCanvas_iPad.png
index 0f80e6ec..b98ff5a9 100644
--- a/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCanvas_iPad.png
+++ b/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCanvas_iPad.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:83aba7b3dc19053a209e0836e7468ac630e13be0ad5c348658bb4b2a571183b7
-size 1381413
+oid sha256:a93755ed7adb1eb2c3525a8f634849510077d3824155dd15953e0a337bd13e00
+size 1381482
diff --git a/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCanvas_iPad_dark.png b/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCanvas_iPad_dark.png
index 18592ce8..e49daec3 100644
--- a/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCanvas_iPad_dark.png
+++ b/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCanvas_iPad_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:183c5455ab926a29d862dd384b0a72eb5231698a421a65d5014b3020e1b1b749
-size 507901
+oid sha256:1e469d55edbfc58aafd4d961fa8be83f6f29136346766c84b0fadd48574068d6
+size 507932
diff --git a/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCompact_iPhone.png b/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCompact_iPhone.png
index fc106022..2699219c 100644
--- a/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCompact_iPhone.png
+++ b/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverCompact_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f58298caec12dbda5ef66492b98e1859cd7881bb7bae0f26d8ccaa38f216a1c
-size 565841
+oid sha256:7160faedaad9aab46f3762718c51d751b243947180242fc7351b39bbcbcb0484
+size 564347
diff --git a/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverList_iPad.png b/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverList_iPad.png
index d455ba8d..0304e24e 100644
--- a/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverList_iPad.png
+++ b/Shared/Flyover/SnapshotTests/__Snapshots__/FlyoverSnapshotTests/canvasAndList.FlyoverList_iPad.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a0d1f32687eed2322ea2279b17f489ac32e25f33eb3d4eeabe4b6a5e0245c43
-size 1250445
+oid sha256:5fb828dfe6063748551ca3315a7019770a6d3cae6fa2a8a1a80a5c4f4509f199
+size 2576656
diff --git a/Shared/Inspector/SnapshotTests/InspectorSnapshotTests.swift b/Shared/Inspector/SnapshotTests/InspectorSnapshotTests.swift
index bd6f9299..52aae18d 100644
--- a/Shared/Inspector/SnapshotTests/InspectorSnapshotTests.swift
+++ b/Shared/Inspector/SnapshotTests/InspectorSnapshotTests.swift
@@ -37,7 +37,7 @@ struct InspectorSnapshotTests {
             of: swiftDataView,
             named: "SwiftData",
             configurations: SnapshotConfiguration.combinations(
-                devices: [.iPhone],
+                devices: [.iPhoneFullContent],
                 colorSchemes: [.light],
             ),
         )
@@ -66,7 +66,7 @@ struct InspectorSnapshotTests {
                 of: swiftDataView,
                 named: "SwiftData",
                 configurations: SnapshotConfiguration.combinations(
-                    devices: [.iPhone],
+                    devices: [.iPhoneFullContent],
                     colorSchemes: [.dark],
                 ),
             )
@@ -119,7 +119,7 @@ struct InspectorSnapshotTests {
             of: rootView,
             named: "Root",
             configurations: SnapshotConfiguration.combinations(
-                devices: [.iPhone],
+                devices: [.iPhoneFullContent],
                 colorSchemes: [.light, .dark],
             ),
         )
diff --git a/Shared/Inspector/SnapshotTests/__Snapshots__/InspectorSnapshotTests/inspectorSurfaces.SwiftData_iPhone_dark.png b/Shared/Inspector/SnapshotTests/__Snapshots__/InspectorSnapshotTests/inspectorSurfaces.SwiftData_iPhone_dark.png
index 5a8fc533..d3952ae5 100644
--- a/Shared/Inspector/SnapshotTests/__Snapshots__/InspectorSnapshotTests/inspectorSurfaces.SwiftData_iPhone_dark.png
+++ b/Shared/Inspector/SnapshotTests/__Snapshots__/InspectorSnapshotTests/inspectorSurfaces.SwiftData_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d19ce2e2b9ec5cb4ea34e256cad0a27a9006d0ce30ba59e5be8d844652af434
-size 149379
+oid sha256:843bbd0cf26bb093c224f4abedc7bd1c2eb918c91df6d5232945c3ae0b35b216
+size 149244
diff --git a/Shared/Periscope/PeriscopeTools/SnapshotTests/PeriscopeViewerSnapshotTests.swift b/Shared/Periscope/PeriscopeTools/SnapshotTests/PeriscopeViewerSnapshotTests.swift
index ae5518d1..af63bbae 100644
--- a/Shared/Periscope/PeriscopeTools/SnapshotTests/PeriscopeViewerSnapshotTests.swift
+++ b/Shared/Periscope/PeriscopeTools/SnapshotTests/PeriscopeViewerSnapshotTests.swift
@@ -19,7 +19,7 @@ struct PeriscopeViewerSnapshotTests {
             of: viewer,
             named: "PeriscopeViewer",
             configurations: SnapshotConfiguration.combinations(
-                devices: [.iPhone],
+                devices: [.iPhoneFullContent],
                 colorSchemes: [.light, .dark],
             ),
         )
diff --git a/Shared/Periscope/PeriscopeTools/SnapshotTests/__Snapshots__/PeriscopeViewerSnapshotTests/periscopeViewer.PeriscopeViewer_iPhone.png b/Shared/Periscope/PeriscopeTools/SnapshotTests/__Snapshots__/PeriscopeViewerSnapshotTests/periscopeViewer.PeriscopeViewer_iPhone.png
index 17d1a4f7..68061f4f 100644
--- a/Shared/Periscope/PeriscopeTools/SnapshotTests/__Snapshots__/PeriscopeViewerSnapshotTests/periscopeViewer.PeriscopeViewer_iPhone.png
+++ b/Shared/Periscope/PeriscopeTools/SnapshotTests/__Snapshots__/PeriscopeViewerSnapshotTests/periscopeViewer.PeriscopeViewer_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6cb9eba40a9f1cd36a927d6bee262b03a0d581fbb563e6e30d6235f3fd0ebca
-size 271787
+oid sha256:d05ab6bf4f3ab4d3cf9b285dff26cb31a4916ca65e8dd524872948a85006cd3b
+size 271747
diff --git a/Shared/Periscope/PeriscopeTools/SnapshotTests/__Snapshots__/PeriscopeViewerSnapshotTests/periscopeViewer.PeriscopeViewer_iPhone_dark.png b/Shared/Periscope/PeriscopeTools/SnapshotTests/__Snapshots__/PeriscopeViewerSnapshotTests/periscopeViewer.PeriscopeViewer_iPhone_dark.png
index 591a8f7f..395d954d 100644
--- a/Shared/Periscope/PeriscopeTools/SnapshotTests/__Snapshots__/PeriscopeViewerSnapshotTests/periscopeViewer.PeriscopeViewer_iPhone_dark.png
+++ b/Shared/Periscope/PeriscopeTools/SnapshotTests/__Snapshots__/PeriscopeViewerSnapshotTests/periscopeViewer.PeriscopeViewer_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3b406ea987b4ffe74c0d8c8f91b0915c8a73982bbaf166443443be6ea9eae760
-size 275196
+oid sha256:d538f5bb9468470cd2102bae0bdc34651f55854817b714867a9a59397fbe5810
+size 275214
diff --git a/Shared/SnapshotKit/AGENTS.md b/Shared/SnapshotKit/AGENTS.md
index fbcc3d22..414ae4d1 100644
--- a/Shared/SnapshotKit/AGENTS.md
+++ b/Shared/SnapshotKit/AGENTS.md
@@ -44,6 +44,17 @@ Complements the root [`AGENTS.md`](../../AGENTS.md) — read that first.
   `SnapshotCaptureFlag.swift`; don't simplify it to a plain `@Entry`.
 - **Design-system-agnostic.** SnapshotKit never imports Broadway/WhereUI; the
   Broadway root wrap is a consumer concern (`WhereUI`'s `whereSnapshot(...)`).
+- **Scrollable subjects use full-content frames.** A snapshot containing a
+  `ScrollView`, `List`, `Form`, or equivalent UIKit-backed scroller uses
+  `.fullContentScreenDefaults`, a consumer's matching compact preset, or an
+  explicit `.fullContent` frame. Device full-content presets keep their normal
+  viewport height as a minimum and grow only when the settled content is taller;
+  custom full-content frames shrink-wrap unless given a minimum. Capture the
+  production screen including its navigation, tab, sheet, search, and toolbar
+  chrome when measurement converges. An intentionally bounded or greedy
+  container instead snapshots its shared scrolling child directly; never add
+  snapshot-only production layout. Fixed device frames are for non-scrolling
+  subjects.
 
 ## Testing
 
diff --git a/Shared/SnapshotKit/README.md b/Shared/SnapshotKit/README.md
index 24ebe1ad..a989e5eb 100644
--- a/Shared/SnapshotKit/README.md
+++ b/Shared/SnapshotKit/README.md
@@ -2,8 +2,8 @@
 
 SnapshotKit is the generic, shippable half of a small snapshot-testing
 framework. It owns the *appearance matrix* that drives both SwiftUI previews and
-image snapshot tests, so what you see in an Xcode Preview is exactly what CI
-asserts against.
+image snapshot tests, so previews and CI share configurations, traits, and
+content.
 
 It deliberately imports **only** SwiftUI / Foundation / UIKit — never the
 snapshot-comparison engine — so any UI module can depend on it (including in
@@ -21,16 +21,28 @@ capture + comparison pipeline lives in the sibling
   Frames come in three sizing strategies: fixed device viewports (`.iPhone`,
   `.iPad`), the intrinsic `.component` frame, and `.fullContent(name:width:)` —
   fixed width, height measured from the settled content, so the whole
-  scrollable content renders in one image with nothing scrolling. Wrap
-  *content*, not chrome: a greedy container with pinned chrome
-  (`NavigationStack`) has no content-derived ideal height and collapses the
-  measurement to just that chrome. A frame also carries `safeAreaInsets`
-  (default zero, keeping images device-independent); the `.iPhoneNotched`
-  preset simulates real device chrome (Dynamic Island top 47pt, home-indicator
-  bottom 34pt) for cases that must prove layout under it.
+  scrollable content renders in one image with nothing scrolling. Full-width
+  scrolling descendants drive the measured height while preserving surrounding
+  navigation, tab, sheet, search, and toolbar chrome. An intentionally bounded
+  or greedy production container that cannot converge should expose and
+  snapshot its shared scrolling child directly, without snapshot-only layout
+  behavior. The iPhone/iPad
+  full-content presets retain their normal viewport height as a minimum and
+  grow when content is taller; custom full-content frames shrink-wrap unless
+  given a minimum. A frame also carries `safeAreaInsets` (default zero, keeping
+  images device-independent); the `.iPhoneNotched` preset simulates real device
+  chrome (Dynamic Island top 47pt, home-indicator bottom 34pt) for cases that
+  must prove layout under it.
 - **`combinations(...)` + presets** (`.componentDefaults`, `.screenDefaults`,
   `.fullContentScreenDefaults`) — expand a terse declaration into the full
   matrix.
+- **Full-content frames** (`.iPhoneFullContent`, `.iPadFullContent`, and
+  `.fullContent(name:width:)`) — capture the settled intrinsic height of
+  scrolling content, including UIKit-backed SwiftUI `List` and `Form`
+  containers, including when they are nested under production screen chrome.
+  Device presets render at least one normal viewport tall, then expand to show
+  content that would otherwise scroll; fixed-height device frames are for
+  non-scrolling subjects.
 - **`SnapshotProviding`** — a type declares its variants via
   `static var snapshots: [SnapshotCase]`.
 - **`SnapshotCase`** — a named group of configurations plus a lazy content
@@ -105,7 +117,10 @@ assertSnapshots(of: MyBadge.self)
 
 - Accessibility (`.accessibility`) configurations are **filtered out of the
   preview cutsheet** — VoiceOver-annotated captures need the test-only library
-  and can't render in a plain Preview. They still run as snapshot tests.
+  and can't render in a plain Preview. They still run as snapshot tests. The
+  cutsheet also cannot reproduce the capture pipeline's UIKit-backed
+  `List`/`Form` height measurement, safe-area override, ready hook, or
+  tile-and-stitch pass, so CI's rendered dimensions remain authoritative.
 - The Where app wraps content in its Broadway design-system root via a
   `whereSnapshot(...)` adapter in `WhereUI`; SnapshotKit itself stays
   design-system-agnostic.
diff --git a/Shared/SnapshotKit/Sources/SnapshotCase.swift b/Shared/SnapshotKit/Sources/SnapshotCase.swift
index 3abbb3a4..3b9ccf43 100644
--- a/Shared/SnapshotKit/Sources/SnapshotCase.swift
+++ b/Shared/SnapshotKit/Sources/SnapshotCase.swift
@@ -22,7 +22,9 @@ public enum SnapshotSettle: Equatable, Sendable {
 /// render, and the content to render under each.
 ///
 /// It is also a `View`, so it renders a labeled, scrollable cutsheet of its
-/// variants inside a `#Preview` — the same content the snapshot tests capture.
+/// variants inside a `#Preview` — the same matrix, traits, and content the
+/// snapshot tests capture. Test-only capture mechanics are documented on
+/// ``previewConfigurations``.
 /// Accessibility variants are excluded from that preview (see
 /// ``previewConfigurations``); they only render as tests.
 public struct SnapshotCase: Identifiable {
@@ -71,7 +73,11 @@ public struct SnapshotCase: Identifiable {
 
     /// The configurations that can render in a plain SwiftUI preview. Accessibility
     /// captures need the test-only library's VoiceOver parser, so they're dropped
-    /// from the cutsheet (they still run as snapshot tests).
+    /// from the cutsheet (they still run as snapshot tests). The cutsheet also
+    /// cannot perform the capture pipeline's UIKit-backed `List`/`Form`
+    /// measurement, safe-area override, async ready hook, or tile-and-stitch;
+    /// full-content preview height is therefore an approximation while the test
+    /// capture is authoritative.
     public var previewConfigurations: [SnapshotConfiguration] {
         configurations.filter { $0.snapshotType != .accessibility }
     }
@@ -87,8 +93,8 @@ extension SnapshotCase: View {
                         .foregroundStyle(.secondary)
                     framed(for: configuration)
                         .snapshotTraits(configuration)
-                        // Previews mirror what the tests capture, so each
-                        // variant renders its deterministic capture state.
+                        // Preview the same deterministic content state as tests;
+                        // capture-only mechanics remain test-pipeline concerns.
                         .environment(\.isCapturingSnapshot, true)
                 }
             }
@@ -110,11 +116,12 @@ extension SnapshotCase: View {
                 }
             case let .fixed(size):
                 content.frame(width: size.width, height: size.height)
-            case let .fullContent(width):
-                // No height: in the cutsheet's scroll view the content gets an
-                // unbounded proposal and takes its ideal (content) height, the
-                // preview analogue of the pipeline's content measurement.
-                content.frame(width: width)
+            case let .fullContent(width, minimumHeight):
+                // The cutsheet shares the viewport minimum but cannot run the
+                // test pipeline's UIKit descendant measurement.
+                content
+                    .frame(width: width)
+                    .frame(minHeight: minimumHeight)
         }
     }
 }
diff --git a/Shared/SnapshotKit/Sources/SnapshotConfiguration+Combinations.swift b/Shared/SnapshotKit/Sources/SnapshotConfiguration+Combinations.swift
index 9d573155..36df018a 100644
--- a/Shared/SnapshotKit/Sources/SnapshotConfiguration+Combinations.swift
+++ b/Shared/SnapshotKit/Sources/SnapshotConfiguration+Combinations.swift
@@ -70,8 +70,9 @@ extension [SnapshotConfiguration] {
         defaults(devices: [.iPhone, .iPad])
     }
 
-    /// The default full-screen trait matrix at iPhone and iPad widths, with each
-    /// frame measured to the settled content's intrinsic height.
+    /// The default full-screen trait matrix at iPhone and iPad viewport sizes,
+    /// with each frame growing beyond its device height when settled content is
+    /// taller.
     public static var fullContentScreenDefaults: Self {
         defaults(devices: [.iPhoneFullContent, .iPadFullContent])
     }
diff --git a/Shared/SnapshotKit/Sources/SnapshotConfiguration.swift b/Shared/SnapshotKit/Sources/SnapshotConfiguration.swift
index 29fd78d6..9814476d 100644
--- a/Shared/SnapshotKit/Sources/SnapshotConfiguration.swift
+++ b/Shared/SnapshotKit/Sources/SnapshotConfiguration.swift
@@ -84,7 +84,9 @@ extension SnapshotConfiguration {
     /// size in identifiers (e.g. `iPhone` instead of `402x874`).
     public struct Frame: Hashable, Sendable {
         private static let iPhoneWidth: CGFloat = 402
+        private static let iPhoneHeight: CGFloat = 874
         private static let iPadWidth: CGFloat = 834
+        private static let iPadHeight: CGFloat = 1194
 
         /// The identifier token for this frame (`""` for the unnamed component
         /// frame, `iPhone`/`iPad` for device frames).
@@ -97,7 +99,11 @@ extension SnapshotConfiguration {
         /// notch/home-indicator insets.
         public var safeAreaInsets: Insets
 
-        public init(name: String, size: SizeStrategy, safeAreaInsets: Insets = .zero) {
+        public init(
+            name: String,
+            size: SizeStrategy,
+            safeAreaInsets: Insets = .zero,
+        ) {
             self.name = name
             self.size = size
             self.safeAreaInsets = safeAreaInsets
@@ -129,41 +135,53 @@ extension SnapshotConfiguration {
         /// scrolls. A `ScrollView` measured this way reports its content height,
         /// so wrapping scrollable content captures every row (lazy stacks
         /// materialize fully — at full-content height every row is visible).
-        ///
-        /// **Wrap content, not chrome.** Greedy containers with pinned chrome
-        /// (`NavigationStack`, a sheet with a pinned picker) have no
-        /// content-derived ideal height and collapse the measurement to just
-        /// that chrome — pass the scrollable content itself, without the
-        /// navigation wrapper.
+        /// Production navigation, tab, sheet, search, and toolbar chrome stays
+        /// wrapped around the full-width scrolling descendant that drives the
+        /// measured height.
         ///
         /// `name` is the identifier token for the frame (conventionally
         /// `fullHeight`); it must stay stable once references are recorded.
-        public static func fullContent(name: String, width: CGFloat) -> Frame {
-            Frame(name: name, size: .fullContent(width: width))
+        public static func fullContent(
+            name: String,
+            width: CGFloat,
+            minimumHeight: CGFloat? = nil,
+        ) -> Frame {
+            Frame(
+                name: name,
+                size: .fullContent(width: width, minimumHeight: minimumHeight),
+            )
         }
 
-        /// The iPhone frame width with height measured from the settled content.
-        public static let iPhoneFullContent = fullContent(name: "iPhone", width: iPhoneWidth)
+        /// An iPhone viewport that grows to fit settled scrolling content.
+        public static let iPhoneFullContent = fullContent(
+            name: "iPhone",
+            width: iPhoneWidth,
+            minimumHeight: iPhoneHeight,
+        )
 
-        /// The iPad frame width with height measured from the settled content.
-        public static let iPadFullContent = fullContent(name: "iPad", width: iPadWidth)
+        /// An iPad viewport that grows to fit settled scrolling content.
+        public static let iPadFullContent = fullContent(
+            name: "iPad",
+            width: iPadWidth,
+            minimumHeight: iPadHeight,
+        )
 
         /// A phone screen frame (iPhone 17 point size).
         public static let iPhone = Frame(
             name: "iPhone",
-            size: .fixed(CGSize(width: iPhoneWidth, height: 874)),
+            size: .fixed(CGSize(width: iPhoneWidth, height: iPhoneHeight)),
         )
         /// A tablet screen frame (iPad Pro 11" portrait point size).
         public static let iPad = Frame(
             name: "iPad",
-            size: .fixed(CGSize(width: iPadWidth, height: 1194)),
+            size: .fixed(CGSize(width: iPadWidth, height: iPadHeight)),
         )
         /// The iPhone frame with simulated device insets (Dynamic Island top,
         /// home-indicator bottom), for cases that must prove layout under real
         /// device chrome rather than the inset-free default.
         public static let iPhoneNotched = Frame(
             name: "iPhoneNotched",
-            size: .fixed(CGSize(width: iPhoneWidth, height: 874)),
+            size: .fixed(CGSize(width: iPhoneWidth, height: iPhoneHeight)),
             safeAreaInsets: Insets(top: 47, leading: 0, bottom: 34, trailing: 0),
         )
     }
@@ -176,7 +194,7 @@ extension SnapshotConfiguration {
         case fixed(CGSize)
         /// A fixed width with the height measured from the settled content, so
         /// scrollable content renders whole (see ``Frame/fullContent(name:width:)``).
-        case fullContent(width: CGFloat)
+        case fullContent(width: CGFloat, minimumHeight: CGFloat?)
     }
 }
 
diff --git a/Shared/SnapshotKit/Tests/SnapshotConfigurationTests.swift b/Shared/SnapshotKit/Tests/SnapshotConfigurationTests.swift
index 08aeb4bc..9631f429 100644
--- a/Shared/SnapshotKit/Tests/SnapshotConfigurationTests.swift
+++ b/Shared/SnapshotKit/Tests/SnapshotConfigurationTests.swift
@@ -48,6 +48,20 @@ struct SnapshotConfigurationTests {
         })
     }
 
+    @Test func fullContentDeviceFramesRetainViewportMinimums() {
+        #expect(SnapshotConfiguration.Frame.iPhoneFullContent.size == .fullContent(
+            width: 402,
+            minimumHeight: 874,
+        ))
+        #expect(SnapshotConfiguration.Frame.iPadFullContent.size == .fullContent(
+            width: 834,
+            minimumHeight: 1194,
+        ))
+
+        let custom = SnapshotConfiguration.Frame.fullContent(name: "custom", width: 500)
+        #expect(custom.size == .fullContent(width: 500, minimumHeight: nil))
+    }
+
     @Test func baselineIdentifierIsEmpty() {
         #expect(SnapshotConfiguration().identifier.isEmpty)
     }
diff --git a/Shared/SnapshotKitTesting/AGENTS.md b/Shared/SnapshotKitTesting/AGENTS.md
index f84eb738..96ed7b2e 100644
--- a/Shared/SnapshotKitTesting/AGENTS.md
+++ b/Shared/SnapshotKitTesting/AGENTS.md
@@ -112,9 +112,14 @@ Complements the root [`AGENTS.md`](../../AGENTS.md) — read that first.
   re-running the probe. Guard:
   `SnapshotKitTestingTests.LargeViewCaptureTests`.
 - **Full-content sizing includes UIKit-backed SwiftUI containers.** When a
-  root-filling scroll view such as `Form` reports only its viewport through
-  `sizeThatFits`, use its content size. Guard:
+  full-width scroll view such as `Form` reports only its viewport through
+  `sizeThatFits`, use its content size plus surrounding chrome; device presets
+  retain their normal viewport height as the minimum. Guard:
   `SnapshotKitTestingTests.LargeViewCaptureTests`.
+- **Intrinsic height must converge before comparison.** Exhausting the bounded
+  fixed-point passes fails the assertion and skips comparison/recording; never
+  bless the last arbitrary height. Guard:
+  `LargeViewCaptureTests.rejectsNonConvergingBoundedScrollMeasurement`.
 - **A settle phase costs its floor, not its passes.** Measured over all 260
   references with `SNAPSHOT_TIMING=1`: 192 captures sit at 0.25-0.35s, the
   `minDuration` floor plus a pass or two, and the floor accounts for ~70s of
diff --git a/Shared/SnapshotKitTesting/README.md b/Shared/SnapshotKitTesting/README.md
index 7d77cfa0..54fe5011 100644
--- a/Shared/SnapshotKitTesting/README.md
+++ b/Shared/SnapshotKitTesting/README.md
@@ -28,9 +28,14 @@ re-exports `SnapshotKit` and `SnapshotTesting`, so a test author needs a single
   (zero by default; a frame's `safeAreaInsets`, e.g. `.iPhoneNotched`,
   simulates device chrome), animation quiescing, text-cursor hiding, and a
   size-stabilization pass for SwiftUI hosting controllers. Full-content captures
-  use the root scroll view's content size when UIKit-backed SwiftUI containers
-  such as `Form` report only their viewport through `sizeThatFits`. Captures serialize
-  process-wide through an internal FIFO mutex — the pipeline holds
+  use a full-width scroll descendant's content size plus surrounding chrome when
+  UIKit-backed SwiftUI containers such as `Form` report only their viewport
+  through `sizeThatFits`; device presets retain their normal viewport height as
+  the minimum. Height measurement iterates to a stable fixed point for lazy
+  content; if it cannot converge within the bounded pass budget, capture throws,
+  the assertion records a test issue, and no arbitrary image is compared or
+  recorded. Captures serialize process-wide through an internal FIFO mutex —
+  the pipeline holds
   process-global state (the safe-area swizzle, the animations flag, the one
   host window) across its suspensions, so a concurrent call queues behind the
   in-flight capture instead of corrupting it. A case's
diff --git a/Shared/SnapshotKitTesting/Sources/AccessibilitySnapshotViewController.swift b/Shared/SnapshotKitTesting/Sources/AccessibilitySnapshotViewController.swift
index 8e58189c..19b7b7bd 100644
--- a/Shared/SnapshotKitTesting/Sources/AccessibilitySnapshotViewController.swift
+++ b/Shared/SnapshotKitTesting/Sources/AccessibilitySnapshotViewController.swift
@@ -43,6 +43,15 @@ final class AccessibilitySnapshotViewController: UIViewController {
     /// annotations. Must be called while the view is in the hierarchy. Rendering
     /// failures surface loudly rather than producing a blank image.
     func parseAccessibility() {
+        // AccessibilitySnapshot temporarily moves the contained view into its
+        // renderer. Suspend controller containment around that move, then
+        // restore it before the annotated wrapper is captured.
+        content.willMove(toParent: nil)
+        content.removeFromParent()
+        defer {
+            addChild(content)
+            content.didMove(toParent: self)
+        }
         do {
             try snapshotView.parseAccessibility()
         } catch let ImageRenderingError.containedViewExceedsMaximumSize(viewSize, maximumSize) {
diff --git a/Shared/SnapshotKitTesting/Sources/AssertSnapshots.swift b/Shared/SnapshotKitTesting/Sources/AssertSnapshots.swift
index cf42c5e9..ff8d1f4b 100644
--- a/Shared/SnapshotKitTesting/Sources/AssertSnapshots.swift
+++ b/Shared/SnapshotKitTesting/Sources/AssertSnapshots.swift
@@ -107,29 +107,41 @@ public func assertSnapshots(
             case .fixed:
                 .fixed
             case let .intrinsic(maxWidth):
-                .intrinsic(width: maxWidth ?? UIScreen.main.bounds.width)
-            case let .fullContent(width):
+                .intrinsic(
+                    width: maxWidth ?? UIScreen.main.bounds.width,
+                    minimumHeight: 0,
+                )
+            case let .fullContent(width, minimumHeight):
                 // Same measured-height pipeline as `.intrinsic`: a `ScrollView`
                 // measured under the unbounded proposal reports its content
                 // height (guarded by `LargeViewCaptureTests`), so the capture
                 // renders the whole scrollable content.
-                .intrinsic(width: width)
+                .intrinsic(
+                    width: width,
+                    minimumHeight: minimumHeight ?? 0,
+                )
         }
         let identifier = fullSnapshotIdentifier(caseName: name, configuration: configuration)
         let timing = SnapshotCaptureTiming(
             identifier: identifier,
             isEnabled: SnapshotCaptureTiming.isEnabledByEnvironment,
         )
-        let capture = await renderSnapshotCapture(
-            of: hostingController,
-            named: identifier,
-            sizing: sizing,
-            safeAreaInsets: configuration.device.safeAreaInsets.uiEdgeInsets,
-            isAccessibility: configuration.snapshotType == .accessibility,
-            settle: settle,
-            onReadyToSnapshot: onReadyToSnapshot,
-            timing: timing,
-        )
+        let capture: SnapshotCapture
+        do {
+            capture = try await renderSnapshotCapture(
+                of: hostingController,
+                named: identifier,
+                sizing: sizing,
+                safeAreaInsets: configuration.device.safeAreaInsets.uiEdgeInsets,
+                isAccessibility: configuration.snapshotType == .accessibility,
+                settle: settle,
+                onReadyToSnapshot: onReadyToSnapshot,
+                timing: timing,
+            )
+        } catch {
+            Issue.record(error)
+            continue
+        }
         // Before the verdict, so a reviewer gets the shape of the delta on the
         // same run that reports the failure. Reads the reference from disk; the
         // byte-equality check short-circuits when the capture is deterministic.
@@ -311,8 +323,9 @@ private func makeHostingController(
         case let .intrinsic(maxWidth):
             let width = maxWidth ?? UIScreen.main.bounds.width
             hostingController.view.frame = CGRect(x: 0, y: 0, width: width, height: 1)
-        case let .fullContent(width):
-            hostingController.view.frame = CGRect(x: 0, y: 0, width: width, height: 1)
+        case let .fullContent(width, minimumHeight):
+            let height = minimumHeight ?? 1
+            hostingController.view.frame = CGRect(x: 0, y: 0, width: width, height: height)
     }
 
     return hostingController
diff --git a/Shared/SnapshotKitTesting/Sources/SafeAreaInsetsSwizzling.swift b/Shared/SnapshotKitTesting/Sources/SafeAreaInsetsSwizzling.swift
index 267e6ac6..a9f27238 100644
--- a/Shared/SnapshotKitTesting/Sources/SafeAreaInsetsSwizzling.swift
+++ b/Shared/SnapshotKitTesting/Sources/SafeAreaInsetsSwizzling.swift
@@ -22,8 +22,8 @@ import UIKit
 func swizzle<Output>(
     safeAreaInsets: UIEdgeInsets,
     for viewController: UIViewController,
-    operation: () async -> Output,
-) async -> Output {
+    operation: () async throws -> Output,
+) async rethrows -> Output {
     _overrideSafeAreaInsets = safeAreaInsets
     _overrideViewController = viewController
     UIView.swizzleSafeAreaInsets()
@@ -32,7 +32,7 @@ func swizzle<Output>(
         _overrideViewController = nil
         UIView.unswizzleSafeAreaInsets()
     }
-    return await operation()
+    return try await operation()
 }
 
 @MainActor private var _overrideViewController: UIViewController?
diff --git a/Shared/SnapshotKitTesting/Sources/SnapshotCaptureLock.swift b/Shared/SnapshotKitTesting/Sources/SnapshotCaptureLock.swift
index 5cce421c..21f9e4a8 100644
--- a/Shared/SnapshotKitTesting/Sources/SnapshotCaptureLock.swift
+++ b/Shared/SnapshotKitTesting/Sources/SnapshotCaptureLock.swift
@@ -29,7 +29,9 @@ enum SnapshotCaptureLock {
 
     /// Runs `operation` while holding the process-wide capture lock, waiting
     /// (FIFO) for any in-flight capture to finish first.
-    static func withLock<Output>(_ operation: @MainActor () async -> Output) async -> Output {
+    static func withLock<Output>(
+        _ operation: @MainActor () async throws -> Output,
+    ) async rethrows -> Output {
         precondition(
             !taskHoldsLock,
             """
@@ -40,8 +42,8 @@ enum SnapshotCaptureLock {
         )
         await acquire()
         defer { release() }
-        return await $taskHoldsLock.withValue(true) {
-            await operation()
+        return try await $taskHoldsLock.withValue(true) {
+            try await operation()
         }
     }
 
diff --git a/Shared/SnapshotKitTesting/Sources/SnapshotImageRendering.swift b/Shared/SnapshotKitTesting/Sources/SnapshotImageRendering.swift
index 8c7c4d8e..918c3a26 100644
--- a/Shared/SnapshotKitTesting/Sources/SnapshotImageRendering.swift
+++ b/Shared/SnapshotKitTesting/Sources/SnapshotImageRendering.swift
@@ -25,8 +25,27 @@ public enum SnapshotSizing: Sendable {
     case fixed
     /// Size to fit the content at a fixed width, measured *after* the content is
     /// in the window and settled (so async `.task` loads are included, not a
-    /// placeholder).
-    case intrinsic(width: CGFloat)
+    /// placeholder), while retaining the requested minimum height.
+    case intrinsic(width: CGFloat, minimumHeight: CGFloat)
+}
+
+/// A capture failure that callers can report without comparing or recording an
+/// invalid image.
+public enum SnapshotRenderingError: Error, Equatable, Sendable {
+    /// Full-content measurement did not reach a stable height within the
+    /// bounded fixed-point pass budget.
+    case intrinsicHeightDidNotConverge(name: String, measuredHeights: [CGFloat])
+}
+
+extension SnapshotRenderingError: LocalizedError {
+    public var errorDescription: String? {
+        switch self {
+            case let .intrinsicHeightDidNotConverge(name, measuredHeights):
+                let heights = measuredHeights.map { String(format: "%.1f", $0) }
+                    .joined(separator: ", ")
+                return "Snapshot \(name) intrinsic height did not converge: \(heights)."
+        }
+    }
 }
 
 /// Renders a view controller to an image on the fixed CI simulator.
@@ -85,8 +104,8 @@ public func renderSnapshotImage(
     isAccessibility: Bool = false,
     settle: SnapshotSettle = .settled,
     onReadyToSnapshot: (@MainActor () async -> Void)? = nil,
-) async -> UIImage {
-    await renderSnapshotCapture(
+) async throws -> UIImage {
+    try await renderSnapshotCapture(
         of: viewController,
         named: name,
         sizing: sizing,
@@ -124,9 +143,9 @@ public func renderSnapshotImage(
     settle: SnapshotSettle,
     onReadyToSnapshot: (@MainActor () async -> Void)?,
     timing: SnapshotCaptureTiming,
-) async -> SnapshotCapture {
-    await SnapshotCaptureLock.withLock {
-        await renderSnapshotImageLocked(
+) async throws -> SnapshotCapture {
+    try await SnapshotCaptureLock.withLock {
+        try await renderSnapshotImageLocked(
             of: viewController,
             named: name,
             sizing: sizing,
@@ -152,8 +171,8 @@ private func renderSnapshotImageLocked(
     settle: SnapshotSettle,
     onReadyToSnapshot: (@MainActor () async -> Void)?,
     timing: SnapshotCaptureTiming,
-) async -> SnapshotCapture {
-    func capture() async -> SnapshotCapture {
+) async throws -> SnapshotCapture {
+    func capture() async throws -> SnapshotCapture {
         // `hostKeyWindow()` is the specific window `StuffTestHost` stamps with
         // `isMainTestHostWindow` — the guaranteed root window we set up, not
         // merely whatever window happens to be key. So this is stable regardless
@@ -179,8 +198,8 @@ private func renderSnapshotImageLocked(
         // surfaces it to SwiftUI as `\.isCapturingSnapshot`.
         viewController.traitOverrides[SnapshotCaptureTrait.self] = true
 
-        await timing.measure(.intrinsicMeasure) {
-            await resolveContentSize(
+        try await timing.measure(.intrinsicMeasure) {
+            try await resolveContentSize(
                 of: viewController,
                 named: name,
                 sizing: sizing,
@@ -279,13 +298,13 @@ private func renderSnapshotImageLocked(
     }
 
     if let safeAreaInsets {
-        return await swizzle(
+        return try await swizzle(
             safeAreaInsets: safeAreaInsets,
             for: viewController,
             operation: capture,
         )
     }
-    return await capture()
+    return try await capture()
 }
 
 /// Adds `child` (sized to its view's current frame) into the appeared host root
@@ -311,10 +330,10 @@ private func removeChildAfterCapture(_ child: UIViewController) {
 /// appearance lifecycle driven (so SwiftUI `.task` loads and finite time-based
 /// reveals run), lets it settle, then measures `sizeThatFits` and pins the frame —
 /// so a content-loading component is sized to its loaded content rather than an
-/// empty placeholder. UIKit-backed SwiftUI containers such as `Form` report
-/// their viewport rather than their ideal height, so a root-filling scroll view's
-/// content size is used when it is taller. `.fixed` sizing leaves the frame
-/// untouched.
+/// empty placeholder. The result never falls below the requested minimum
+/// height. UIKit-backed SwiftUI containers such as `Form` report their viewport
+/// rather than their ideal height, so a full-width scroll descendant's content
+/// size is used when it is taller. `.fixed` sizing leaves the frame untouched.
 ///
 /// The measurement iterates to a fixed point: a lazy container (`LazyVStack` in
 /// a `ScrollView`) reports an *estimated* content height until its rows
@@ -338,8 +357,8 @@ private func resolveContentSize(
     hostedIn hostRoot: UIViewController,
     window: UIWindow,
     timing: SnapshotCaptureTiming,
-) async {
-    guard case let .intrinsic(width) = sizing else { return }
+) async throws {
+    guard case let .intrinsic(width, minimumHeight) = sizing else { return }
 
     let probeHeight = max(window.bounds.height, 1)
     viewController.view.frame = CGRect(x: 0, y: 0, width: width, height: probeHeight)
@@ -362,21 +381,29 @@ private func resolveContentSize(
         if !measured.height.isFinite || measured.height <= 0 {
             measured.height = 1
         }
-        if let scrollContentHeight = viewController.view.rootScrollContentHeight,
+        if let scrollContentHeight = viewController.view.fullScrollContentHeight,
            scrollContentHeight > measured.height
         {
             measured.height = scrollContentHeight
         }
+        measured.height = max(measured.height, minimumHeight)
         return measured
     }
 
     var measured = measureContent()
+    var measuredHeights = [measured.height]
+    var didConverge = false
     for _ in 0 ..< 10 {
         viewController.view.frame = CGRect(origin: .zero, size: measured)
         probeWrapper.view.frame.size = measured
         CATransaction.performWithoutAnimation(probeWrapper.view.layoutIfNeeded)
         let remeasured = measureContent()
-        if abs(remeasured.height - measured.height) < 0.5 { break }
+        measuredHeights.append(remeasured.height)
+        if abs(remeasured.height - measured.height) < 0.5 {
+            measured = remeasured
+            didConverge = true
+            break
+        }
         measured = remeasured
     }
 
@@ -386,28 +413,39 @@ private func resolveContentSize(
     viewController.removeFromParent()
     removeChildAfterCapture(probeWrapper)
 
+    guard didConverge else {
+        throw SnapshotRenderingError.intrinsicHeightDidNotConverge(
+            name: name,
+            measuredHeights: measuredHeights,
+        )
+    }
+
     viewController.view.frame = CGRect(origin: .zero, size: measured)
     CATransaction.performWithoutAnimation(viewController.view.layoutIfNeeded)
 }
 
 extension UIView {
-    /// The content height of a scroll view that fills this view, if one exists.
+    /// The root height required to show a full-width scrolling descendant's
+    /// complete content while preserving the chrome around its viewport.
     ///
     /// `Form` and `List` are backed by UIKit scroll views whose hosting view
     /// answers `sizeThatFits` with only the current viewport. Restricting the
-    /// fallback to a root-filling scroll view avoids expanding an intentionally
-    /// fixed-height nested scroller inside an otherwise intrinsic component.
-    fileprivate var rootScrollContentHeight: CGFloat? {
+    /// fallback to full-width scrolling content avoids expanding an intentionally
+    /// narrow nested scroller inside an otherwise intrinsic component.
+    fileprivate var fullScrollContentHeight: CGFloat? {
         descendants
             .compactMap { view -> CGFloat? in
                 guard let scrollView = view as? UIScrollView else { return nil }
                 let visibleFrame = scrollView.convert(scrollView.bounds, to: self)
                 guard visibleFrame.width >= bounds.width - 1,
-                      visibleFrame.height >= bounds.height - 1,
+                      visibleFrame.height > 0,
                       scrollView.contentSize.height.isFinite,
                       scrollView.contentSize.height > 0
                 else { return nil }
-                return scrollView.contentSize.height
+                let chromeHeight = max(bounds.height - visibleFrame.height, 0)
+                let insetHeight = scrollView.adjustedContentInset.top
+                    + scrollView.adjustedContentInset.bottom
+                return scrollView.contentSize.height + insetHeight + chromeHeight
             }
             .max()
     }
diff --git a/Shared/SnapshotKitTesting/Tests/AsyncContentCaptureTests.swift b/Shared/SnapshotKitTesting/Tests/AsyncContentCaptureTests.swift
index e89f095a..37c71fe3 100644
--- a/Shared/SnapshotKitTesting/Tests/AsyncContentCaptureTests.swift
+++ b/Shared/SnapshotKitTesting/Tests/AsyncContentCaptureTests.swift
@@ -17,7 +17,7 @@ struct AsyncContentCaptureTests {
         try waitFor { hostKeyWindow() != nil }
         let host = UIHostingController(rootView: TaskProbeView())
         host.view.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
-        let image = await renderSnapshotImage(
+        let image = try await renderSnapshotImage(
             of: host,
             named: "task-probe",
             safeAreaInsets: .zero,
diff --git a/Shared/SnapshotKitTesting/Tests/ConcurrentCaptureTests.swift b/Shared/SnapshotKitTesting/Tests/ConcurrentCaptureTests.swift
index 7d35cbde..d27710ee 100644
--- a/Shared/SnapshotKitTesting/Tests/ConcurrentCaptureTests.swift
+++ b/Shared/SnapshotKitTesting/Tests/ConcurrentCaptureTests.swift
@@ -26,8 +26,8 @@ struct ConcurrentCaptureTests {
         try waitFor { hostKeyWindow() != nil }
         let windowInsetsBefore = hostKeyWindow()?.safeAreaInsets
 
-        let serialInset = await expectations(for: captureProbeImage(topInset: 20))
-        let serialZero = await expectations(for: captureProbeImage(topInset: 0))
+        let serialInset = try await expectations(for: captureProbeImage(topInset: 20))
+        let serialZero = try await expectations(for: captureProbeImage(topInset: 0))
         expectInsetCapture(serialInset)
         expectZeroInsetCapture(serialZero)
 
@@ -35,16 +35,16 @@ struct ConcurrentCaptureTests {
         // interleave at the pipeline's suspension points — exactly the
         // scheduling that corrupted captures before the lock serialized them.
         var concurrent: [CGFloat: ProbedCapture] = [:]
-        await withTaskGroup(of: IndexedCapture.self) { group in
+        try await withThrowingTaskGroup(of: IndexedCapture.self) { group in
             for topInset: CGFloat in [20, 0] {
                 group.addTask { @MainActor in
-                    await IndexedCapture(
+                    try await IndexedCapture(
                         topInset: topInset,
                         capture: expectations(for: captureProbeImage(topInset: topInset)),
                     )
                 }
             }
-            for await result in group {
+            for try await result in group {
                 concurrent[result.topInset] = result.capture
             }
         }
@@ -88,10 +88,10 @@ private struct SafeAreaProbeView: View {
 }
 
 @MainActor
-private func captureProbeImage(topInset: CGFloat) async -> UIImage {
+private func captureProbeImage(topInset: CGFloat) async throws -> UIImage {
     let host = UIHostingController(rootView: SafeAreaProbeView())
     host.view.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
-    return await renderSnapshotImage(
+    return try await renderSnapshotImage(
         of: host,
         named: "safe-area-\(Int(topInset))pt-probe",
         safeAreaInsets: UIEdgeInsets(top: topInset, left: 0, bottom: 0, right: 0),
diff --git a/Shared/SnapshotKitTesting/Tests/LargeViewCaptureTests.swift b/Shared/SnapshotKitTesting/Tests/LargeViewCaptureTests.swift
index dcadb504..537b48d9 100644
--- a/Shared/SnapshotKitTesting/Tests/LargeViewCaptureTests.swift
+++ b/Shared/SnapshotKitTesting/Tests/LargeViewCaptureTests.swift
@@ -25,6 +25,20 @@ struct LargeViewCaptureTests {
         #expect(sample.bottom.blue > 0.5)
     }
 
+    @Test func contentMeasuredSizingRetainsItsMinimumHeight() async throws {
+        try waitFor { hostKeyWindow() != nil }
+        let view = Color.red.frame(width: 402, height: 100)
+        let host = UIHostingController(rootView: view)
+        host.view.frame = CGRect(x: 0, y: 0, width: 402, height: 1)
+        let image = try await renderSnapshotImage(
+            of: host,
+            named: "full-content-minimum-height-probe",
+            sizing: .intrinsic(width: 402, minimumHeight: 874),
+            safeAreaInsets: .zero,
+        )
+        #expect(image.size.height == 874)
+    }
+
     @Test func capturesAViewTallerThanTheTileLimit() async throws {
         let sample = try await renderTwoTone(height: 3000)
         #expect(sample.size.height == 3000)
@@ -45,10 +59,10 @@ struct LargeViewCaptureTests {
         }
         let host = UIHostingController(rootView: scroll)
         host.view.frame = CGRect(x: 0, y: 0, width: 402, height: 1)
-        let image = await renderSnapshotImage(
+        let image = try await renderSnapshotImage(
             of: host,
             named: "full-content-scroll-probe",
-            sizing: .intrinsic(width: 402),
+            sizing: .intrinsic(width: 402, minimumHeight: 0),
             safeAreaInsets: .zero,
         )
         let sample = TwoToneSample(
@@ -77,10 +91,10 @@ struct LargeViewCaptureTests {
         }
         let host = UIHostingController(rootView: form)
         host.view.frame = CGRect(x: 0, y: 0, width: 402, height: 1)
-        let image = await renderSnapshotImage(
+        let image = try await renderSnapshotImage(
             of: host,
             named: "full-content-form-probe",
-            sizing: .intrinsic(width: 402),
+            sizing: .intrinsic(width: 402, minimumHeight: 0),
             safeAreaInsets: .zero,
         )
         let sample = TwoToneSample(
@@ -93,6 +107,126 @@ struct LargeViewCaptureTests {
         #expect(sample.bottom.blue > 0.5)
     }
 
+    @Test func preservesChromeAroundFullContentScrollingContent() async throws {
+        try waitFor { hostKeyWindow() != nil }
+        let screen = NavigationStack {
+            ScrollView {
+                VStack(spacing: 0) {
+                    Color.red.frame(height: 1500)
+                    Color.blue.frame(height: 1500)
+                }
+            }
+            .safeAreaInset(edge: .bottom) {
+                Color.green
+                    .frame(height: 50)
+                    .accessibilityLabel("Bottom toolbar")
+            }
+            .navigationTitle("Full Content")
+            .toolbarBackground(Color.yellow, for: .navigationBar)
+            .toolbarBackground(.visible, for: .navigationBar)
+            .toolbar {
+                ToolbarItem(placement: .primaryAction) {
+                    Button("Add", systemImage: "plus", action: {})
+                }
+            }
+        }
+        let host = UIHostingController(rootView: screen)
+        host.view.frame = CGRect(x: 0, y: 0, width: 402, height: 1)
+        let image = try await renderSnapshotImage(
+            of: host,
+            named: "full-content-navigation-probe",
+            sizing: .intrinsic(width: 402, minimumHeight: 0),
+            safeAreaInsets: .zero,
+        )
+        #expect(image.size.height >= 3255)
+        #expect(image.size.height < 3265)
+
+        let topToolbar = image.probePixel(atUnitPoint: CGPoint(
+            x: 0.1,
+            y: 20 / image.size.height,
+        ))
+        #expect(topToolbar.red > 0.5)
+        #expect(topToolbar.green > 0.5)
+        #expect(topToolbar.blue < 0.5)
+
+        let firstContent = image.probePixel(atUnitPoint: CGPoint(
+            x: 0.5,
+            y: 200 / image.size.height,
+        ))
+        #expect(firstContent.red > 0.5)
+        #expect(firstContent.blue < 0.5)
+
+        let lastContent = image.probePixel(atUnitPoint: CGPoint(
+            x: 0.5,
+            y: (image.size.height - 160) / image.size.height,
+        ))
+        #expect(lastContent.blue > 0.5)
+        #expect(lastContent.red < 0.5)
+
+        let bottomToolbar = image.probePixel(atUnitPoint: CGPoint(
+            x: 0.5,
+            y: (image.size.height - 80) / image.size.height,
+        ))
+        #expect(bottomToolbar.green > 0.5)
+        #expect(bottomToolbar.red < 0.5)
+    }
+
+    @Test func rejectsNonConvergingBoundedScrollMeasurement() async throws {
+        try waitFor { hostKeyWindow() != nil }
+        let screen = VStack(spacing: 0) {
+            Color.red.frame(height: 100)
+            List(0 ..< 20, id: \.self) { index in
+                Text("Bounded row \(index)")
+            }
+            .frame(height: 200)
+        }
+        let host = UIHostingController(rootView: screen)
+        host.view.frame = CGRect(x: 0, y: 0, width: 402, height: 1)
+
+        do {
+            _ = try await renderSnapshotImage(
+                of: host,
+                named: "non-converging-bounded-scroll-probe",
+                sizing: .intrinsic(width: 402, minimumHeight: 0),
+                safeAreaInsets: .zero,
+            )
+            Issue.record("Expected intrinsic-height measurement to fail.")
+        } catch let error as SnapshotRenderingError {
+            guard case let .intrinsicHeightDidNotConverge(name, measuredHeights) = error else {
+                Issue.record("Expected non-convergence, got \(error).")
+                return
+            }
+            #expect(name == "non-converging-bounded-scroll-probe")
+            #expect(measuredHeights.count == 11)
+            #expect((measuredHeights.last ?? 0) > (measuredHeights.first ?? 0))
+        } catch {
+            Issue.record("Expected SnapshotRenderingError, got \(error).")
+        }
+    }
+
+    @Test func annotatesTallFullContentAccessibilitySnapshots() async throws {
+        try waitFor { hostKeyWindow() != nil }
+        let screen = ScrollView {
+            VStack {
+                ForEach(0 ..< 30, id: \.self) { index in
+                    Text("Accessible row \(index)")
+                        .frame(maxWidth: .infinity, minHeight: 100)
+                }
+            }
+        }
+        let host = UIHostingController(rootView: screen)
+        host.view.frame = CGRect(x: 0, y: 0, width: 402, height: 1)
+        let image = try await renderSnapshotImage(
+            of: host,
+            named: "full-content-accessibility-probe",
+            sizing: .intrinsic(width: 402, minimumHeight: 0),
+            safeAreaInsets: .zero,
+            isAccessibility: true,
+        )
+        #expect(image.size.height > 3000)
+        #expect(image.size.width > 402)
+    }
+
     private func renderTwoTone(height: CGFloat) async throws -> TwoToneSample {
         try waitFor { hostKeyWindow() != nil }
         let half = height / 2
@@ -103,7 +237,7 @@ struct LargeViewCaptureTests {
         .frame(width: 402, height: height)
         let host = UIHostingController(rootView: view)
         host.view.frame = CGRect(x: 0, y: 0, width: 402, height: height)
-        let image = await renderSnapshotImage(
+        let image = try await renderSnapshotImage(
             of: host,
             named: "two-tone-\(Int(height))pt-probe",
             safeAreaInsets: .zero,
diff --git a/Shared/SnapshotKitTesting/Tests/PreCaptureHookTests.swift b/Shared/SnapshotKitTesting/Tests/PreCaptureHookTests.swift
index 06a4f09f..111242d4 100644
--- a/Shared/SnapshotKitTesting/Tests/PreCaptureHookTests.swift
+++ b/Shared/SnapshotKitTesting/Tests/PreCaptureHookTests.swift
@@ -21,7 +21,7 @@ struct PreCaptureHookTests {
         host.view.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
 
         var hookSawSettledContent = false
-        let image = await renderSnapshotImage(
+        let image = try await renderSnapshotImage(
             of: host,
             named: "pre-capture-hook-probe",
             safeAreaInsets: .zero,
diff --git a/Shared/SnapshotKitTesting/Tests/SafeAreaCompositionTests.swift b/Shared/SnapshotKitTesting/Tests/SafeAreaCompositionTests.swift
index dc74f634..027b9c7e 100644
--- a/Shared/SnapshotKitTesting/Tests/SafeAreaCompositionTests.swift
+++ b/Shared/SnapshotKitTesting/Tests/SafeAreaCompositionTests.swift
@@ -21,7 +21,7 @@ struct SafeAreaCompositionTests {
         try waitFor { hostKeyWindow() != nil }
         let host = UIHostingController(rootView: Color.red)
         host.view.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
-        let image = await renderSnapshotImage(
+        let image = try await renderSnapshotImage(
             of: host,
             named: "zeroed-root-probe",
             safeAreaInsets: .zero,
@@ -38,7 +38,7 @@ struct SafeAreaCompositionTests {
         try waitFor { hostKeyWindow() != nil }
         let host = UIHostingController(rootView: BarProbeView())
         host.view.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
-        let image = await renderSnapshotImage(
+        let image = try await renderSnapshotImage(
             of: host,
             named: "safe-area-bar-probe",
             safeAreaInsets: .zero,
diff --git a/Shared/SnapshotKitTesting/Tests/SnapshotCaptureFlagTests.swift b/Shared/SnapshotKitTesting/Tests/SnapshotCaptureFlagTests.swift
index 39effeea..c3207853 100644
--- a/Shared/SnapshotKitTesting/Tests/SnapshotCaptureFlagTests.swift
+++ b/Shared/SnapshotKitTesting/Tests/SnapshotCaptureFlagTests.swift
@@ -21,7 +21,7 @@ struct SnapshotCaptureFlagTests {
         try waitFor { hostKeyWindow() != nil }
         let host = UIHostingController(rootView: CaptureFlagProbeView())
         host.view.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
-        let image = await renderSnapshotImage(
+        let image = try await renderSnapshotImage(
             of: host,
             named: "capture-flag-probe",
             safeAreaInsets: .zero,
diff --git a/Where/WhereUI/SnapshotTests/SnapshotCaptureFlagProbeTests.swift b/Where/WhereUI/SnapshotTests/SnapshotCaptureFlagProbeTests.swift
index 5095dfad..abc741f2 100644
--- a/Where/WhereUI/SnapshotTests/SnapshotCaptureFlagProbeTests.swift
+++ b/Where/WhereUI/SnapshotTests/SnapshotCaptureFlagProbeTests.swift
@@ -33,7 +33,7 @@ struct SnapshotCaptureFlagProbeTests {
             rootView: SnapshotCaptureFlagProbe().frame(width: 100, height: 100),
         )
         host.view.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
-        let image = await renderSnapshotImage(
+        let image = try await renderSnapshotImage(
             of: host,
             named: "whereui-capture-flag-probe",
             safeAreaInsets: .zero,
diff --git a/Where/WhereUI/SnapshotTests/WhereFlyoverViewSnapshotTests.swift b/Where/WhereUI/SnapshotTests/WhereFlyoverViewSnapshotTests.swift
index 46d0287d..91b8ff43 100644
--- a/Where/WhereUI/SnapshotTests/WhereFlyoverViewSnapshotTests.swift
+++ b/Where/WhereUI/SnapshotTests/WhereFlyoverViewSnapshotTests.swift
@@ -13,7 +13,7 @@ struct WhereFlyoverViewSnapshotTests {
             of: FlyoverView(catalog: WhereFlyoverCatalog.make(world: world)),
             named: "WhereFlyover",
             configurations: SnapshotConfiguration.combinations(
-                devices: [.iPad],
+                devices: [.iPadFullContent],
                 colorSchemes: [.light],
             ),
             // Flyover intentionally hosts many independent screen trees whose
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad.png
index 7525bec2..f281c4ed 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8196f7ec00c516d5a39fde9fbef3628af3cc9209b7accd41d923310046a2c23
-size 1864117
+oid sha256:2b0d81bda20a1314e92265d80194e91d6253fab11caafee64d8a62fc9c1e2c3b
+size 1671529
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_accessibility.png
index d152642b..0e9414e2 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8fa628dad7a706c87b5572eaedcc291b0e30a9498055591fc616c0794b9d929
-size 1626944
+oid sha256:adf7e2d6994223a574552f38fbc2b1618c5138612aee26cfd341ab6923137430
+size 1646063
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_ax5.png
index 191dccf9..798be3fa 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c176007f9e5d0b57c9c651a6abc6770e75991d40ba6cda5a14db6884427619a3
-size 5531642
+oid sha256:f89cfa4ee20dd2359616a663af8ad8c4357121e15cbcc50f4d736e13aa2cb22b
+size 5369076
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_contrast.png
index af237cfc..25a7d7fb 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc8b8c0306f341e1b6886e1be090049cbbe0c04bf65861374476a5d626a58aee
-size 1867488
+oid sha256:b9208093764ed3e3afb1ad366ae7b1299d6ca77c11aaa06836f1f404fd8fb3a5
+size 1685492
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_dark.png
index 84b39381..9c9ec660 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPad_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f96454b716c35d0d4d6ca47bd1bea047d5c5215b3cd78394bcb729542d1cf731
-size 1663390
+oid sha256:6ab6b5268d89ec93840cc8d1f59d16d9339acbd2b19cf37c3303a9a6f06a6ea0
+size 1680496
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone.png
index c79352c4..68b03204 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:abe5b498eeef8f9d96805cd4728abe619721908df8be3282cedef79eb82b621d
-size 1322197
+oid sha256:66e55c0d495d2a9738991b9f4185a3031c5e84e3a8428a6698626ff3aafb7dd1
+size 1179792
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_accessibility.png
index 93a5aaa9..87e36f68 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f8adc4ac9bf45d4b79e794d8cdd64f5d5549e0aca2d114fdda754a0461a2d54
-size 1291389
+oid sha256:7301f86c6e4139fde615b5d8348e608f0029e879cfb710747151c08f81905152
+size 1294323
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_ax5.png
index d47f764a..555b8575 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6e106aafdd2e247304d5571f28e8267ee65f6419725ad8e6f2a075a77ee107d0
-size 6115163
+oid sha256:51c79051090ce9f35af48cd5364c2d1ee362d0ccda0130c5975337918616ce93
+size 6024525
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_contrast.png
index 36b8457f..29fdfe00 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b126a44a7b4b825c1d11eb44acf375d35f258f65dfddf035dfce1482448ec5da
-size 1339837
+oid sha256:560e1be4e51fb6954d9db53033437bfb81047a214f0c17fa530931ff2ccaa6d7
+size 1193487
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_dark.png
index 52a183b9..2d813a27 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Default_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6bcc91163b432e072890a0e09b2a41ab700406c16b1b81ecab88b5aa38ac483b
-size 1176792
+oid sha256:e44e18a3fb3f4106f9f85d0fd6aebaaa6ba923ef164a597a4dbbee0f39878f0f
+size 1185622
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.DirtyTree_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.DirtyTree_iPhone.png
index 3b7a6877..c653148e 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.DirtyTree_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.DirtyTree_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52473ec2b07d0718bce7a4f5cf9d73d275c7d637c66bd52c26c27f8ec596d0fe
-size 1325350
+oid sha256:40a663916b577a5ed3f88616f34d54ec77e05b66e34492674b071e97e5daf71f
+size 1183105
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.DirtyTree_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.DirtyTree_iPhone_dark.png
index 2b46ab28..ce759bf0 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.DirtyTree_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.DirtyTree_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f4ff49b0f8bd4cf54108d0284e72ffc48929900b31fc8d0540b79d2dff5c37f
-size 1179730
+oid sha256:2dca8d484b0a11252215395dfaba7741a701de07c6940d16d41d4a159e59d30e
+size 1188710
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.LibrariesOnly_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.LibrariesOnly_iPhone.png
index 3aa5a7a1..8126dcc2 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.LibrariesOnly_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.LibrariesOnly_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:70de0257fcd9ebe21ec1255820b852ca8b8a0892b862fa6f046941ee0fe7c440
-size 1319658
+oid sha256:dd2c01ee623aebbf3e3df1d28c853e81e2300418c7f393df933d7829643a8327
+size 1176660
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.LibrariesOnly_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.LibrariesOnly_iPhone_dark.png
index 3faf816f..99f698be 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.LibrariesOnly_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.LibrariesOnly_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:62e55dd3be700b006a8b4e8d6188d14e9ab57a4ce72f323e61df1e4873b9ae40
-size 1174104
+oid sha256:e601513b3a56f18a2e23f18a98ed5acfce4e4138d0eaae20b292474c09f8b8a8
+size 1181890
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Unattributed_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Unattributed_iPhone.png
index f43b7ac7..ee842d92 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Unattributed_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Unattributed_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:20c23c925aa1f8b38e2f2cdd99b7c751db888c156dd991dc6db305a85241eed9
-size 1323127
+oid sha256:59dcef9e3a123aaeb19f43a3f157654b6555d6e81293f002ec7ce2059de48ec9
+size 1178633
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Unattributed_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Unattributed_iPhone_dark.png
index 9b51e23d..80a04d01 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Unattributed_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AboutSettingsViewSnapshotTests/about.Unattributed_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:45b4b0b618dc9ed6ea135ad161edb3f3a16e7a4378e53db5cb8dde3fe34e3de5
-size 1178000
+oid sha256:fa3678b328f80e9a77dad484716c1d041dd5a88c945fe8d34de96bbebaee6683
+size 1184474
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AppIconViewSnapshotTests/appIcon.Default_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AppIconViewSnapshotTests/appIcon.Default_iPad_accessibility.png
index e2aeb7f4..aa655117 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AppIconViewSnapshotTests/appIcon.Default_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AppIconViewSnapshotTests/appIcon.Default_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9be1d8dae30564909778bb649c631d8144fe49c73d5734eea53075fe144965fe
-size 881900
+oid sha256:92e8a3a20ba9c75051b107d0d2dc9be157bede000b86a0238923b9400a35ca9a
+size 879627
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/AppIconViewSnapshotTests/appIcon.Default_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/AppIconViewSnapshotTests/appIcon.Default_iPhone_accessibility.png
index c08bfd04..12b2b1fa 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/AppIconViewSnapshotTests/appIcon.Default_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/AppIconViewSnapshotTests/appIcon.Default_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e039185e04309cec4b35404aaedcb720733d4b2bd8f58e6f3648b40ee459de68
-size 831893
+oid sha256:ae280d4b9bbe5a3ee53d2bafb5d5bd021c7858b64d4c669c265cf90c567b19fd
+size 829005
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Empty_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Empty_iPhone.png
index 2f32ec04..79c180ea 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Empty_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Empty_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c7c31e64348c09ab87fead4e30c982799396758b08be3a89f00a25ac00aa60a
-size 221085
+oid sha256:4a7e54e1227871b7d48ba0a6c815444282dd628c1d6c4dd0c53d6581be3680bb
+size 690381
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Empty_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Empty_iPhone_dark.png
index 08cd4ee1..39402644 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Empty_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Empty_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cc46db36804d7df1f4418d55deee05716c9948740301b23d5064248cb57f987
-size 207938
+oid sha256:2b5dfa543283722a47dd5e94e551b22a2cb33231847587470616ebeaf6123ced
+size 648652
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Focused_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Focused_iPhone.png
index 8cd77dce..a5b060d7 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Focused_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Focused_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d45d9e9b20df9a30bf7a96f18ec63f1705294f800ad6cafeca7598556428d685
-size 199908
+oid sha256:05fb3a11fe5e29f7309ee9506f8270b3fbf4d8eebfbaf85863be2fb377327313
+size 759843
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Focused_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Focused_iPhone_dark.png
index d1ad26a6..edac051a 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Focused_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.Focused_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e193af0cb5abb6526c0df8eeb23d31d22a09dd6c8066e38845262740e13ea152
-size 188886
+oid sha256:7f06e69ecf7cedfbd0f95be37aafd7651bce7037b736289673e3c7dd43ad49a5
+size 731719
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.FullContent_fullHeight.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.FullContent_fullHeight.png
deleted file mode 100644
index d6bbaef3..00000000
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.FullContent_fullHeight.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:85b05a6dad04002a85dc0c1a520a14d86e18b06117fd0e8934f4f564bb530af2
-size 1009600
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad.png
index 327d3631..5a7fb8e5 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:952002a769e972a5bc49796c28ac58fe966c1e95ac8be96ca29a1775c9aa0d67
-size 437880
+oid sha256:f84ece8c1cce0bd4f5a4910a4c5a0bcfb200d14355c9c51557b45b71691dee61
+size 1071854
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_accessibility.png
index 7747d633..41474ea1 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10293899a159dbc787b64a2d1b1b75775e9d7f171aa1fe6a866bc55fae09d1f3
-size 1481620
+oid sha256:20c3dc58ebcf58ba681dbb9373a6abc0a52a619497585904561ca375af0b843d
+size 3633520
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_ax5.png
index 90ccb3ff..f04e2305 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0cd2cba2722d4d1777e3da3fdf56d47b0be3af246a47dd0dcc3a2e0badd644b1
-size 468706
+oid sha256:adf2abbcd24db11fd5abe6c3ec4b8dfa782b6495d69fa27372beb7a68cabcd6c
+size 1666729
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_contrast.png
index e11f30e8..b906a60b 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4cc4c1ef60e3d03c4420a5fa54620b021e8054411a65d022bf0eaa9a3757bfc
-size 437132
+oid sha256:fd167536f3e366502f79f10fac7a84419d6dc826aca25dd73dfeed07cd6f4fb5
+size 1070235
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_dark.png
index 66815a9d..5f357864 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPad_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bb68489d4b60890353aeec5783d1aa5cf58e77276a18c6f077bc0a165c1a42c1
-size 429576
+oid sha256:1ab525a778cdc9aa9968602f870b69d7d0f2c480ee8b3c8afe276c914cf90fea
+size 1045894
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone.png
index 9f979b37..b4f6935c 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:602f75b42b3914c4fe75170e65bbcfe2a56833d962ac7da41af2b01327a0c37a
-size 227848
+oid sha256:9199867dcdccc46d3a76bf2ed13aed6f32bb59daecd54764d35d6ce2b22bd15a
+size 793550
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_accessibility.png
index 1214cbde..7cd8f8c4 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:52dd2b125a6a4c651edb06b5b97aa7d74146d898319aa563bcc3fab3f788c02e
-size 923875
+oid sha256:171cedde1b7bd43b44640bc8470721880929bca8b31c071b812fc8d08def7aa7
+size 3204875
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_ax5.png
index d83cb15c..f0f6d3f6 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1369ddbb8ba728a515bf4c6c17c23579b825b378d1432ac402d6f32ee110a52c
-size 223318
+oid sha256:e15298d930d08759d793119fa1a72cc058c5982ce52095ee3100067b3e5cfd97
+size 1440986
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_contrast.png
index a777c0f6..283ff2a0 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f141a127ebf6162e774f704c718eba53842bda4d86f259abe08eeb51c93afda
-size 231519
+oid sha256:d55884e173ac443783e584df8b9f710ee5824946380df29b68d6f6c9bf7850f1
+size 795173
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_dark.png
index ef02c756..085103ab 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CalendarContentViewSnapshotTests/calendarContent.WithData_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5d799f6b1b57318e64ca63694b07f8ff8bc5f49e189298cb8e55197940f00fc
-size 224211
+oid sha256:99e92fd738820b3b819908ff4e147c31ad4d5fefbcca3a60972a064ef6526da8
+size 774037
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CardDesignerStudioViewSnapshotTests/cardDesignerStudio.Default_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CardDesignerStudioViewSnapshotTests/cardDesignerStudio.Default_iPhone.png
index 49208b38..d0b22ec1 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CardDesignerStudioViewSnapshotTests/cardDesignerStudio.Default_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CardDesignerStudioViewSnapshotTests/cardDesignerStudio.Default_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b63c3c6474d2cd6bee138fd543263a7296d7959e9dd042eeb973d025027a9528
-size 1030875
+oid sha256:b84c47d499685e74ed38dd97d27239892c51a8697a484d8d5c36d66bd9ac5fe1
+size 2294085
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/CardDesignerStudioViewSnapshotTests/cardDesignerStudio.Default_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/CardDesignerStudioViewSnapshotTests/cardDesignerStudio.Default_iPhone_dark.png
index bb8424f0..0d1bd2e4 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/CardDesignerStudioViewSnapshotTests/cardDesignerStudio.Default_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/CardDesignerStudioViewSnapshotTests/cardDesignerStudio.Default_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4377af8ca4723e407f8b0944ff18ec755f822595dbf1f771d22b5a3218be2614
-size 1177910
+oid sha256:224bb86aaddcaa161bcfb8c81fd4525dbac639047449a6669cdee3f8c129ce72
+size 2203117
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad.png
index ee991738..d6b45cb7 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d559c85d2a4a289734e0a61effe37da91a7ed1e07a14398f9b72ac12a301c10
-size 1406460
+oid sha256:fdbf2fa53b00abdecb9ab32c23b85adeec2aed3de47dd63795d3970e13b64695
+size 1287375
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_accessibility.png
index 34f84df8..46fd3b54 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf228910a10ecf529907b717e31df5e67274513567b282ed7fad4a9083d7df04
-size 925953
+oid sha256:ec1143aba713443ed3eff1fd1dcc3ff5828b39d3b827a551362e0d33c1a9956a
+size 1091025
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_ax5.png
index 2e41ea49..27b122e4 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:592410c7f92ed83d3e46ddd9575b03228faf3a2e5f16e4d7f1aae38ae9e77150
-size 4154460
+oid sha256:67464865bddd8007038424126ed0f3ac29a49d480d587a723bc47534f959af65
+size 3985096
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_contrast.png
index dce9be11..4eac8e3f 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:89541b3e6b764bd63bb55e380928ce51387367a6e96262337831b5134727e0d5
-size 1399613
+oid sha256:c3bd3f41c953e2e459f38ea8610c5f5968bc09168ff00977d09227b1b1ae3dfb
+size 1290269
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_dark.png
index 2f9cc591..450e5bca 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPad_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:589b322009ae58db64adfa0af2d00babbc6732c4f848c2fa3da75ff1c88a2bd9
-size 1189688
+oid sha256:623d1a7753ae853c408caa0954f44b3d61eb5afa55f8db8bd566f630b6bddaf2
+size 1278582
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone.png
index 1d5e9d6b..4ad3d2a1 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddb453875207b5a5758d046a5a6a85b802b0e149800492c0d03e823f73f76449
-size 999052
+oid sha256:50e1f049c38e5e3fefa3f6377cf5b305c4dc169cffe3d007b178ddd043e65427
+size 858818
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_accessibility.png
index 5e6f7db4..d8e66405 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d230ec79c3f86f9a65eafcbfe6cb6e15acd370c4b20dcb8bd79e105f47f602e6
-size 746614
+oid sha256:fd320fad42ffa80b4b4e429a47864cc7f8b2c94a04bd294cda106bb46bd0fdb6
+size 762595
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_ax5.png
index ec30f5b8..d10f528d 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b183eddd1cc61fe439c3a77c92865cd60a46a8ebe9103eebc8cff14d7f5e6a7
-size 4589088
+oid sha256:5e3b26f0f30217b22df36d1edefedba3826b7f726e54abadd5fa892ad45c2f05
+size 4470571
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_contrast.png
index 9ea97765..3daedbdc 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:47786f0b9cfc98c55603494b3a3111e8a3c89d28a5c185c76ef294318ab30b67
-size 1006506
+oid sha256:6dd3cd1298f53c196d69dd83704a66ca34445de9ae2265ce63c8e57cab274dfc
+size 863591
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_dark.png
index 9334ccc7..9dd53d17 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DataSettingsViewSnapshotTests/data.Default_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:dc3fd4ddd22348e26b07599d1ae27c49fe8d9bd831483832da391409f7e1ac43
-size 844112
+oid sha256:6e5d15b97dd5ee8f19a840f87f0e292f0a4b20fd9ad72dab711ad9998986bee1
+size 854967
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad.png
index a6b5c603..9865c848 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d3f2373325855921ba29127be65d46309efa7d85aa04dead1d0adb24c4f743a0
-size 449485
+oid sha256:821ba3357d58cde6d803438932019042c9b9b5d2c66d6746dce6149f94415e61
+size 1367923
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_accessibility.png
index d82a61ac..eb4a0dfc 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b04592db8f7b8151fefdb979197111ac2303c08d84dfa40f4430638145b712fa
-size 891011
+oid sha256:73e573f4ceccd0967fb7d413bcf643cbc213fe2eda2dbb381a0a7bf32325ef0b
+size 2750234
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_ax5.png
index c5317251..6244a5d5 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ec58febb21c0dda22aea06de9abf34e9ee533f29718c563e418786c10aae362
-size 609595
+oid sha256:5f5b012b1b7408359c6db3b76188f3c3916ec3b8b3d4e473fb2ff85ba7a84b02
+size 3676007
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_contrast.png
index bf319b08..c467e80d 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:527576ff6a67fdbdcce8677327b1a177bf86ee61e6d9020f9da48c24a244b45f
-size 453355
+oid sha256:4844302de95a7d95eda52c7ae9cf845bac4ca8e7e9f3d0e70a43e914299821a0
+size 1385376
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_dark.png
index 8b8e8eef..7580bef4 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPad_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:996169b53da12622295e752a0746619f9afd428675f7dd7263fb85710e2f825f
-size 455936
+oid sha256:785a06a4147bebe33635f6a993c55299f64846f5df81befcf07c926f804684cb
+size 1405228
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone.png
index 6b6ab6a8..33cf0c81 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:433fa24fbf560abf8fbcd63d391540d2bdc447438a1e34c2b90b8ab9ed7ece38
-size 272285
+oid sha256:3d4a3b4a1ddc250f1536a783bb95f6ee142450f3a7b628d4a4e7f2f9241b09c6
+size 1113396
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_accessibility.png
index 339984d6..5f2c2396 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7e4f66c42024063be57beea71961d907df31f7989290a42174cfafd87d8f36fb
-size 570206
+oid sha256:c4d74aa51ece5c8378992f36a7338a5ca459f1e0905808fff91407c027cdc1ab
+size 2423867
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_ax5.png
index 01707781..3c26970a 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7be31245eb968846af7f3d25e7b7ee0971ef885714e4331c4185e5f9bd60feb7
-size 303943
+oid sha256:d05aff90ac82f9eaeb947fe33b2dac4f2ef32675e55b04c6a4d0eb78e94e50f9
+size 3562870
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_contrast.png
index 54237d2f..878be3c1 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:07b5813b5bacdeea3ebb4f57fbe6c1d299391cfda0fda704139f4d5dd58590d5
-size 269470
+oid sha256:6baaa8b5b0cfce085e5bf4aaf5e4d2f7309affbab34c3c16745de6f13b214cf5
+size 1130469
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_dark.png
index d3ce9dcc..673f20f5 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.Default_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4593e0cfd6158220e426e3adaad8d90a1346c5a0d21f540e1f3a17e0e936cc7e
-size 265853
+oid sha256:138c776afe8e51d7607e3155f3697397dc176097d0957be3b0cf31d3f612ab2c
+size 1123504
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.WithAudit_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.WithAudit_iPhone.png
index 719bb8a3..7a860818 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.WithAudit_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.WithAudit_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:85a0bc8c6f82319e209297c9c2049c1c43d98c0cd44c0f7cbb84f0859b3c2050
-size 272888
+oid sha256:ff807d2c82d26acf4307a450f67e66ea752aecd87b74b31957d52cf21418aa19
+size 1229819
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.WithAudit_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.WithAudit_iPhone_dark.png
index 7d36089d..e245c1f0 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.WithAudit_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DayRelabelViewSnapshotTests/dayRelabel.WithAudit_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ac9f217d3cbd194fa3a1ad0d5e7696dc11d7d8b81a9c6dcc6d27a47409f36221
-size 266039
+oid sha256:02de92996860117935fea54640a033ab137e1bcaa504a36aa6fb33c9fe2ce22e
+size 1262169
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/DeveloperOverlaySnapshotTests/developerOverlay.SelectedTool_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/DeveloperOverlaySnapshotTests/developerOverlay.SelectedTool_iPhone.png
index aed908ef..29e07bfd 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/DeveloperOverlaySnapshotTests/developerOverlay.SelectedTool_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/DeveloperOverlaySnapshotTests/developerOverlay.SelectedTool_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ec4f7d30f12969ca0f685d918fb7564dcbdfe48ac7e5eb769dcbf8db15ff5cf1
-size 223206
+oid sha256:c7d701f1737abfa66f42afdedd73e813dcd6d109d0199d8bcfb334d989e79d5c
+size 177106
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPad_accessibility.png
index c5106c4e..aa1a1baa 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:14ee1c1110f8fd4fa988430eef85db1e57b9938ca5f18789d7562bd85e38bca1
-size 1824131
+oid sha256:6e00ff4c471ea71a7c37447fe71d941b66983c2934f9fd92049266e485193454
+size 1825563
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPhone_accessibility.png
index 0f9496d8..01b5b8cb 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5b8c5745199b4fbdc66d28313cc49eab3ec51c0e8f17de8ac6e6c36cf73d7ac6
-size 1091207
+oid sha256:d9a04d6f35cb33c23f0984033cc5a3cee704459f196433793015b7c7f62199f5
+size 1089741
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPhone_ax5.png
index 42924f34..dc7bac30 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ElsewhereViewSnapshotTests/elsewhere.Loaded_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9867b1fc4c99a92fd9d2be36b4c5d7932c26dad50e3dacfdcd947684a6aa0859
-size 1656270
+oid sha256:680bbfa94d6a476b06470f814deea72dcdbff5cfce3e9873b0e60d6549668a70
+size 2095764
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPad_accessibility.png
index 33a39382..49c6661d 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c5a9c3ee553a2104bee9bfc8b8c599c5226971cc37a11afae0ca636e394d4753
-size 528028
+oid sha256:08383170fdc105fb5c4dff79f30b4c0dd33e2f5290a2ff9bbb09da1778ccdf32
+size 632488
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPad_ax5.png
index 61643fee..32a09d83 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:10ee1d844656224519ab97dcadc95a33b708bf729fc5f0d2e6a6a67e418cae61
-size 563338
+oid sha256:466a3169a08cbd03c0be4ea22a86f8dee4f01d0fa741e2aef1c397efd9f6eb4b
+size 619900
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPhone_accessibility.png
index c8c8e7ab..2fc99f75 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39a57de8f85c108ff602340d8e89f0e6f8e1e29388b078d7711aaf2cbe8d589b
-size 393867
+oid sha256:eb5cfb6eacfa9d4eccf514a1497e15e0676acda10f464f1916276f5749a86c58
+size 448463
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPhone_ax5.png
index 9aa81036..e08dacbd 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/FlightDayDetailViewSnapshotTests/flightDayDetail.Default_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a3ca29d21511f0667b993ac399944811a608718dd493f1e56c652cde60db3f3
-size 253315
+oid sha256:07b92e13b5e1ebf7f78db9690de6c83bfe1fe3d25d9d88874a9144e8513cc9fd
+size 617045
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPad_accessibility.png
index 61c2d1d2..f0021e4c 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2fd7ef865df350d7065c02a29f07ae60cc278b5d05290f4f514c511ac2198b27
-size 415249
+oid sha256:d55cc76b4a1a5e2a874d1998edc2195a2fde10a800ef7c636d9b42ad11dff02b
+size 415425
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPhone_accessibility.png
index 9669de64..cbfc5b84 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7952dbb35334c63917df8fa50f92305b5c2d00deba3216029f0af1b1316d9869
-size 283914
+oid sha256:8d5d58d9d767233e7508a4d8c79b01c7984d659389c121b8d2b9d4dd34030ddf
+size 283635
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPhone_ax5.png
index 7610e973..4dbb8b7b 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LicenseViewSnapshotTests/license.Default_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4a951cc3c62004f2dd5758bafda41e04ab222054d3f4df9a1c3706a53791547d
-size 208168
+oid sha256:e55e1e0e4a6572090fea8ba0a490592bd24264f93430ff2c6ae6236e530e57ce
+size 397505
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPad_accessibility.png
index a486bb06..e4745b3e 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f284751fb6e582782d6c50abed9bb8eb311578e25a0eab8668ce288fdaedf3c
-size 2316172
+oid sha256:5838ed0b77bc13f1b7c99daaa5ff8df9c6b2391433bc8c5e73051c20355a217d
+size 2318218
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPhone_accessibility.png
index 06cedbf6..151014cf 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2b91622f65fe9522ad5bf10f7a525998c13c5a445e71945c9b64cfcace5e9be1
-size 1407081
+oid sha256:76f289ea5277db12c85e8b838565b0c7acf5555a1adaaa18fccdab01b5696a35
+size 1424180
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPhone_ax5.png
index 75538b7c..e5e3723e 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.Loaded_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c3f3efbd89321bef942f4893c598b11ec49ff9123c57df6e739c57abd4d04f71
-size 2552779
+oid sha256:c4a4fbaaa57e687241dc0e30a2a0cacb29101a3347d571bd7dd045267e509612
+size 2562262
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.MissingDays_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.MissingDays_iPhone.png
index e4399666..6b6c9dc7 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.MissingDays_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.MissingDays_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bf8fcfbf31aade576fe6493508bb04dfee3786e9dfdf5eb4a36bbd4195c7ff06
-size 1197949
+oid sha256:54ba5d103dd26ab338e47de146e6d2328a1c9c35b20758851f76659a3364ad64
+size 1199231
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.MissingDays_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.MissingDays_iPhone_dark.png
index 76765d04..61f00dce 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.MissingDays_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LocationsViewSnapshotTests/locations.MissingDays_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f45e56de038f464d5a30746d06b007e6fbdffff3593c3f300b3dd7052f7a767
-size 1246981
+oid sha256:ac355069ef83959b69e8a836d15cc17a0b456c4c8acc7a60a1f9ed73c0466430
+size 1246553
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Failed_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Failed_iPhone.png
index c0f80e2b..d76dce76 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Failed_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Failed_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8400984dad06eb11aff9723e03741a1595ef999db295500dfdbddd1630cf840d
-size 133261
+oid sha256:e5d9590e11d6efffd1dffbc661f41ebdc907671cfdaa91beb3ae9820231f5e21
+size 107591
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Failed_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Failed_iPhone_dark.png
index 5c91fdf2..b26f9a32 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Failed_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Failed_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5aee42d45596e5b84259391897d027fc021ea006625faf9af7c117dd293f3c79
-size 141626
+oid sha256:0981c5e72de9f90260b797d8edecf9bda7e3535263bc4622d5d193fafca972c7
+size 117549
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad.png
index 869c3226..47e4bce7 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7e992f3a396016cc5e3b8789c01ce608445a7dcce112fb949d0ebfbb06db198
-size 235597
+oid sha256:d992a8a5a96107324f03e33429b1abde80fa8c1dd791f3b6d3d469eb3aa732da
+size 262679
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_accessibility.png
index 0bcea042..503669b4 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b2b18f0e000656621fc8e03c63bf03da2d2733b65e0487c5ce51fd82d15c0b96
-size 386185
+oid sha256:349ce014b93bc1eeb5eda7763841f20d42d0d8239b6751ac3d8b5e8fa55b83f1
+size 465414
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_ax5.png
index 38ad7932..7a4fb9be 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e51916d0a5cab83bbd3acfc071f3c53dcf97cc06c028e57ae1afdd1b7079c6a7
-size 338065
+oid sha256:b3c583138301854a390954dc52e87d6fd36f86922c3e67ed8f0ca5fac0bf4dae
+size 427967
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_contrast.png
index 20543960..d79db091 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e9e0208e8b7d2c1ecdaf08771ee02fd70bf584595f71570afb1805fffa51060a
-size 236384
+oid sha256:cd9ad3bebe736c8bd689aa88d7c43882ef7e00fc690ad57f16f01f6fbfe85c3a
+size 263402
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_dark.png
index 6d79a566..28282947 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPad_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d01e9b7693b6dabb60a04f4b9faee9c7556935b9d40340bd43039966e9f09f4
-size 252823
+oid sha256:39e3ee64ed3adb969cb7e6fc146147ad271b5cb0968e4ba7b093a383752b4d8b
+size 279082
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone.png
index c0f80e2b..25d9fd28 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8400984dad06eb11aff9723e03741a1595ef999db295500dfdbddd1630cf840d
-size 133261
+oid sha256:a92e028216d2fed4c762bac9dc6bea624572c1fc08b2091a4775202eb7ef9380
+size 155834
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_accessibility.png
index 1754935b..d275f3f6 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8d285efc4b24a47cc4458edbf2dcbae21533c92555303dd80141b9810d5f8470
-size 264747
+oid sha256:f67ae15f73a579b81dba400453722ee2d7b13b0df9c1fbda661e828c1adb2191
+size 333616
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_ax5.png
index c2cfbb5f..366b573e 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:88f7b887f5f145e088903aabf564f54d6cd6c5e37a949e83992f56464a7fa836
-size 240134
+oid sha256:5b311253cde3604d0b85f91ed32c907b1b7ab5e8aa42ed6adbab79263fa12a12
+size 356907
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_contrast.png
index 15622701..9c37fb9e 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b4960a32063ea21f3378c9daf707f0fba0d7602d8d9c65fc996da60a1c5b7e81
-size 132690
+oid sha256:d4431f53c0835dc8218ef53fe4d6db97b8e98e269b446b0576ba0694781d348f
+size 155278
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_dark.png
index 5c91fdf2..bd0e52b1 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/LoggedDaysViewSnapshotTests/loggedDays.Loaded_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5aee42d45596e5b84259391897d027fc021ea006625faf9af7c117dd293f3c79
-size 141626
+oid sha256:1103c911dfdf6e183617ab1d9892bfd4eaac162837f40945c2667a3df0d9a87f
+size 167329
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.AddWithCancel_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.AddWithCancel_iPhone.png
index 5abb6adc..f2fd63ce 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.AddWithCancel_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.AddWithCancel_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a3bc8414b756b2aafccbba2742f5517d2e00da73fb48d483cc29748e0042085b
-size 272380
+oid sha256:5eca5e71cfe5ed3dbddf2e895d3efda9119a52ec67ef767c96f72561df6eb2e3
+size 274630
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.AddWithCancel_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.AddWithCancel_iPhone_dark.png
index 669bae43..0545441e 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.AddWithCancel_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.AddWithCancel_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5be694aed74704bc45080737316c6eedd1c034bca26efaae97ba3b5a4cab85a0
-size 260310
+oid sha256:094c13b7b91067ba6d7ed6877b10ce9a0eb0c123b67ed86e9f3ba621478beb61
+size 262426
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPad_accessibility.png
index 047aca6a..e3db09c3 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d2d20b336a4c666453b5b3963a3d9be6e9018ff572e16b04277bca91af41dc67
-size 661607
+oid sha256:aaed474fea4e8d478f8260625b0216528544fb596e4e49b4b527afbfea2e02af
+size 765060
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPad_ax5.png
index 37b19a92..96298cbf 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1f3b376c0036180bf374530f0159e73074df2a96fcfb6768f2762158d1d25ca2
-size 592087
+oid sha256:f1f4445af2011862944072844ac47c298197521ce643ce1a2bc6498abc186776
+size 765727
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone.png
index dd09406d..4a97ecc4 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fc882e792fe3dc89fc00ca7a5791304539355d4660ecce3393405f735374b245
-size 251724
+oid sha256:1dd04be6e6f4b5e1ffd6b60fd0d42f434abd1fc8b0029ea0c6df0731cbb86ff3
+size 253909
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_accessibility.png
index afd40f51..c30c961b 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3e22e9926145170886989d526a56a6663877fefa629bcc6dd8f0caa2ce45fdf5
-size 516162
+oid sha256:3e350d2f900c940718e35c1a17c6c3bd90806c7709967547d4e391c01146ba5f
+size 571819
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_ax5.png
index 8c2e3e03..fc91ebe9 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:25f396cb14ec88242557e4992f898cb36801858beb9cbaee5a7ea1db5e1d78c8
-size 300918
+oid sha256:869bd2304b4a12a8364dce84496fada868dad86f9cab2757d9bfc6a2b01d7e5a
+size 726421
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_contrast.png
index aa208feb..50b24968 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2dbfedee0e17afe5bb9f9cb32e495f0d1ecbd5133103f0ee0614fd484fbe4ceb
-size 249559
+oid sha256:2c48b3ada6a56883abba228dae72d695cea182361c32469022d4f52aa953cc51
+size 252129
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_dark.png
index b87dd4b7..4da0d6b7 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.Add_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8c691d7cdec3fbf608354e20e492e256832c54355e179a66f83106dda2516d90
-size 246871
+oid sha256:a0af20258af9f4ebfa7cc7d988e36802d07a596fd8e8d8c20f539bb4932ba112
+size 249134
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditAuthoritative_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditAuthoritative_iPhone.png
index f1bdbe5c..6a1cddc8 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditAuthoritative_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditAuthoritative_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:be75f69d9bf38cf45b9d1aa9f07a1b3d1379ae6c8088f16c4bc2b1171fd841e5
-size 273702
+oid sha256:3af4babd981386ef96dfe19d5688d1045ac6d4dc9d5797d50cc1a6718220736e
+size 338805
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditAuthoritative_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditAuthoritative_iPhone_dark.png
index 193ade75..229d5225 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditAuthoritative_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditAuthoritative_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9e80cc56d07e8247606d3d1b4f815907492fcc7975e2acc69e2a6eb62e6ccf63
-size 260522
+oid sha256:50e693519d5224466b55fe41e58b41fbb531a59aba5ff8b737bcad87984fd165
+size 326708
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditPlain_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditPlain_iPhone.png
index 670b40e5..590b766d 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditPlain_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditPlain_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06e62ea17d7f6828e356901a34a4c68f97628cc9cf883dc7266641062640cbf5
-size 274231
+oid sha256:599fe872e2ee7934a4298aebd70c0282376b59e4aa781443b369bb0308751012
+size 283145
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditPlain_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditPlain_iPhone_dark.png
index a58de96e..7d8dedf6 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditPlain_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ManualDayViewSnapshotTests/manualDay.EditPlain_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:48e29b4090fb189f2681256a630de196413f9ae10cdbebf7956770c14e2e6cf0
-size 261387
+oid sha256:5177a07eb7c1f560d0f67a1234b703b1a323e4a795715d4d80578f09a1a62640
+size 270346
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPad_accessibility.png
index 5e025558..bbaa159c 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ecbf1c30977679a9c746d0a98ab527e6e57a11f6d2e2e446c21ecf7b0c99546
-size 447773
+oid sha256:8ac8cadbdb3878eec3236bfda059ee948fecbe652301044d4a562c914da10510
+size 593034
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPhone_accessibility.png
index f47f8b20..506e7504 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:114c4328a63bb7f7651328a532ec39999c2054fc525422201f6bb0ba85a6b27f
-size 298017
+oid sha256:be22943eb27c157c0fb77e4d8fa4cae25b53e96f1a4c52f12ed05d434f88e5fb
+size 389190
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPhone_ax5.png
index 8bd9b175..aa5765ef 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/PresenceTimelineListSnapshotTests/presenceTimeline.WithData_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:36d5c68f699dc2919c49744b1d5f043d3393378402c533b2979b0d1fd00388fc
-size 247643
+oid sha256:6721014aaeee3a4aca330e8b9bdaec4f00b05cb5be9d194582d3defe8a37433a
+size 638513
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RecentActivitySummaryViewSnapshotTests/recentActivity.Loaded_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RecentActivitySummaryViewSnapshotTests/recentActivity.Loaded_iPad_accessibility.png
index f01e7409..36c55f68 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RecentActivitySummaryViewSnapshotTests/recentActivity.Loaded_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RecentActivitySummaryViewSnapshotTests/recentActivity.Loaded_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e15ae2e602539013cb512dd5f5a15fc380476b3dd79d936d31615bac45bb1d20
-size 621074
+oid sha256:ec0e8e9c3b8d43d7f1fc91deccc479552bcb96b8ec62c709100f32a5b102e759
+size 554395
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RecentActivitySummaryViewSnapshotTests/recentActivity.Loaded_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RecentActivitySummaryViewSnapshotTests/recentActivity.Loaded_iPhone_accessibility.png
index 9e375290..12dc558f 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RecentActivitySummaryViewSnapshotTests/recentActivity.Loaded_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RecentActivitySummaryViewSnapshotTests/recentActivity.Loaded_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8250320e6456160a73fee40e10dc87329aa051efe840dadc00a440ec4fc29ab4
-size 409104
+oid sha256:937b40995c41474a24f35a3446ee1a242cbc48ba55193e6fd4fc77d9b89a8533
+size 367660
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.Editor_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.Editor_iPhone.png
index 4608c890..9f52ef83 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.Editor_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.Editor_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f6ce7c00b780d2cd9773dccab22d814dac81e8b482c7e69d89bf49a36d37732
-size 1423600
+oid sha256:2723c1cac8bdd505d710f4f9e70f490567347110d6eeef748e98f75a99c8e590
+size 1572247
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.Editor_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.Editor_iPhone_dark.png
index 64f9d531..8872e1c7 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.Editor_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.Editor_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a7c643294879d4d5cc4b4c41849c8f18dd54b764beac821181e335bf53bd665
-size 1531556
+oid sha256:1b22648257028160d0fc9ed974e2b76e683ad1f48fbc67c2a0c6eef4204c80f4
+size 1682297
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.NeutralEditor_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.NeutralEditor_iPhone.png
index 09cc6d01..d9be1ea8 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.NeutralEditor_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.NeutralEditor_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a9366055af28267a2cce6acc50400a00a2667cc756115272fd620b50533fb362
-size 1345592
+oid sha256:a29f5cb3d5051614f85ad33918f7f38232bc61847e238eeedfc0ff3eb55d0249
+size 1492705
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.NeutralEditor_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.NeutralEditor_iPhone_dark.png
index dea89a05..730ccf6f 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.NeutralEditor_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionCustomizeViewSnapshotTests/regionCustomize.NeutralEditor_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5cbe2009bcc93e20f84cdbe60e4704a397c8eded2911506eae733dc7ea452d14
-size 1368962
+oid sha256:754906f1773c3eeb97ba30f1e4e4f5a2b6d68032063b7573b8c3fd3511a785e2
+size 1515306
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPad_accessibility.png
index 3869fc41..78a004fa 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9fc9a91e0a145c3f854dfaf7e3cebf88050c010b1cfc674aeeca0c1436048d0e
-size 627642
+oid sha256:f4e59b39d4a3d94ebdefbd98a7b033f5df4b71fa509e3fb7390863c18b71c720
+size 730526
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPad_ax5.png
index ba305cad..73a5d611 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ecbe8e1fc912c87e75f6b28fa9ced181f8fad9c2c0b392b5c5db219f3c8f5983
-size 548161
+oid sha256:895326db7d30eb0cb1ac6ca84ddf82570f6abd74e9c552f0d794f2c129c337a4
+size 840616
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone.png
index b8b392c9..9caad440 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8a5658397b71b3032136d98abbf5b065500e42a9e57d294e578d035597e299c3
-size 229622
+oid sha256:3fc1bc979f6845917e3099fae14009263d8ffd7377502fa3a06d2527423bb593
+size 233794
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_accessibility.png
index 50c8ab4d..114bed57 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:04e38c6626e03faf6297eaf3f655714082c513fe3e347529e74197afccee31f4
-size 470328
+oid sha256:8e0ef6bd96fdba31da82015e7c231da840194ee69f4c3f44abd50c0cfd6d6168
+size 530130
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_ax5.png
index 07592c79..4e775836 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ce9a4beaca1b4fe41b93767c6422d712231a63a1f92eb71161a3b5375c11a899
-size 194177
+oid sha256:fd38e3c4439c57346af74f815ecfe377234869f995a03caff07d906503f52878
+size 920933
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_contrast.png
index 0ede6ed9..864cc1b2 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:072bc667c7626e97d21f8aa154f26081641ef545ad6362351d618686aaf03851
-size 231000
+oid sha256:814993ee2e826f20bf2777cae30dcb6264ac1d8e3cb99f23c26b38ca6173b869
+size 234885
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_dark.png
index d7002ac4..2ea08e06 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionDaysViewSnapshotTests/regionDays.WithData_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:188451794438bbc5702703d3ccb58a8575ce39e826fef09fee5df83eae4d5b6e
-size 238507
+oid sha256:d9406aacc8eb39addf998299284fae9553eb0b461260f2c7d42376673788f6c7
+size 242326
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionMapViewSnapshotTests/regionMap.Default_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionMapViewSnapshotTests/regionMap.Default_iPhone.png
index 2e332fc9..a83eded7 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionMapViewSnapshotTests/regionMap.Default_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionMapViewSnapshotTests/regionMap.Default_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:28c3b096e376b63f90f203a26add70a0ce2b55f5f15dde402b3ede43b84f3c6a
-size 148402
+oid sha256:dac385970efcd8a2a969fede2e8bd1a2ba3b5b7c2612b1ef12dafafbd3c88411
+size 697034
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionMapViewSnapshotTests/regionMap.Default_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionMapViewSnapshotTests/regionMap.Default_iPhone_dark.png
index aff6a65d..14383c9d 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RegionMapViewSnapshotTests/regionMap.Default_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RegionMapViewSnapshotTests/regionMap.Default_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:141b345b6a5eabc3311bdb12634be502954dbdf1c5eaa06193453f084487877e
-size 150146
+oid sha256:68ff19b70fb5ab162123320a292bce05beb5cf0f5b0f2b95f97cc6af01224054
+size 577561
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPad_accessibility.png
index e02ac75f..77f619a4 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e0d29e47df1b91f450cadafa05f4d62b3998c4c0ad8c259e10faa33249efc6e
-size 532837
+oid sha256:a894d13ee33f92fd01539287d5de6cb9c372abc9213e1a74570aa017ad4ffe77
+size 532342
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPad_ax5.png
index 95b15867..ac6924a4 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2e5c9a755a552cd8ab133c57ba68cbee6b61a878f2fca6febdf971121ae4a8da
-size 463539
+oid sha256:e7e0fa12b96ee119411032e17f6b5a8759c6ba4aedef964287d86544c4410ad7
+size 557791
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone.png
index d4aeb9bb..3eb8a26d 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e9af50ce554ffe9e8ea3d9ad0494afa3748416fd873f9d83b751c533bc8dde5
-size 191227
+oid sha256:9acb6aca29aa379cc37ac15a206202d94c51474dfab0fd1d7d5e698821ff0ca8
+size 191304
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_accessibility.png
index 76651980..ded95f71 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4871f3a84cf67e8627437a66615f7d0990a89b2f9f7731414a0cc9f68f127c72
-size 387837
+oid sha256:ff64ab8c1ef6f371af6561311dd96d4056002fe8475f26ee0404e782f4278847
+size 386379
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_ax5.png
index 790125d2..f0716921 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c85f4ee591da9cf5cc48992a29bcde27b2502fab3c9b22b5b253329b4f53cda3
-size 222444
+oid sha256:589782f0bc7d01e46be5b7722ad02c481d9b891be4f3c6f76e511f8b80f9cb04
+size 522621
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_contrast.png
index e57391cc..b7762898 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bfbf3b93fa143e1389cd433fdba8b3ea65315b4ecb020e8b6221a3aff2e61fa8
-size 188435
+oid sha256:eca4fc3de63d645c36293acd2d8110457b4585de7a2fbedfd49d0b308e419a35
+size 188538
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_dark.png
index 5fbae2b9..a1e82fc6 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/ResolutionViewSnapshotTests/resolution.WithIssues_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c6c68c121be3f27e6c1ae51ca0c47e4c1460bf63f8023215fe80210323e7ea9d
-size 187483
+oid sha256:0ef2181cc766cdac80ccbfa388eb966387156eda9a70620738e2350e6d1c8c82
+size 187601
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RootViewSnapshotTests/root.LoggedIn_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RootViewSnapshotTests/root.LoggedIn_iPhone.png
index 92d08270..9db8aa45 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RootViewSnapshotTests/root.LoggedIn_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RootViewSnapshotTests/root.LoggedIn_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:982362c99853bc3cb601e75a7a7a5920ffec1a05f0a3aa21254399aaaddbed62
-size 184384
+oid sha256:a746c88054d92de90811faa8efdbd7bc012398befa665de19c89c57cb929fe01
+size 184526
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/RootViewSnapshotTests/root.LoggedIn_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/RootViewSnapshotTests/root.LoggedIn_iPhone_dark.png
index be01c871..0f274108 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/RootViewSnapshotTests/root.LoggedIn_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/RootViewSnapshotTests/root.LoggedIn_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b11061c3fed61086c37609b3b6ed1498d8e7a683ce3794ad1bdeda2dfb5cc898
+oid sha256:84b25476a691247f2e7eff125d6ff7cca9d955f2b5b0d6b429bd308714248e93
 size 180279
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPad_accessibility.png
index 80c3bc7f..4cf60036 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a4b7de340cb9e6efa065ab7a42b92a729f95b43dd779dc52c66afa6c8ccd5b10
-size 555343
+oid sha256:7a61029d1a44e458683051f5499bd7ce00ad32870139b9f64454b41f13624eee
+size 554720
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPad_ax5.png
index 0cb8375d..2c7fcf84 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f4fac0fc3de277c0f916373e6632e736d4517f6d20ad82e6dab900071931f15
-size 443099
+oid sha256:14c3e8e387e64e768c7d55bd30b7919333f3bc94c2b5516d584d9c4f24e61e37
+size 508861
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone.png
index c310a69b..7a6291c2 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f68b3e0546d2940a0d45067b8a6d54908c7f47b04efd74b6156a5306359e41cb
-size 232386
+oid sha256:84d4ad4bfe35aaffd24c758838f6e95c560470ae486cace910acf6004935b94f
+size 243536
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_accessibility.png
index d660a6c1..d4ff6dfc 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2592f6cdc44017d2c76228566b0eded57ce8a299006d3977760d82128259f9a1
-size 416443
+oid sha256:25c67da6ed55c22d31d1c945bbd86ae6fd37f2e540683c4de0b126dbefe97676
+size 434749
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_ax5.png
index 643a3879..e4ed86a4 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:78a668217041fcb4e90ad6766a9f86f4f9f580b26c05169730cf3787b5e9a4bf
-size 279027
+oid sha256:1697b7571011bf3b5315c1d354f2212806ad3781f7c15693ea4cad0b407c608f
+size 458947
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_contrast.png
index 69a5fbc3..30477a94 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75f2ebbb3904dfa29cddb285f6d0f2b60e4971b948bdef87baae4a2e9a2b933c
-size 221907
+oid sha256:71c0b0aa574fdbc145e701cbbcbc96cd11eaa7e8f78ad6eaec70a8177c0ad058
+size 230214
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_dark.png
index 31f0a864..c5d6e9a6 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fe553dd669e74c924ebee2bcecdb24119018b44a29d54b445b08cba74c384d14
-size 249355
+oid sha256:e131afd7b9826b254e481748deac69fe2158977dbc092e134e6cf0face0cf1c8
+size 221376
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_rtl.png b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_rtl.png
index 419ce328..78e8465b 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_rtl.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.Default_iPhone_rtl.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b7ef710986474e5bf35073d6d0eaf85b9539194a7d23fbd1882c8ff440ac95d4
-size 233575
+oid sha256:a70f758d25d26e7f685b7f7c0bdd805cb75f5ffe8a10ccfa03135a0689b845a9
+size 243730
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.DemoMode_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.DemoMode_iPhone.png
index 564b1daf..01860d62 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.DemoMode_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.DemoMode_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50abca073ac4b54970cc7390ae5f8aeb62a88ab0e46dc869c41912a70055d70f
-size 240670
+oid sha256:4ac0b1772e270ca7a0771f709102ca422140e225f6ebd92c9a645566b7612c70
+size 286186
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.DemoMode_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.DemoMode_iPhone_dark.png
index 416ea032..7588a1ba 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.DemoMode_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/SettingsViewSnapshotTests/settings.DemoMode_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8ac665a90276a8f84203344be46838263c524bf59dc8629853a4f8c081ff94cf
-size 265977
+oid sha256:01d8c66277c5cb819cd348532b35ac7abc5e904de6f8d4473428ae7029c3da3d
+size 268708
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/WhereFlyoverViewSnapshotTests/seededEntryState.WhereFlyover_iPad.png b/Where/WhereUI/SnapshotTests/__Snapshots__/WhereFlyoverViewSnapshotTests/seededEntryState.WhereFlyover_iPad.png
index b6fab0b5..7f25b096 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/WhereFlyoverViewSnapshotTests/seededEntryState.WhereFlyover_iPad.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/WhereFlyoverViewSnapshotTests/seededEntryState.WhereFlyover_iPad.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97327fa669a48fee5faa4617ea0a523dc0d338edba01d7069b5b0c4deea57892
-size 2091399
+oid sha256:6d125c95ed4d11d2c92cbbf86eb3e0b7752e2643cca7a9c5b43dbf4096cbdae1
+size 8303169
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Empty_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Empty_iPhone.png
index ea619e7a..af631ac1 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Empty_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Empty_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:bc569837290394ab6c6343e5a285623625fa30ed11307ed4d7374b98156a31d9
-size 260382
+oid sha256:dad9e7c911fddc398d83692c82ef7e5146ac7c29638889c195ccf0b79ba69606
+size 742511
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Empty_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Empty_iPhone_dark.png
index 08da0e03..e006ea31 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Empty_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Empty_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8895fbbfb0828fbe6d20bfdfa3d7eb370505629a245c9d434645b160a15c5f3
-size 254203
+oid sha256:a22f9f5db2bd9e5d4bebcb63bdd094021591b9fc4a5ffbdb0fa5f8d3ea4c3a20
+size 701940
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad.png
index 796be76d..d0b03516 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:75d32fdcedf46032c8bc3fd16e173b887b549e8b0affc7c3151e49b018261f84
-size 473865
+oid sha256:63e0721c2d1b276ce8bcad93ef4fe9da0421832abf0337d9c5f318a116a576d7
+size 1129475
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_accessibility.png
index 8083afa4..dae390b0 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4d0c975ba7eadfb9be744b7a9b5430c61c01f12852325ea073d333ede0c6687b
-size 1516565
+oid sha256:556fe0890da7c20e1d109b6573db89246f827517f16875bca7bc368390fc7b67
+size 3565301
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_ax5.png
index 4a7ff0aa..801310c2 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c73c31eeb5b4bb2aee20f8c82e40189816f66b228f62546aa40bd962369f74fc
-size 572582
+oid sha256:c90505f1aeef80edbceffe6b586d427aaf82720c5ebf2b0abaa385cafe674524
+size 1835845
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_contrast.png
index 7729d163..4076df37 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d2a21398821f9ebe34fd1577a9e3faf27f2145205aaf03b89d1955769fbc3a2
-size 466645
+oid sha256:72fb188be14093ed10092663646bd743a420319438a9c00bd2eb92abf0fcf1b6
+size 1125887
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_dark.png
index 6ccd8ee4..93a33f20 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPad_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2bb6d911d9002137b87d6a00ddf05672a8054c647f54497b3574a0449da1500f
-size 472330
+oid sha256:837ec3476025546c3fb48e87be475bc9c73405314f5ab17854578a0a1cfb6124
+size 1102171
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone.png
index 7f9a1136..e37c31bf 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:812507aef0e8c2da706f5a62e9184dae265650d0b393de93d7fef3e03c50312c
-size 272482
+oid sha256:abb6f2d537e704aa6cab4086e0cf216d7c39079cf9e79b572fe34da21cbe00a3
+size 839562
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_accessibility.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_accessibility.png
index 5500fe30..bc6ef450 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_accessibility.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_accessibility.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:afeaa16d79d60a151bf07d17ce19ac90cf7b219bfc2621714af581c2b5f4b412
-size 975165
+oid sha256:fee23b51b281d1e8d95a4b487222a3f43105c7f889b6bca47850c4e24dfda0ea
+size 3183826
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_ax5.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_ax5.png
index 1b3cdb42..e2642a1d 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_ax5.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_ax5.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:99a49eb9a481e808c7c9acbde7674ba5d0d209f4adb4c0a9805b311f6352df29
-size 265110
+oid sha256:411100ea8116452e2f7ade54276a33e546c833eb75cd53ee9dd0e9b63a046103
+size 1059305
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_contrast.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_contrast.png
index 85be0c53..c68326b5 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_contrast.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_contrast.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1220dfc213c9b9cc6b634a8c37ae82c809fc7751e0573111aa0781692ffc427c
-size 268436
+oid sha256:c9f5e97b867e37d70cbf72caa3d9b702fe477574e9a54005a75770ad32a07698
+size 839678
diff --git a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_dark.png b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_dark.png
index f5abd670..e37d9c81 100644
--- a/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_dark.png
+++ b/Where/WhereUI/SnapshotTests/__Snapshots__/YearViewSnapshotTests/year.Loaded_iPhone_dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7eb37e1f1bde59fa4e63b00255f19023f9deebc097b72d94e1e72ab004fc9051
-size 280973
+oid sha256:9a8b50351745bdf29a0ce2c56eefb82b22b106d96c61d4dd5ad7174d1ba1447f
+size 818861
diff --git a/Where/WhereUI/Sources/Developer/CardDesigner/CardDesignerStudioView.swift b/Where/WhereUI/Sources/Developer/CardDesigner/CardDesignerStudioView.swift
index b0ae8f57..9934e82d 100644
--- a/Where/WhereUI/Sources/Developer/CardDesigner/CardDesignerStudioView.swift
+++ b/Where/WhereUI/Sources/Developer/CardDesigner/CardDesignerStudioView.swift
@@ -168,7 +168,7 @@
 
     extension CardDesignerStudioView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Default", configurations: .phoneLightDark) {
+            whereSnapshot(name: "Default", configurations: .fullContentPhoneLightDark) {
                 NavigationStack {
                     CardDesignerStudioView(
                         model: CardDesignerModel(configuration: .standard),
diff --git a/Where/WhereUI/Sources/Developer/DeveloperOverlay.swift b/Where/WhereUI/Sources/Developer/DeveloperOverlay.swift
index 32df4fd5..2091184b 100644
--- a/Where/WhereUI/Sources/Developer/DeveloperOverlay.swift
+++ b/Where/WhereUI/Sources/Developer/DeveloperOverlay.swift
@@ -388,12 +388,15 @@
             whereSnapshot(name: "Collapsed", configurations: .phoneLightDark) {
                 DeveloperOverlayPreview(presentation: .collapsed)
             }
-            whereSnapshot(name: "MenuBottomTrailing", configurations: .phoneLightDark) {
+            whereSnapshot(
+                name: "MenuBottomTrailing",
+                configurations: .fullContentPhoneLightDark,
+            ) {
                 DeveloperOverlayPreview(presentation: .menu)
             }
             whereSnapshot(
                 name: "MenuTopLeading",
-                configurations: SnapshotConfiguration.combinations(devices: [.iPhone]),
+                configurations: SnapshotConfiguration.combinations(devices: [.iPhoneFullContent]),
             ) {
                 DeveloperOverlayPreview(presentation: .menu, corner: .topLeading)
             }
@@ -401,7 +404,7 @@
                 name: "SelectedTool",
                 configurations: SnapshotConfiguration.combinations(devices: [.iPhone]),
             ) {
-                DeveloperOverlayPreview(presentation: .floating(.regionMap))
+                DeveloperOverlayPreview(presentation: .floating(.openSpans))
             }
         }
     }
diff --git a/Where/WhereUI/Sources/Developer/RegionMapLegend.swift b/Where/WhereUI/Sources/Developer/RegionMapLegend.swift
new file mode 100644
index 00000000..fac7ca9b
--- /dev/null
+++ b/Where/WhereUI/Sources/Developer/RegionMapLegend.swift
@@ -0,0 +1,84 @@
+import RegionKit
+import SwiftUI
+
+/// The selectable feature list shared by the bounded developer map screen and
+/// its full-content snapshot.
+struct RegionMapLegend: View {
+    let kind: RegionGeometryKind
+    let groups: [RegionMapLegendGroup]
+    let selectedTitle: String?
+    let color: (RegionMapLegendGroup) -> Color
+    let onSelect: (String?) -> Void
+
+    @Environment(\.stylesheet) private var stylesheet
+
+    var body: some View {
+        List {
+            Section {
+                if selectedTitle != nil {
+                    Button(String(localized: .regionMapShowAll)) { onSelect(nil) }
+                }
+                ForEach(groups) { group in
+                    Button {
+                        onSelect(group.title == selectedTitle ? nil : group.title)
+                    } label: {
+                        row(group)
+                    }
+                    .tint(.primary)
+                }
+            } header: {
+                Text(String(localized: .regionMapLegendHeader))
+            } footer: {
+                Text(WhereFormat.regionMapKindFooter(kind))
+            }
+        }
+    }
+
+    private func row(_ group: RegionMapLegendGroup) -> some View {
+        HStack(spacing: stylesheet.spacing.large) {
+            Circle()
+                .fill(color(group))
+                // Developer legend swatch — a fixed dev-tool size, not a themed token.
+                .frame(width: 12, height: 12)
+                .accessibilityHidden(true)
+            Text(group.title)
+            Spacer()
+            if group.outlineCount > 1 {
+                Text("\(group.outlineCount)")
+                    .foregroundStyle(.secondary)
+                    .accessibilityHidden(true)
+            }
+            if group.title == selectedTitle {
+                Image(systemName: "checkmark")
+                    .foregroundStyle(.tint)
+            }
+        }
+        .contentShape(.rect)
+    }
+}
+
+#if DEBUG
+    #Preview {
+        RegionMapLegend(
+            kind: .attribution,
+            groups: [
+                RegionMapLegendGroup(
+                    title: Region.california.localizedName,
+                    region: .california,
+                    outlineCount: 2,
+                ),
+                RegionMapLegendGroup(
+                    title: Region.newYork.localizedName,
+                    region: .newYork,
+                    outlineCount: 1,
+                ),
+            ],
+            selectedTitle: Region.california.localizedName,
+            color: { group in
+                group.region.map { RegionStyle.fallbackStyle(for: $0).tint } ?? .gray
+            },
+            onSelect: { _ in },
+        )
+        .whereBroadwayRoot()
+    }
+#endif
diff --git a/Where/WhereUI/Sources/Developer/RegionMapLegendGroup.swift b/Where/WhereUI/Sources/Developer/RegionMapLegendGroup.swift
new file mode 100644
index 00000000..daed0813
--- /dev/null
+++ b/Where/WhereUI/Sources/Developer/RegionMapLegendGroup.swift
@@ -0,0 +1,13 @@
+import RegionKit
+
+/// One feature in the region-map legend: its display identity, optional tracked
+/// region, and the number of polygon rings it draws.
+struct RegionMapLegendGroup: Identifiable {
+    let title: String
+    let region: Region?
+    var outlineCount: Int
+
+    var id: String {
+        title
+    }
+}
diff --git a/Where/WhereUI/Sources/Developer/RegionMapView.swift b/Where/WhereUI/Sources/Developer/RegionMapView.swift
index 3c852def..4748a3f8 100644
--- a/Where/WhereUI/Sources/Developer/RegionMapView.swift
+++ b/Where/WhereUI/Sources/Developer/RegionMapView.swift
@@ -89,50 +89,16 @@ public struct RegionMapView: View {
     }
 
     private func legend(for loaded: [RegionOutline]) -> some View {
-        List {
-            Section {
-                if selectedTitle != nil {
-                    Button(String(localized: .regionMapShowAll)) { select(nil) }
-                }
-                ForEach(legendGroups(for: loaded)) { group in
-                    Button {
-                        select(group.title == selectedTitle ? nil : group.title)
-                    } label: {
-                        legendRow(group)
-                    }
-                    .tint(.primary)
-                }
-            } header: {
-                Text(String(localized: .regionMapLegendHeader))
-            } footer: {
-                Text(WhereFormat.regionMapKindFooter(kind))
-            }
-        }
+        RegionMapLegend(
+            kind: kind,
+            groups: legendGroups(for: loaded),
+            selectedTitle: selectedTitle,
+            color: { color(forTitle: $0.title, region: $0.region) },
+            onSelect: select,
+        )
         .frame(height: stylesheet.regionMap.height)
     }
 
-    private func legendRow(_ group: LegendGroup) -> some View {
-        HStack(spacing: stylesheet.spacing.large) {
-            Circle()
-                .fill(color(forTitle: group.title, region: group.region))
-                // Developer legend swatch — a fixed dev-tool size, not a themed token.
-                .frame(width: 12, height: 12)
-                .accessibilityHidden(true)
-            Text(group.title)
-            Spacer()
-            if group.outlineCount > 1 {
-                Text("\(group.outlineCount)")
-                    .foregroundStyle(.secondary)
-                    .accessibilityHidden(true)
-            }
-            if group.title == selectedTitle {
-                Image(systemName: "checkmark")
-                    .foregroundStyle(.tint)
-            }
-        }
-        .contentShape(.rect)
-    }
-
     // MARK: - Data
 
     private func load() async {
@@ -171,15 +137,15 @@ public struct RegionMapView: View {
 
     /// One legend entry per feature title, in first-seen order, carrying
     /// how many sub-polygons it drew (a MultiPolygon yields several).
-    private func legendGroups(for loaded: [RegionOutline]) -> [LegendGroup] {
-        var groups: [LegendGroup] = []
+    private func legendGroups(for loaded: [RegionOutline]) -> [RegionMapLegendGroup] {
+        var groups: [RegionMapLegendGroup] = []
         var indexByTitle: [String: Int] = [:]
         for outline in loaded {
             if let index = indexByTitle[outline.title] {
                 groups[index].outlineCount += 1
             } else {
                 indexByTitle[outline.title] = groups.count
-                groups.append(LegendGroup(
+                groups.append(RegionMapLegendGroup(
                     title: outline.title,
                     region: outline.region,
                     outlineCount: 1,
@@ -355,23 +321,33 @@ private struct SnapshotMapStandIn: View {
     }
 }
 
-/// One feature in the legend: its title, the `Region` it maps to (if any,
-/// for the swatch color), and how many sub-polygons it contributed.
-private struct LegendGroup: Identifiable {
-    let title: String
-    let region: Region?
-    var outlineCount: Int
-
-    var id: String {
-        title
-    }
-}
-
 #if DEBUG
     extension RegionMapView: SnapshotProviding {
         public static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Default", configurations: .phoneLightDark) {
-                NavigationStack { RegionMapView() }
+            // The production screen intentionally bounds this list beneath the
+            // map. Capture the shared scrollable content itself so every feature
+            // is visible without teaching the production split layout a
+            // snapshot-only sizing mode.
+            whereSnapshot(name: "Default", configurations: .fullContentPhoneLightDark) {
+                RegionMapLegend(
+                    kind: .attribution,
+                    groups: snapshotLegendGroups,
+                    selectedTitle: nil,
+                    color: { group in
+                        group.region.map { RegionStyle.fallbackStyle(for: $0).tint } ?? .gray
+                    },
+                    onSelect: { _ in },
+                )
+            }
+        }
+
+        private static var snapshotLegendGroups: [RegionMapLegendGroup] {
+            RegionCatalog.shared.all.enumerated().map { index, region in
+                RegionMapLegendGroup(
+                    title: region.localizedName,
+                    region: region,
+                    outlineCount: index.isMultiple(of: 10) ? 2 : 1,
+                )
             }
         }
     }
diff --git a/Where/WhereUI/Sources/Elsewhere/DayRelabelView.swift b/Where/WhereUI/Sources/Elsewhere/DayRelabelView.swift
index 50ab0ec9..e7051fcb 100644
--- a/Where/WhereUI/Sources/Elsewhere/DayRelabelView.swift
+++ b/Where/WhereUI/Sources/Elsewhere/DayRelabelView.swift
@@ -257,7 +257,7 @@ struct DayRelabelView: View {
 #if DEBUG
     extension DayRelabelView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Default", configurations: .screenDefaults) {
+            whereSnapshot(name: "Default", configurations: .fullContentScreenDefaults) {
                 NavigationStack {
                     DayRelabelView(
                         day: DayPresence(
@@ -269,7 +269,7 @@ struct DayRelabelView: View {
                     )
                 }
             }
-            whereSnapshot(name: "WithAudit", configurations: .phoneLightDark) {
+            whereSnapshot(name: "WithAudit", configurations: .fullContentPhoneLightDark) {
                 NavigationStack {
                     DayRelabelView(
                         day: DayPresence(
diff --git a/Where/WhereUI/Sources/Elsewhere/ElsewhereView.swift b/Where/WhereUI/Sources/Elsewhere/ElsewhereView.swift
index 90fd335b..96f21802 100644
--- a/Where/WhereUI/Sources/Elsewhere/ElsewhereView.swift
+++ b/Where/WhereUI/Sources/Elsewhere/ElsewhereView.swift
@@ -118,7 +118,7 @@ struct ElsewhereView: View {
 #if DEBUG
     extension ElsewhereView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Loaded", configurations: .screenDefaults) {
+            whereSnapshot(name: "Loaded", configurations: .fullContentScreenDefaults) {
                 NavigationStack {
                     ElsewhereView(report: PreviewSupport.loadedYearReportModel())
                 }
diff --git a/Where/WhereUI/Sources/Elsewhere/RegionDaysView.swift b/Where/WhereUI/Sources/Elsewhere/RegionDaysView.swift
index eeebfb13..9bec70e4 100644
--- a/Where/WhereUI/Sources/Elsewhere/RegionDaysView.swift
+++ b/Where/WhereUI/Sources/Elsewhere/RegionDaysView.swift
@@ -145,7 +145,7 @@ private struct DayRow: View {
 #if DEBUG
     extension RegionDaysView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "WithData", configurations: .screenDefaults) {
+            whereSnapshot(name: "WithData", configurations: .fullContentScreenDefaults) {
                 NavigationStack {
                     RegionDaysView(
                         region: .other,
diff --git a/Where/WhereUI/Sources/Manual/LoggedDaysView.swift b/Where/WhereUI/Sources/Manual/LoggedDaysView.swift
index 506e0c6f..1546fe9a 100644
--- a/Where/WhereUI/Sources/Manual/LoggedDaysView.swift
+++ b/Where/WhereUI/Sources/Manual/LoggedDaysView.swift
@@ -288,7 +288,7 @@ private struct LoggedDayRow: View {
 #if DEBUG
     extension LoggedDaysView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Loaded", configurations: .screenDefaults) {
+            whereSnapshot(name: "Loaded", configurations: .fullContentScreenDefaults) {
                 NavigationStack {
                     LoggedDaysView(
                         report: PreviewSupport.loadedYearReportModel(),
diff --git a/Where/WhereUI/Sources/Manual/ManualDayView.swift b/Where/WhereUI/Sources/Manual/ManualDayView.swift
index 27837d4c..0015803b 100644
--- a/Where/WhereUI/Sources/Manual/ManualDayView.swift
+++ b/Where/WhereUI/Sources/Manual/ManualDayView.swift
@@ -512,7 +512,7 @@ extension ManualDayView {
         }
 
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Add", configurations: .screenDefaults) {
+            whereSnapshot(name: "Add", configurations: .fullContentScreenDefaults) {
                 NavigationStack {
                     ManualDayView(
                         report: PreviewSupport.loadedYearReportModel(),
@@ -521,7 +521,7 @@ extension ManualDayView {
                     )
                 }
             }
-            whereSnapshot(name: "AddWithCancel", configurations: .phoneLightDark) {
+            whereSnapshot(name: "AddWithCancel", configurations: .fullContentPhoneLightDark) {
                 NavigationStack {
                     ManualDayView(
                         report: PreviewSupport.loadedYearReportModel(),
@@ -530,7 +530,7 @@ extension ManualDayView {
                     )
                 }
             }
-            whereSnapshot(name: "EditPlain", configurations: .phoneLightDark) {
+            whereSnapshot(name: "EditPlain", configurations: .fullContentPhoneLightDark) {
                 NavigationStack {
                     ManualDayView(
                         report: PreviewSupport.loadedYearReportModel(),
@@ -543,7 +543,7 @@ extension ManualDayView {
                     )
                 }
             }
-            whereSnapshot(name: "EditAuthoritative", configurations: .phoneLightDark) {
+            whereSnapshot(name: "EditAuthoritative", configurations: .fullContentPhoneLightDark) {
                 NavigationStack {
                     ManualDayView(
                         report: PreviewSupport.loadedYearReportModel(),
diff --git a/Where/WhereUI/Sources/Model/LoggedDaysModel.swift b/Where/WhereUI/Sources/Model/LoggedDaysModel.swift
index 7c7653d4..7897e8bd 100644
--- a/Where/WhereUI/Sources/Model/LoggedDaysModel.swift
+++ b/Where/WhereUI/Sources/Model/LoggedDaysModel.swift
@@ -27,6 +27,12 @@ public final class LoggedDaysModel {
     private let services: WhereServices
     private static let logger = WhereLog.root(LoggedDaysModelLog.self)
 
+    #if DEBUG
+        /// A preview-declared state is already the final fixture; observing its
+        /// empty backing store would replace it as soon as the view appears.
+        private var isPreviewStatePinned = false
+    #endif
+
     init(services: WhereServices) {
         self.services = services
     }
@@ -36,6 +42,9 @@ public final class LoggedDaysModel {
     /// or anywhere (the single read-refresh signal, `dataChangeUpdates()`). Runs
     /// until the calling `.task` is cancelled (the sheet closes).
     public func observe(year: Int) async {
+        #if DEBUG
+            guard isPreviewStatePinned == false else { return }
+        #endif
         await load(for: year)
         for await _ in services.dataChangeUpdates() {
             await load(for: year)
@@ -70,6 +79,7 @@ public final class LoggedDaysModel {
         /// Force a state for previews/tests without touching the store.
         func previewLoad(_ state: LoadState) {
             loadState = state
+            isPreviewStatePinned = true
         }
     #endif
 }
diff --git a/Where/WhereUI/Sources/Preview/PreviewSupport.swift b/Where/WhereUI/Sources/Preview/PreviewSupport.swift
index 0d965182..0842dcb3 100644
--- a/Where/WhereUI/Sources/Preview/PreviewSupport.swift
+++ b/Where/WhereUI/Sources/Preview/PreviewSupport.swift
@@ -395,17 +395,6 @@
                 calendar.date(from: DateComponents(year: year, month: month, day: dayOfMonth))!
             }
             return [
-                DayPresence(date: day(1, 6), in: calendar, regions: [.california]),
-                DayPresence(
-                    date: day(3, 14),
-                    in: calendar,
-                    regions: [.newYork],
-                    audit: ManualEntryAudit(
-                        recordedAt: day(3, 15),
-                        note: "Backfilled a trip the GPS missed.",
-                        location: nil,
-                    ),
-                ),
                 DayPresence(
                     date: day(6, 2),
                     in: calendar,
@@ -421,6 +410,17 @@
                         ),
                     ),
                 ),
+                DayPresence(
+                    date: day(3, 14),
+                    in: calendar,
+                    regions: [.newYork],
+                    audit: ManualEntryAudit(
+                        recordedAt: day(3, 15),
+                        note: "Backfilled a trip the GPS missed.",
+                        location: nil,
+                    ),
+                ),
+                DayPresence(date: day(1, 6), in: calendar, regions: [.california]),
             ]
         }
 
diff --git a/Where/WhereUI/Sources/Primary/CalendarContentView.swift b/Where/WhereUI/Sources/Primary/CalendarContentView.swift
index 860ddefd..642354b7 100644
--- a/Where/WhereUI/Sources/Primary/CalendarContentView.swift
+++ b/Where/WhereUI/Sources/Primary/CalendarContentView.swift
@@ -456,23 +456,23 @@ private struct DayCell: View {
 #if DEBUG
     extension CalendarContentView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "WithData", configurations: .screenDefaults) {
+            whereSnapshot(name: "WithData", configurations: .fullContentScreenDefaults) {
                 NavigationStack {
                     CalendarContentView(report: PreviewSupport.loadedYearReportModel())
                 }
             }
-            whereSnapshot(name: "Empty", configurations: .phoneLightDark) {
+            whereSnapshot(name: "Empty", configurations: .fullContentPhoneLightDark) {
                 NavigationStack {
                     CalendarContentView(report: PreviewSupport.emptyYearReportModel())
                 }
             }
-            whereSnapshot(name: "MissingDays", configurations: .phoneLightDark) {
+            whereSnapshot(name: "MissingDays", configurations: .fullContentPhoneLightDark) {
                 NavigationStack {
                     CalendarContentView(report: PreviewSupport.missingDaysYearReportModel())
                 }
             }
             // The Locations tab's zoom destination: one region's days only.
-            whereSnapshot(name: "Focused", configurations: .phoneLightDark) {
+            whereSnapshot(name: "Focused", configurations: .fullContentPhoneLightDark) {
                 NavigationStack {
                     CalendarContentView(
                         focusedRegion: .california,
@@ -480,19 +480,6 @@ private struct DayCell: View {
                     )
                 }
             }
-            // The shown months in one image. The full-content frame measures the
-            // scroll view's content height, so every lazy month materializes and
-            // nothing scrolls — which needs the chrome-free view, since a
-            // `NavigationStack` around it defeats content measurement (see
-            // `Frame.fullContent`).
-            whereSnapshot(
-                name: "FullContent",
-                configurations: [
-                    SnapshotConfiguration(device: .fullContent(name: "fullHeight", width: 402)),
-                ],
-            ) {
-                CalendarContentView(report: PreviewSupport.loadedYearReportModel())
-            }
         }
     }
 
diff --git a/Where/WhereUI/Sources/Primary/LocationsView.swift b/Where/WhereUI/Sources/Primary/LocationsView.swift
index d7e7dd7c..a522d76d 100644
--- a/Where/WhereUI/Sources/Primary/LocationsView.swift
+++ b/Where/WhereUI/Sources/Primary/LocationsView.swift
@@ -268,7 +268,7 @@ private struct ResolveToolbarLabel: View {
         static var snapshots: [SnapshotCase] {
             whereSnapshot(
                 name: "Loaded",
-                configurations: .screenDefaults,
+                configurations: .fullContentScreenDefaults,
                 settle: .settledAtLeast(minDuration: 1.0),
             ) {
                 LocationsView(report: PreviewSupport.loadedYearReportModel())
@@ -276,7 +276,7 @@ private struct ResolveToolbarLabel: View {
             whereSnapshot(name: "Empty", configurations: .phoneLightDark) {
                 LocationsView(report: PreviewSupport.emptyYearReportModel())
             }
-            whereSnapshot(name: "MissingDays", configurations: .phoneLightDark) {
+            whereSnapshot(name: "MissingDays", configurations: .fullContentPhoneLightDark) {
                 LocationsView(report: PreviewSupport.missingDaysYearReportModel())
             }
             whereSnapshot(name: "ElsewhereOnly", configurations: .phoneLightDark) {
diff --git a/Where/WhereUI/Sources/Primary/PresenceTimelineList.swift b/Where/WhereUI/Sources/Primary/PresenceTimelineList.swift
index 78d5e0b4..25c12c9d 100644
--- a/Where/WhereUI/Sources/Primary/PresenceTimelineList.swift
+++ b/Where/WhereUI/Sources/Primary/PresenceTimelineList.swift
@@ -94,7 +94,7 @@ private struct StintRow: View {
 #if DEBUG
     extension PresenceTimelineList: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "WithData", configurations: .screenDefaults) {
+            whereSnapshot(name: "WithData", configurations: .fullContentScreenDefaults) {
                 NavigationStack {
                     PresenceTimelineList(report: PreviewSupport.loadedYearReportModel())
                 }
diff --git a/Where/WhereUI/Sources/Primary/RecentActivitySummaryView.swift b/Where/WhereUI/Sources/Primary/RecentActivitySummaryView.swift
index aa427909..fca87f17 100644
--- a/Where/WhereUI/Sources/Primary/RecentActivitySummaryView.swift
+++ b/Where/WhereUI/Sources/Primary/RecentActivitySummaryView.swift
@@ -143,11 +143,10 @@ struct RecentActivitySummaryView: View {
 
 #if DEBUG
     extension RecentActivitySummaryView: SnapshotProviding {
-        // A NavigationStack + ScrollView sheet is a screen, not an intrinsic
-        // component: greedy containers have no meaningful `sizeThatFits`, so
-        // intrinsic sizing would measure just the pinned window picker.
+        /// Capture the full settled scroll content; fixed viewport coverage is
+        /// reserved for non-scrolling subjects.
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Loaded", configurations: .screenDefaults) {
+            whereSnapshot(name: "Loaded", configurations: .fullContentScreenDefaults) {
                 RecentActivitySummaryView(
                     model: PreviewSupport.recentActivityModel(
                         state: .loaded("You were in California, then New York."),
diff --git a/Where/WhereUI/Sources/Regions/RegionCustomizeView.swift b/Where/WhereUI/Sources/Regions/RegionCustomizeView.swift
index 14b125ce..d5fb8411 100644
--- a/Where/WhereUI/Sources/Regions/RegionCustomizeView.swift
+++ b/Where/WhereUI/Sources/Regions/RegionCustomizeView.swift
@@ -266,13 +266,13 @@ struct RegionCustomizeView: View {
 
     extension RegionCustomizeView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Editor", configurations: .phoneLightDark) {
+            whereSnapshot(name: "Editor", configurations: .fullContentPhoneLightDark) {
                 NavigationStack {
                     RegionCustomizeView(model: PreviewSupport.primaryRegionSelectionModel())
                 }
             }
 
-            whereSnapshot(name: "NeutralEditor", configurations: .phoneLightDark) {
+            whereSnapshot(name: "NeutralEditor", configurations: .fullContentPhoneLightDark) {
                 NavigationStack {
                     RegionCustomizeView(model: neutralPreviewModel())
                 }
diff --git a/Where/WhereUI/Sources/Resolution/FlightDayDetailView.swift b/Where/WhereUI/Sources/Resolution/FlightDayDetailView.swift
index 1082416f..fab493fb 100644
--- a/Where/WhereUI/Sources/Resolution/FlightDayDetailView.swift
+++ b/Where/WhereUI/Sources/Resolution/FlightDayDetailView.swift
@@ -172,7 +172,7 @@ struct FlightDayDetailView: View {
         /// raw samples, so the recorded-points map stays out of the tree and the
         /// capture is deterministic.
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Default", configurations: .screenDefaults) {
+            whereSnapshot(name: "Default", configurations: .fullContentScreenDefaults) {
                 NavigationStack {
                     FlightDayDetailView(
                         issue: FlightDayIssue(
diff --git a/Where/WhereUI/Sources/Resolution/ResolutionView.swift b/Where/WhereUI/Sources/Resolution/ResolutionView.swift
index f140d43b..e8e3ff77 100644
--- a/Where/WhereUI/Sources/Resolution/ResolutionView.swift
+++ b/Where/WhereUI/Sources/Resolution/ResolutionView.swift
@@ -218,7 +218,7 @@ private struct IssueRow: View {
 #if DEBUG
     extension ResolutionView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "WithIssues", configurations: .screenDefaults) {
+            whereSnapshot(name: "WithIssues", configurations: .fullContentScreenDefaults) {
                 ResolutionView(
                     report: PreviewSupport.loadedYearReportModel(),
                     resolve: PreviewSupport.resolveModel(),
diff --git a/Where/WhereUI/Sources/RootView.swift b/Where/WhereUI/Sources/RootView.swift
index 20677e3b..e315bb55 100644
--- a/Where/WhereUI/Sources/RootView.swift
+++ b/Where/WhereUI/Sources/RootView.swift
@@ -283,7 +283,7 @@ public struct RootView: View {
             let launcher = WhereLaunch.makeLauncher(model: model, reason: .userForeground)
             whereSnapshot(
                 name: "LoggedIn",
-                configurations: .phoneLightDark,
+                configurations: .fullContentPhoneLightDark,
                 settle: .settledAtLeast(minDuration: 1.5),
                 onReadyToSnapshot: { await launcher.run() },
             ) {
diff --git a/Where/WhereUI/Sources/Settings/AboutSettingsView.swift b/Where/WhereUI/Sources/Settings/AboutSettingsView.swift
index 80440e31..7da26241 100644
--- a/Where/WhereUI/Sources/Settings/AboutSettingsView.swift
+++ b/Where/WhereUI/Sources/Settings/AboutSettingsView.swift
@@ -237,38 +237,46 @@ extension AboutSettingsView: SettingsSection {
         /// renders as.
         static var snapshots: [SnapshotCase] {
             whereSnapshot(name: "Default", configurations: .fullContentScreenDefaults) {
-                AboutSettingsView(
-                    focus: nil,
-                    buildInfo: PreviewSupport.stampedBuildInfo(),
-                    attribution: PreviewSupport.sampleAttribution(),
-                )
+                NavigationStack {
+                    AboutSettingsView(
+                        focus: nil,
+                        buildInfo: PreviewSupport.stampedBuildInfo(),
+                        attribution: PreviewSupport.sampleAttribution(),
+                    )
+                }
             }
             whereSnapshot(name: "DirtyTree", configurations: .fullContentPhoneLightDark) {
-                AboutSettingsView(
-                    focus: nil,
-                    buildInfo: PreviewSupport.stampedBuildInfo(isDirty: true),
-                    attribution: PreviewSupport.sampleAttribution(),
-                )
+                NavigationStack {
+                    AboutSettingsView(
+                        focus: nil,
+                        buildInfo: PreviewSupport.stampedBuildInfo(isDirty: true),
+                        attribution: PreviewSupport.sampleAttribution(),
+                    )
+                }
             }
             whereSnapshot(name: "Unattributed", configurations: .fullContentPhoneLightDark) {
                 // What a bundle outside the app target shows: honest unknowns and
                 // an explicit "no report" rather than blank rows and empty sections.
-                AboutSettingsView(
-                    focus: nil,
-                    buildInfo: PreviewSupport.unstampedBuildInfo(),
-                    attribution: nil,
-                )
+                NavigationStack {
+                    AboutSettingsView(
+                        focus: nil,
+                        buildInfo: PreviewSupport.unstampedBuildInfo(),
+                        attribution: nil,
+                    )
+                }
             }
             whereSnapshot(name: "LibrariesOnly", configurations: .fullContentPhoneLightDark) {
                 // A real report that credits nothing of one kind. Pinned as an
                 // image because the failure mode is purely visual: a header and
                 // footer over no rows, promising a list that isn't there.
                 let libraries = PreviewSupport.sampleAttribution().credits(ofKind: .library)
-                AboutSettingsView(
-                    focus: nil,
-                    buildInfo: PreviewSupport.stampedBuildInfo(),
-                    attribution: AttributionManifest(credits: libraries),
-                )
+                NavigationStack {
+                    AboutSettingsView(
+                        focus: nil,
+                        buildInfo: PreviewSupport.stampedBuildInfo(),
+                        attribution: AttributionManifest(credits: libraries),
+                    )
+                }
             }
         }
     }
diff --git a/Where/WhereUI/Sources/Settings/AppIconView.swift b/Where/WhereUI/Sources/Settings/AppIconView.swift
index fa1aed08..842b955d 100644
--- a/Where/WhereUI/Sources/Settings/AppIconView.swift
+++ b/Where/WhereUI/Sources/Settings/AppIconView.swift
@@ -309,7 +309,11 @@ struct AppIconImage: View {
 #if DEBUG
     extension AppIconView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Default", configurations: .screenDefaults, settle: .immediate) {
+            whereSnapshot(
+                name: "Default",
+                configurations: .fullContentScreenDefaults,
+                settle: .immediate,
+            ) {
                 NavigationStack { AppIconView(model: .preview()) }
             }
         }
diff --git a/Where/WhereUI/Sources/Settings/DataSettingsView.swift b/Where/WhereUI/Sources/Settings/DataSettingsView.swift
index 3a2dcc61..4da14c47 100644
--- a/Where/WhereUI/Sources/Settings/DataSettingsView.swift
+++ b/Where/WhereUI/Sources/Settings/DataSettingsView.swift
@@ -135,12 +135,14 @@ extension DataSettingsView: SettingsSection {
     extension DataSettingsView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
             whereSnapshot(name: "Default", configurations: .fullContentScreenDefaults) {
-                DataSettingsView(
-                    report: PreviewSupport.loadedYearReportModel(),
-                    backup: PreviewSupport.backupModel(),
-                )
-                .environment(PreviewSupport.loadedModel())
-                .environment(PreviewSupport.loadedSession())
+                NavigationStack {
+                    DataSettingsView(
+                        report: PreviewSupport.loadedYearReportModel(),
+                        backup: PreviewSupport.backupModel(),
+                    )
+                    .environment(PreviewSupport.loadedModel())
+                    .environment(PreviewSupport.loadedSession())
+                }
             }
         }
     }
diff --git a/Where/WhereUI/Sources/Settings/LicenseView.swift b/Where/WhereUI/Sources/Settings/LicenseView.swift
index 30d9acb2..0c405c49 100644
--- a/Where/WhereUI/Sources/Settings/LicenseView.swift
+++ b/Where/WhereUI/Sources/Settings/LicenseView.swift
@@ -57,7 +57,7 @@ struct LicenseView: View {
 #if DEBUG
     extension LicenseView: SnapshotProviding {
         static var snapshots: [SnapshotCase] {
-            whereSnapshot(name: "Default", configurations: .screenDefaults) {
+            whereSnapshot(name: "Default", configurations: .fullContentScreenDefaults) {
                 NavigationStack {
                     LicenseView(
                         credit: PreviewSupport.sampleCredit(
@@ -66,7 +66,7 @@ struct LicenseView: View {
                     )
                 }
             }
-            whereSnapshot(name: "NoNotice", configurations: .phoneLightDark) {
+            whereSnapshot(name: "NoNotice", configurations: .fullContentPhoneLightDark) {
                 // The generator refuses to emit a credit without notice text, so
                 // this is the state a hand-edited report would reach — worth an
                 // image because it is the one case that renders no notice at all.
diff --git a/Where/WhereUI/Sources/Settings/SettingsView.swift b/Where/WhereUI/Sources/Settings/SettingsView.swift
index 5926012f..4e9d4b2f 100644
--- a/Where/WhereUI/Sources/Settings/SettingsView.swift
+++ b/Where/WhereUI/Sources/Settings/SettingsView.swift
@@ -255,8 +255,11 @@ struct SettingsView: View {
         static var snapshots: [SnapshotCase] {
             whereSnapshot(
                 name: "Default",
-                configurations: .screenDefaults + [
-                    SnapshotConfiguration(layoutDirection: .rightToLeft, device: .iPhone),
+                configurations: .fullContentScreenDefaults + [
+                    SnapshotConfiguration(
+                        layoutDirection: .rightToLeft,
+                        device: .iPhoneFullContent,
+                    ),
                 ],
             ) {
                 SettingsView(report: PreviewSupport.loadedYearReportModel())
@@ -265,7 +268,7 @@ struct SettingsView: View {
             }
             // Demo mode: the exit section on top, and the groups that would
             // reach past the demo (backup, erase/reset, app icon) gone.
-            whereSnapshot(name: "DemoMode", configurations: .phoneLightDark) {
+            whereSnapshot(name: "DemoMode", configurations: .fullContentPhoneLightDark) {
                 SettingsView(report: PreviewSupport.loadedYearReportModel())
                     .environment(PreviewSupport.loadedModel())
                     .environment(PreviewSupport.loadedSession())
diff --git a/Where/WhereUI/Sources/Year/YearView.swift b/Where/WhereUI/Sources/Year/YearView.swift
index b19ec049..a6a2272f 100644
--- a/Where/WhereUI/Sources/Year/YearView.swift
+++ b/Where/WhereUI/Sources/Year/YearView.swift
@@ -141,12 +141,12 @@ private struct YearModePicker: View {
         static var snapshots: [SnapshotCase] {
             whereSnapshot(
                 name: "Loaded",
-                configurations: .screenDefaults,
+                configurations: .fullContentScreenDefaults,
                 settle: .settledAtLeast(minDuration: 1.0),
             ) {
                 YearView(report: PreviewSupport.loadedYearReportModel())
             }
-            whereSnapshot(name: "Empty", configurations: .phoneLightDark) {
+            whereSnapshot(name: "Empty", configurations: .fullContentPhoneLightDark) {
                 YearView(report: PreviewSupport.emptyYearReportModel())
             }
         }