diff --git a/.planning/ROADMAP.md b/.planning/ROADMAP.md
index 47aad96..a2f0386 100644
--- a/.planning/ROADMAP.md
+++ b/.planning/ROADMAP.md
@@ -416,8 +416,13 @@ At ≤767px (`window.matchMedia('(max-width: 767px)')` in `apps/pwa/src/App.tsx`
 **Plans**: 6 plans
 
 Plans:
+**Wave 1**
+
 - [ ] 17-01-PLAN.md — C: tokens.css themeable-layer groundwork + --bottom-chrome-h token (D-06) [Wave 1]
 - [ ] 17-02-PLAN.md — B: generate logo + full icon set, operator approval checkpoint (D-03, D-04) [Wave 1]
+
+**Wave 2** *(blocked on Wave 1 completion)*
+
 - [ ] 17-03-PLAN.md — A: phone FAB/BottomTabBar overlap fix + sweep + CI overlap assertion (D-01, D-02) [Wave 2, dep 01]
 - [ ] 17-04-PLAN.md — B: wire logo into BrandSlot + index.html favicons + manifest maskable + accent (D-04, D-05) [Wave 2, dep 01,02]
 - [ ] 17-05-PLAN.md — D: logout control + sheet desktop-centering (SettingsSheet/CredentialSheet) (D-07, D-09) [Wave 2, dep 01]
diff --git a/.planning/STATE.md b/.planning/STATE.md
index 6d79c31..4e3b0cc 100644
--- a/.planning/STATE.md
+++ b/.planning/STATE.md
@@ -5,10 +5,10 @@ milestone_name: Operability & Polish
 current_phase: 999.1
 current_phase_name: BACKLOG
 status: executing
-stopped_at: Phase 17 context gathered
-last_updated: "2026-06-18T00:37:02.287Z"
+stopped_at: Phase 17 UI-SPEC approved
+last_updated: "2026-06-18T15:36:11.741Z"
 last_activity: 2026-06-18
-last_activity_desc: Phase 19 complete, transitioned to Phase 999.1
+last_activity_desc: Phase 17 planning complete
 progress:
   total_phases: 26
   completed_phases: 11
@@ -31,7 +31,7 @@ See: .planning/PROJECT.md (updated 2026-06-16)
 Phase: 999.1 — Treat Fastmail as one calendar provider; framework supports adding more providers (BACKLOG)
 Plan: Not started
 Status: Phase 19 shipped — PR #23
-Last activity: 2026-06-17
+Last activity: 2026-06-18 — Phase 17 planning complete
 
 ### ✅ Resolved Checkpoint — Phase 15 Plan 15-03 Task 2 (human-action)
 
@@ -272,9 +272,9 @@ Recent decisions affecting current work:
 
 ## Session Continuity
 
-Last session: 2026-06-18T00:37:02.272Z
-Stopped at: Phase 17 context gathered
-Resume file: .planning/phases/17-ui-optimization-polish/17-CONTEXT.md
+Last session: 2026-06-18T15:00:30.986Z
+Stopped at: Phase 17 UI-SPEC approved
+Resume file: .planning/phases/17-ui-optimization-polish/17-UI-SPEC.md
 
 ## Operator Next Steps