diff --git a/README.md b/README.md
index c04a49a..7b62b96 100644
--- a/README.md
+++ b/README.md
@@ -55,9 +55,41 @@ The downloaded browser is stored in `~/.dataconnect/browsers/` and persists acro
 npm install
 
 # Run in development mode
-npm run tauri dev
+npm run tauri:dev
 ```
 
+### Connector lifecycle (important)
+
+Connector files have two locations in dev:
+
+- Repo source: `./connectors/`
+- User runtime copy: `~/.dataconnect/connectors/`
+
+How they get there:
+
+- `npm install` runs `postinstall` -> `node scripts/fetch-connectors.js`
+  - This can download/regenerate connector files into `./connectors/`.
+- `npm run tauri:dev` runs `node scripts/sync-connectors-dev.js` first
+  - This copies repo connectors into `~/.dataconnect/connectors/`.
+
+Key point:
+
+- `tauri:dev` syncs what already exists in `./connectors/`.
+- It does not fetch missing repo connectors by itself.
+
+If you deleted connector folders and need to recover:
+
+```bash
+node scripts/fetch-connectors.js
+node scripts/sync-connectors-dev.js
+npm run tauri:dev
+```
+
+Optional environment flags:
+
+- `SKIP_CONNECTOR_FETCH=1` -> skip connector download in `postinstall`.
+- `CONNECTORS_PATH=/path/to/local/connectors` -> skip remote fetch and use local connector source.
+
 ### Agent config files
 
 This repo keeps both `AGENTS.md` and `CLAUDE.md`: Claude Code auto‑loads `CLAUDE.md` but not `AGENTS.md`, and Cursor does the opposite. Keep them aligned.
diff --git a/docs/260219-figma-macos-icon-setup.md b/docs/260219-figma-macos-icon-setup.md
new file mode 100644
index 0000000..d5d7363
--- /dev/null
+++ b/docs/260219-figma-macos-icon-setup.md
@@ -0,0 +1,135 @@
+# Figma Setup for Tori macOS App Icon
+
+This is the exact Figma setup for creating a macOS icon master that looks right in Dock/Finder and works with the current Tauri icon pipeline.
+
+## Scope
+
+- App: Tori (DataConnect repo)
+- Build pipeline: `src-tauri/icons/*` generated via `tauri icon`
+- Goal: produce a high-quality macOS icon master (not a generic square export)
+
+## Base Frame Recipe (Exact Values)
+
+Create a Figma frame and enclosure with these exact values:
+
+- Frame size: `1024 x 1024`
+- Frame background: transparent
+- Enclosure shape: rounded rectangle
+- Enclosure size: `824 x 824`
+- Enclosure position: centered (`X: 100`, `Y: 100`)
+- Corner radius: `185.4`
+- Corner smoothing: `100%` (continuous/squircle-like corner)
+
+## Required Layer Structure
+
+Use this layer order so handoff is consistent:
+
+1. `icon/base-shadow`
+2. `icon/enclosure`
+3. `icon/glyph` (or grouped artwork)
+4. `icon/highlight` (optional polish)
+5. `icon/export-mask` (optional helper, hidden at export)
+
+## Recommended Styling
+
+### Enclosure
+
+- Fill: your brand gradient or solid fill
+- Keep strong contrast at edges (Dock icons get viewed very small)
+
+### Shadow (on enclosure)
+
+- Effect type: Drop shadow
+- `X: 0`
+- `Y: 12`
+- Blur: `28`
+- Spread: `0`
+- Color: `#000000` at `50%` opacity
+
+## Glyph/Artwork Placement Rules
+
+- Keep all important detail inside the `824 x 824` enclosure
+- Do not place critical edges right on the boundary
+- Maintain visual breathing room so 32px and 16px renders still read
+- Avoid tiny strokes and small text (they collapse at app icon sizes)
+
+## Polish Pass (Recommended)
+
+These are optional but usually improve final quality a lot.
+
+### 1) Subtle inner highlight
+
+- Add an inside stroke on the enclosure:
+  - Width: `1 px`
+  - Color: white at `10-18%`
+  - Blend: normal
+
+This gives the enclosure a cleaner edge without looking glossy.
+
+### 2) Size-legibility check
+
+In Figma, preview/export and sanity-check icon readability at:
+
+- `128 x 128`
+- `64 x 64`
+- `32 x 32`
+- `16 x 16`
+
+If the mark gets muddy, simplify the glyph before export.
+
+### 3) Optical centering
+
+If the icon looks low/heavy in Dock previews, nudge glyph up by 2-6 px (optical, not geometric centering).
+
+## Export + Tauri Pipeline
+
+1. Export flattened PNG from Figma:
+   - Size: `1024 x 1024`
+   - Transparent background
+2. Generate Tauri icon set from repo root:
+   - `npm run tauri icon /absolute/path/to/tori-icon-1024.png`
+3. This updates `src-tauri/icons/` including:
+   - `icon.icns` (macOS)
+   - `icon.ico` (Windows)
+   - `32x32.png`, `128x128.png`, `128x128@2x.png`, `icon.png`
+4. Build and validate:
+   - `npm run tauri:build`
+   - Open built `.app` and confirm Dock/Finder appearance
+
+## macOS Behavior Notes
+
+- For this native macOS app flow, do not assume automatic iOS-style corner masking.
+- Treat `icon.icns` as final mac presentation; shape and visual balance should be designed in artwork.
+
+## Scalable Formula (If You Change Artboard Size)
+
+For artboard size `S`:
+
+- Enclosure size: `0.8046875 * S`
+- Gutter per side: `0.09765625 * S`
+- Corner radius: `0.1810546875 * S`
+- Shadow Y: `0.01171875 * S`
+- Shadow blur: `0.02734375 * S`
+
+## Quick Handoff Checklist
+
+- [ ] Frame is `1024 x 1024` transparent
+- [ ] Enclosure is `824 x 824` centered
+- [ ] Corner radius is `185.4`, smoothing `100%`
+- [ ] Shadow matches `0 / 12 / 28 / 0 / 50% black`
+- [ ] Glyph is legible at `32` and `16`
+- [ ] Exported `1024` transparent PNG
+- [ ] Ran `npm run tauri icon ...`
+- [ ] Verified Dock/Finder icon from built app
+
+## Output
+
+- `npm run tauri icon ./public/data_connect_1024_1x.png`
+  - Generates/replaces app icon assets in `src-tauri/icons/` from your source PNG (`icon.icns`, `icon.ico`, and PNG size variants). This does not build installers; it only refreshes icon files.
+- `npm run tauri:build`
+  - Runs the production build flow: builds frontend + sidecar binaries, builds the Tauri app bundle, injects required runtime files, and creates release artifacts (including `.app`/`.dmg` on macOS).
+
+## References
+
+- Tauri icons docs: <https://tauri.app/develop/icons>
+- Apple discussion on macOS icon shape behavior: <https://developer.apple.com/forums/thread/670578>
diff --git a/docs/260219-grant-retryable-errors-plan.md b/docs/260219-grant-retryable-errors-plan.md
new file mode 100644
index 0000000..1684520
--- /dev/null
+++ b/docs/260219-grant-retryable-errors-plan.md
@@ -0,0 +1,49 @@
+# Grant Retryable Errors Plan
+
+## Goal
+
+Show `Try Again` only for retryable grant failures. For non-retryable failures, show only `Return home`.
+
+## Scope
+
+- `src/pages/grant/types.ts`
+- `src/pages/grant/use-grant-flow.ts`
+- `src/pages/grant/index.tsx`
+- `src/pages/grant/components/grant-error-state.tsx`
+- `src/pages/grant/use-grant-flow.test.tsx`
+- `src/pages/grant/index.test.tsx`
+
+## Implementation
+
+1. Add `retryable?: boolean` to `GrantFlowState` (error state metadata).
+2. At each `status: "error"` write in `use-grant-flow.ts`, set `retryable`.
+3. Pass `retryable` from `Grant` page into `GrantErrorState`.
+4. Gate error CTAs in `GrantErrorState`:
+   - `retryable === true` -> show `Try Again` + `Return home`
+   - otherwise -> show only `Return home`
+
+## Retryability Rules
+
+- `retryable: false`
+  - missing session ID / secret
+  - session expired
+  - builder verification hard fail
+- `retryable: true`
+  - session relay/network failures
+  - grant create/approve failures
+  - personal server startup/tunnel failures
+
+## Test Plan
+
+1. Unit test flow state: error transitions include correct `retryable` value.
+2. UI test `GrantErrorState`: Retry button appears only when `retryable === true`.
+3. Regression check:
+   - expired session -> no Retry
+   - tunnel timeout -> Retry visible
+   - builder verification fail -> no Retry
+   - transient relay failure -> Retry visible
+
+## Notes
+
+- Keep change surface minimal: one boolean only, no broad error taxonomy.
+- Current runtime always returns home via `declineHref`; no external decline route in production flow.
diff --git a/docs/260219-planning-better.md b/docs/260219-planning-better.md
new file mode 100644
index 0000000..ffc3fbf
--- /dev/null
+++ b/docs/260219-planning-better.md
@@ -0,0 +1,123 @@
+# 260219-planning-better-next-time
+
+## Why this exists
+
+`260217-planning-better-next-time.md` captured core planning failures from auth flow work.
+
+This follow-up captures what we learned from the pnpm migration planning run:
+
+- how to convert a good strategy doc into an execution doc,
+- how to make handoff deterministic,
+- how to enforce proof, not trust.
+
+## What still holds from 260217 (keep as-is)
+
+These were correct and remain non-negotiable:
+
+1. Invariant-first planning.
+2. Gate-based phase closure.
+3. Dependency classification (`HARD BLOCKED` / `SOFT BLOCKED` / `UNBLOCKED`).
+4. Ordered implementation (boundary -> seams -> behavior -> cleanup -> polish).
+5. Early replan triggers when loop-back signals appear.
+
+No rollback on these principles.
+
+## What 260219 added (new required mechanics)
+
+The missing piece in 260217 was operational precision. We now require:
+
+1. **Mandatory File Edit Contract**
+   - Explicit list of files that must be touched.
+   - Each file marked `PASS`, `NO-OP`, or `FAIL`.
+2. **Targeted verification commands**
+   - Concrete grep/rg commands and runtime/build checks.
+   - Not just "run tests"; exact commands and expected outcomes.
+3. **Evidence template in PR**
+   - Table format for gate outcomes.
+   - Required artifacts/output summary per gate.
+4. **Definition of NO-OP**
+   - "No change required" must be proven by scan at execution time.
+5. **Done criteria that block merge**
+   - Any `FAIL` gate blocks merge, even if feature appears to work.
+
+## Bidirectional takeaways (both docs improve each other)
+
+### 260217 -> migration planning
+
+What helped from 260217 during this run:
+
+- forcing phase gates prevented "looks done" closure,
+- dependency handling mindset exposed hidden npm/npx coupling quickly,
+- early-warning signals justified expanding scope before implementation.
+
+### migration planning -> 260217 model
+
+What 260217 lacked and should now inherit:
+
+- explicit handoff contract (who changes what files),
+- evidence capture format (not freeform notes),
+- mechanical pass/fail semantics for each gate.
+
+## Updated planning standard (v2)
+
+Every non-trivial plan must include all of the below:
+
+1. Goal and scope.
+2. Invariants.
+3. External dependencies with block status + owner/date.
+4. Ordered phases with exit gates.
+5. Mandatory File Edit Contract.
+6. Non-negotiable verification commands.
+7. Evidence Capture Template for PR.
+8. Done criteria with merge-blocking conditions.
+9. Risks and mitigations.
+10. Out of scope.
+
+If items 5-8 are missing, the plan is not handoff-safe.
+
+## Gate taxonomy (standardized)
+
+Use these gate classes in all plans:
+
+- **Code-path gates**: target files updated as specified.
+- **Behavior gates**: runtime behavior remains correct.
+- **Build gates**: local build/test/lint pass.
+- **Packaging gates**: release artifacts/runtime packaging integrity.
+- **CI gates**: workflow semantics preserved after tooling changes.
+- **Fresh-clone gates**: clean environment bootstrap works as documented.
+
+## Evidence quality rules
+
+1. "Pass" without command output summary is invalid.
+2. "No-op" without scan evidence is invalid.
+3. Flaky gate result is treated as `FAIL` until reproduced.
+4. Fix commits must map to failed gates explicitly.
+5. Closure statement must map each risk -> final status.
+
+## Replan triggers (expanded)
+
+Stop and replan when any of these occur:
+
+- same core file edited 3+ times,
+- new mandatory file discovered mid-implementation,
+- gate wording becomes subjective ("seems fine", "probably"),
+- evidence table contains unresolved `FAIL` or ambiguous `NO-OP`,
+- scope silently expands without updating file contract and gates.
+
+## Practical template snippet (drop into new plan)
+
+Use this block as default:
+
+- Mandatory File Edit Contract: `<list files>`
+- Verification Commands: `<exact commands>`
+- Evidence Table: `<file contract + command gates + CI/fresh clone gates>`
+- Done Criteria:
+  - no `FAIL` rows
+  - no unresolved risks
+  - all gate classes passed
+
+## Operating principle
+
+Do not ship "a good plan."
+
+Ship a plan that can be executed by another engineer with no interpretation drift, and audited by gate evidence.
diff --git a/docs/260203-grant-connect-flow-plan.md b/docs/_archive/260203-grant-connect-flow-plan.md
similarity index 100%
rename from docs/260203-grant-connect-flow-plan.md
rename to docs/_archive/260203-grant-connect-flow-plan.md
diff --git a/docs/260203-grant-connect-flow.md b/docs/_archive/260203-grant-connect-flow.md
similarity index 100%
rename from docs/260203-grant-connect-flow.md
rename to docs/_archive/260203-grant-connect-flow.md
diff --git a/docs/260203-grant-connect-flow.png b/docs/_archive/260203-grant-connect-flow.png
similarity index 100%
rename from docs/260203-grant-connect-flow.png
rename to docs/_archive/260203-grant-connect-flow.png
diff --git a/docs/260204-auth-page-react-spec.md b/docs/_archive/260204-auth-page-react-spec.md
similarity index 100%
rename from docs/260204-auth-page-react-spec.md
rename to docs/_archive/260204-auth-page-react-spec.md
diff --git a/docs/260204-connect-flow.png b/docs/_archive/260204-connect-flow.png
similarity index 100%
rename from docs/260204-connect-flow.png
rename to docs/_archive/260204-connect-flow.png
diff --git a/docs/260205-app-id-design.md b/docs/_archive/260205-app-id-design.md
similarity index 100%
rename from docs/260205-app-id-design.md
rename to docs/_archive/260205-app-id-design.md
diff --git a/docs/260205-app-id.png b/docs/_archive/260205-app-id.png
similarity index 100%
rename from docs/260205-app-id.png
rename to docs/_archive/260205-app-id.png
diff --git a/docs/260206-data-src-overview.png b/docs/_archive/260206-data-src-overview.png
similarity index 100%
rename from docs/260206-data-src-overview.png
rename to docs/_archive/260206-data-src-overview.png
diff --git a/docs/260206-grant-step3-plan.md b/docs/_archive/260206-grant-step3-plan.md
similarity index 100%
rename from docs/260206-grant-step3-plan.md
rename to docs/_archive/260206-grant-step3-plan.md
diff --git a/docs/260206-grant-step4-plan.md b/docs/_archive/260206-grant-step4-plan.md
similarity index 100%
rename from docs/260206-grant-step4-plan.md
rename to docs/_archive/260206-grant-step4-plan.md
diff --git a/docs/plans/260219-lib-unused-mut-warning-plan.md b/docs/plans/260219-lib-unused-mut-warning-plan.md
new file mode 100644
index 0000000..27c2657
--- /dev/null
+++ b/docs/plans/260219-lib-unused-mut-warning-plan.md
@@ -0,0 +1,75 @@
+# 260219: `unused_mut` warning in `src-tauri/src/lib.rs`
+
+## Context
+
+During a production build, Rust emits:
+
+- `variable does not need to be mutable`
+- file: `src-tauri/src/lib.rs`
+- line: builder initialization in `run()`
+
+This is currently non-blocking (warning only), but it should be cleaned up in a separate, scoped change.
+
+## Problem
+
+`builder` is declared mutable:
+
+- `let mut builder = tauri::Builder::default()...`
+
+In release builds, the debug-only reassignment path is excluded, so `mut` is unnecessary and triggers `unused_mut`.
+
+## Root Cause
+
+The code pattern mixes:
+
+- always-on mutable declaration
+- conditional reassignment behind `#[cfg(debug_assertions)]`
+
+When `debug_assertions` is off, reassignment disappears but mutable declaration remains.
+
+## Proposed Fix
+
+Use immutable shadowing instead of mutable reassignment.
+
+### Before
+
+- `let mut builder = ...`
+- debug block does `builder = builder.plugin(...)`
+
+### After
+
+- `let builder = ...`
+- debug path uses `let builder = builder.plugin(...)`
+
+This preserves behavior and removes the warning in release.
+
+## Scope
+
+Only:
+
+- `src-tauri/src/lib.rs`
+
+No functional changes expected. No runtime behavior changes expected.
+
+## Validation
+
+From `src-tauri/` run:
+
+- `cargo check --lib -p dataconnect`
+
+Expected:
+
+- no `unused_mut` warning for `builder`
+- successful compile
+
+## Commit Guidance
+
+Keep this in a separate commit from icon/docs work.
+
+Suggested commit message:
+
+- `chore: remove unused mut in tauri builder setup`
+
+## Ownership Recommendation
+
+If today’s focus is icon/artwork pipeline, defer this to a follow-up micro-task owned by teammate or next cleanup pass.
diff --git a/docs/plans/260219-pnpm-migration.md b/docs/plans/260219-pnpm-migration.md
new file mode 100644
index 0000000..b066ae5
--- /dev/null
+++ b/docs/plans/260219-pnpm-migration.md
@@ -0,0 +1,298 @@
+# 260219-pnpm-migration
+
+## Objective
+
+Switch this repo from npm to pnpm in one PR, with no behavior change, no follow-up fix cycle, and deterministic local + CI installs.
+
+## Scope
+
+- In scope: package manager/tooling migration only.
+- Out of scope: product behavior changes, connector protocol changes, release process redesign.
+
+## Preconditions
+
+- Node version is `22` (matches `.nvmrc` and CI).
+- Work from repo root.
+- Use one command style in scripts/config: `pnpm run <script>` and `pnpm exec <bin>`.
+
+## Implementation Checklist (execute in this exact order)
+
+### 1) Create workspace + lockfile baseline
+
+1. In root `package.json`, add:
+   - `"packageManager": "pnpm@<PINNED_VERSION>"`
+2. Create `pnpm-workspace.yaml` with:
+   - `.`
+   - `playwright-runner`
+   - `personal-server`
+3. Run `corepack enable`.
+4. Run `pnpm install`.
+5. Commit `pnpm-lock.yaml`.
+6. Delete:
+   - `package-lock.json`
+   - `playwright-runner/package-lock.json`
+   - `personal-server/package-lock.json`
+
+### 2) Update root script wiring
+
+Update `package.json`:
+
+- Replace script-to-script chaining:
+  - `npm run auth:build` -> `pnpm run auth:build`
+  - `npm run prebuild:all` -> `pnpm run prebuild:all`
+  - any remaining `npm run ...` in scripts -> `pnpm run ...`
+
+Do not change script names or behavior.
+
+### 3) Update Tauri build hooks
+
+Update `src-tauri/tauri.conf.json`:
+
+- `build.beforeDevCommand` -> `pnpm run auth:build && pnpm run dev`
+- `build.beforeBuildCommand` -> `pnpm run build`
+
+### 4) Update build orchestration scripts
+
+#### `scripts/build-prod.js`
+
+- `npm install` -> `pnpm install --frozen-lockfile`
+- `npm run build` -> `pnpm run build`
+- `npx tauri ...` -> `pnpm exec tauri ...`
+
+#### `scripts/ensure-playwright-runner.js`
+
+- `spawnSync("npm", ["install"])` -> `spawnSync("pnpm", ["install", "--frozen-lockfile"])`
+- `spawnSync("npm", ["run", "build"])` -> `spawnSync("pnpm", ["run", "build"])`
+- staleness input `package-lock.json` -> `pnpm-lock.yaml` (root lockfile path)
+
+#### `scripts/ensure-personal-server.js`
+
+- `spawnSync("npm", ["install"])` -> `spawnSync("pnpm", ["install", "--frozen-lockfile"])`
+- `spawnSync("npm", ["run", "build"])` -> `spawnSync("pnpm", ["run", "build"])`
+- staleness input `package-lock.json` -> `pnpm-lock.yaml` (root lockfile path)
+
+### 5) Update sidecar build/runtime commands
+
+#### `playwright-runner/scripts/build.js`
+
+- `npx playwright install chromium` -> `pnpm exec playwright install chromium`
+- `npx pkg ...` -> `pnpm exec pkg ...`
+- warning/help text mentioning `npx ...` -> `pnpm exec ...`
+
+#### `playwright-runner/index.cjs`
+
+- runtime download command `npx playwright install chromium` -> `pnpm exec playwright install chromium`
+
+#### `personal-server/scripts/build.js`
+
+- `npx pkg ...` -> `pnpm exec pkg ...`
+- `npx prebuild-install ...` -> `pnpm exec prebuild-install ...`
+- Keep node_modules copy logic compatible with pnpm symlink layout (see Step 6).
+
+### 6) Harden personal-server runtime deps copy
+
+In `personal-server/scripts/build.js`, ensure copied runtime deps are physical files, not unresolved symlinks:
+
+- For copied modules:
+  - `better-sqlite3`
+  - `bindings`
+  - `file-uri-to-path`
+- Copy operation must dereference symlinks when materializing `dist/node_modules`.
+- Validate by checking copied module trees exist under `personal-server/dist/node_modules` and are readable without workspace context.
+
+### 7) Update CI release workflow
+
+Update `.github/workflows/release.yml`:
+
+1. Node setup:
+   - keep Node `22`
+   - change cache mode from npm to pnpm
+2. Add pnpm bootstrap before installs:
+   - `corepack enable`
+   - optionally pin via `corepack prepare pnpm@<PINNED_VERSION> --activate`
+3. Replace all package manager commands:
+   - `npm ci` -> `pnpm install --frozen-lockfile`
+   - `npm run <script>` -> `pnpm run <script>`
+   - `npx <bin>` -> `pnpm exec <bin>`
+4. Keep release verification semantics unchanged:
+   - version tag checks
+   - matrix targets
+   - artifact upload naming/paths
+
+### 8) Update operational docs and runtime error text
+
+Update:
+
+- `README.md` (install/dev/build/release commands)
+- `docs/260212-github-release-process.md` (release commands)
+- user-facing dev guidance strings in:
+  - `src-tauri/src/commands/server.rs`
+  - `src-tauri/src/commands/connector.rs`
+
+Do not mass-edit archived docs.
+
+## Mandatory File Edit Contract
+
+The implementer must touch all files below. If a file has no matching npm/npx string at execution time, record "verified no-op" in PR notes.
+
+### Root + orchestration
+
+- `package.json`
+  - replace script chaining `npm run ...` with `pnpm run ...`
+  - keep script names unchanged
+- `src-tauri/tauri.conf.json`
+  - `beforeDevCommand` and `beforeBuildCommand` to pnpm form
+- `scripts/build-prod.js`
+  - all `npm install` / `npm run` / `npx` calls migrated
+- `scripts/ensure-playwright-runner.js`
+  - `spawnSync("npm", ...)` migrated
+  - stale-check lockfile input moved from sidecar `package-lock.json` to root `pnpm-lock.yaml`
+- `scripts/ensure-personal-server.js`
+  - `spawnSync("npm", ...)` migrated
+  - stale-check lockfile input moved from sidecar `package-lock.json` to root `pnpm-lock.yaml`
+
+### Sidecars
+
+- `playwright-runner/scripts/build.js`
+  - `npx playwright ...` and `npx pkg ...` migrated
+- `playwright-runner/index.cjs`
+  - runtime fallback `npx playwright install chromium` migrated
+- `personal-server/scripts/build.js`
+  - `npx pkg ...` and `npx prebuild-install ...` migrated
+  - copy logic still materializes usable runtime deps under `dist/node_modules`
+
+### CI + docs + runtime guidance strings
+
+- `.github/workflows/release.yml`
+  - setup-node cache mode `pnpm`
+  - add corepack/pnpm bootstrap
+  - all `npm ci` / `npm run` / `npx` replaced
+- `README.md`
+  - installation/dev/build/release commands migrated
+- `docs/260212-github-release-process.md`
+  - release command examples migrated
+- `src-tauri/src/commands/server.rs`
+  - npm install guidance text updated
+- `src-tauri/src/commands/connector.rs`
+  - npm install guidance text updated
+
+## Non-Negotiable Verification Commands
+
+Run these and paste output summary in PR notes.
+
+1. Targeted executable-path scan (must be clean after migration):
+   - `rg -n "\\bnpm\\b|\\bnpx\\b|package-lock\\.json" package.json src-tauri/tauri.conf.json scripts/ playwright-runner/ personal-server/ .github/workflows/release.yml README.md docs/260212-github-release-process.md src-tauri/src/commands/server.rs src-tauri/src/commands/connector.rs`
+2. Lockfile/workspace state:
+   - `rg -n "packageManager|pnpm@" package.json`
+   - `rg -n "playwright-runner|personal-server" pnpm-workspace.yaml`
+   - verify `pnpm-lock.yaml` exists
+   - verify removed npm lockfiles are absent
+3. Build + runtime gates:
+   - local gates in this plan
+   - sidecar gates in this plan
+4. CI config sanity:
+   - workflow contains `corepack enable` (or explicit pnpm setup)
+   - workflow uses pnpm cache mode and pnpm commands for installs/build steps
+
+## Evidence Capture Template (required in PR)
+
+Use this exact template in the PR description.
+
+### A) File contract evidence
+
+| File | Change required | Status (`PASS`/`NO-OP`/`FAIL`) | Evidence |
+|---|---|---|---|
+| `package.json` | npm script chaining migrated |  | commit/diff reference |
+| `src-tauri/tauri.conf.json` | pre-build hooks migrated |  | commit/diff reference |
+| `scripts/build-prod.js` | npm/npx exec paths migrated |  | commit/diff reference |
+| `scripts/ensure-playwright-runner.js` | spawn + stale-check migrated |  | commit/diff reference |
+| `scripts/ensure-personal-server.js` | spawn + stale-check migrated |  | commit/diff reference |
+| `playwright-runner/scripts/build.js` | npx -> pnpm exec |  | commit/diff reference |
+| `playwright-runner/index.cjs` | runtime npx fallback migrated |  | commit/diff reference |
+| `personal-server/scripts/build.js` | npx -> pnpm exec + runtime dep copy valid |  | commit/diff reference |
+| `.github/workflows/release.yml` | corepack/cache/commands migrated |  | commit/diff reference |
+| `README.md` | operational commands migrated |  | commit/diff reference |
+| `docs/260212-github-release-process.md` | release examples migrated |  | commit/diff reference |
+| `src-tauri/src/commands/server.rs` | npm guidance text migrated |  | commit/diff reference |
+| `src-tauri/src/commands/connector.rs` | npm guidance text migrated |  | commit/diff reference |
+
+Rules:
+- `PASS` = file changed and required migration done.
+- `NO-OP` = verified no matching legacy command in file at execution time.
+- `FAIL` = required change missing or unclear.
+- PR cannot merge if any row is `FAIL`.
+
+### B) Command gate evidence
+
+| Gate | Command | Expected result | Actual summary | Status |
+|---|---|---|---|---|
+| Legacy command scan | `rg -n "\\bnpm\\b|\\bnpx\\b|package-lock\\.json" package.json src-tauri/tauri.conf.json scripts/ playwright-runner/ personal-server/ .github/workflows/release.yml README.md docs/260212-github-release-process.md src-tauri/src/commands/server.rs src-tauri/src/commands/connector.rs` | No executable npm/npx paths remain in migrated targets |  |  |
+| packageManager pin | `rg -n "packageManager|pnpm@" package.json` | pnpm packageManager present |  |  |
+| workspace packages | `rg -n "playwright-runner|personal-server" pnpm-workspace.yaml` | both sidecars present |  |  |
+| lockfile exists | check `pnpm-lock.yaml` | present |  |  |
+| npm lockfiles removed | check 3 `package-lock.json` paths | absent |  |  |
+| local install | `pnpm install --frozen-lockfile` | success exit code |  |  |
+| lint | `pnpm run lint` | success exit code |  |  |
+| tests | `pnpm run test` | success exit code |  |  |
+| root build | `pnpm run build` | success exit code |  |  |
+| tauri dev smoke | `pnpm run tauri:dev` | app boots + Settings loads + personal-server starts |  |  |
+| sidecar build A | `pnpm --dir playwright-runner run build` | success exit code |  |  |
+| sidecar build B | `pnpm --dir personal-server run build` | success exit code |  |  |
+| runtime deps packaged | inspect `personal-server/dist/node_modules` | required deps present/readable |  |  |
+
+Rules:
+- Every row must be `PASS` before merge.
+- Any flaky/intermittent result must be recorded as `FAIL` until reproduced as `PASS`.
+- Include short output excerpts for failed gates and the fix commit that resolved them.
+
+### C) Release/CI evidence
+
+| Gate | Evidence required | Status |
+|---|---|---|
+| CI uses pnpm | workflow diff shows corepack/pnpm + pnpm cache + pnpm commands |  |
+| matrix preserved | CI run includes same target matrix as baseline |  |
+| artifact contract preserved | artifact names/locations unchanged from baseline |  |
+
+### D) Fresh-clone evidence
+
+| Gate | Steps | Status |
+|---|---|---|
+| pnpm-only bootstrap | clean clone -> documented pnpm setup -> dev start succeeds |  |
+| no ad-hoc npm fallback | no npm/npx commands required during bootstrap |  |
+
+## Exact Validation Gates (all must pass)
+
+### Local
+
+- [ ] `pnpm install --frozen-lockfile`
+- [ ] `pnpm run lint`
+- [ ] `pnpm run test`
+- [ ] `pnpm run build`
+- [ ] `pnpm run tauri:dev`
+- [ ] Settings page loads and personal-server starts without restart loop
+
+### Sidecars
+
+- [ ] `pnpm --dir playwright-runner run build`
+- [ ] `pnpm --dir personal-server run build`
+- [ ] `personal-server/dist/node_modules` contains usable runtime deps
+- [ ] No broken symlink dependency path in packaged runtime folders
+
+### Release path
+
+- [ ] Release workflow runs with pnpm and completes matrix build
+- [ ] macOS/Linux/Windows artifacts produced with same naming/locations as before
+
+### Fresh clone
+
+- [ ] On clean clone: only documented pnpm commands are needed to start dev successfully
+
+## Done Criteria
+
+Migration is done only when:
+
+1. Mandatory File Edit Contract is completed (or explicit verified no-op recorded per file).
+2. Targeted executable-path scan is clean for migrated files.
+3. No `npm` or `npx` remains in executable paths (scripts, workflow, tauri hooks, sidecar runtime/build paths, active docs, runtime dev error strings).
+4. All validation gates pass in one branch without ad-hoc fixes.
+5. PR is scoped to package manager migration only.
diff --git a/docs/plans/YYMMDD-feature-plan-template.md b/docs/plans/YYMMDD-feature-plan-template.md
index b6a4c42..6af01c7 100644
--- a/docs/plans/YYMMDD-feature-plan-template.md
+++ b/docs/plans/YYMMDD-feature-plan-template.md
@@ -1,31 +1,100 @@
 # YYMMDD-<feature-slug>
 
-## Goal
+Use this template as a one doc in two modes:
+
+- Start with Strategy Lock only.
+- Don’t implement until lock is stable.
+- Then continue in the same file into Execution Contract.
+- If strategy changes later, update Strategy delta section (same file).
+
+## Strategy Lock (decide before implementation)
+
+### Goal
 
 What gets built and for whom.
 
-## Constraints
+### Scope
+
+- In scope:
+- Out of scope:
+
+### Invariants (must remain true)
+
+- Data invariants:
+- State/lifecycle invariants:
+- Security/reliability invariants:
+
+### Dependencies
+
+List external dependencies and classify each:
+
+| Dependency | Status (`HARD BLOCKED`/`SOFT BLOCKED`/`UNBLOCKED`) | Owner | Target date | Notes |
+| ---------- | -------------------------------------------------- | ----- | ----------- | ----- |
+|            |                                                    |       |             |       |
+
+### Approach
+
+- Chosen approach:
+- Rejected alternatives (and why):
+
+### Replan triggers
+
+- Trigger 1:
+- Trigger 2:
+
+## Execution Contract (mechanical handoff)
+
+### Ordered implementation steps
+
+1. Step 1
+2. Step 2
+3. Step 3
+
+### Mandatory file edit contract
+
+| File           | Required change | Status (`PASS`/`NO-OP`/`FAIL`) | Evidence |
+| -------------- | --------------- | ------------------------------ | -------- |
+| `path/to/file` |                 |                                |          |
+
+Rules:
+
+- `PASS`: required change implemented.
+- `NO-OP`: verified no matching change needed at execution time.
+- `FAIL`: required change missing/unclear.
+
+### Verification commands
 
-Technical, product, and timeline constraints.
+List exact commands (not paraphrases):
 
-## Existing patterns
+```bash
+# legacy pattern scan
+rg -n "<pattern>" <paths>
 
-Relevant files and patterns to follow.
+# build/test checks
+pnpm run lint
+pnpm run test
+```
 
-## Proposed approach
+### Gate checklist (all required)
 
-Implementation steps and file touch list.
+- [ ] Code-path gates passed
+- [ ] Behavior/runtime gates passed
+- [ ] Build/test/lint gates passed
+- [ ] CI/release gates passed (if applicable)
+- [ ] Fresh-clone gate passed (if applicable)
 
-## Edge cases
+### PR evidence table
 
-Known failure modes and handling.
+| Gate | Command/evidence | Expected | Actual summary | Status |
+| ---- | ---------------- | -------- | -------------- | ------ |
+|      |                  |          |                |        |
 
-## Validation checklist
+### Done criteria
 
-- [ ] `npm run lint`
-- [ ] `npm run test`
-- [ ] Manual verification for changed flow
+1. No `FAIL` rows in file contract or gate table.
+2. All required gates are `PASS`.
+3. Scope boundaries remained intact (or strategy delta recorded).
 
-## Out of scope
+### Strategy delta (only if needed)
 
-Explicitly excluded items.
+Record any change to goal, invariants, dependency status, or chosen approach after implementation starts.
diff --git a/legal/data-extraction-risk-responsibility-disclosure.md b/legal/data-extraction-risk-responsibility-disclosure.md
new file mode 100644
index 0000000..7078693
--- /dev/null
+++ b/legal/data-extraction-risk-responsibility-disclosure.md
@@ -0,0 +1,17 @@
+# Data Extraction Risk & Responsibility Disclosure
+
+**Status:** Draft stub  
+**Last updated:** TBD
+
+This disclosure explains key responsibilities when using Data Connect for data extraction.
+
+## Summary
+
+- You initiate and control access using credentials you are authorized to use.
+- The Vana Foundation provides software tooling and does not operate extraction as a managed service on your behalf.
+- Third-party platform terms and applicable law may restrict automated access.
+- You are responsible for ensuring your use complies with those requirements.
+
+## Full Terms
+
+Legal team to provide final approved language.
diff --git a/public/data_connect_1024_1x.png b/public/data_connect_1024_1x.png
new file mode 100644
index 0000000..9496e63
Binary files /dev/null and b/public/data_connect_1024_1x.png differ
diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png
index 77e7d23..3d76980 100644
Binary files a/src-tauri/icons/128x128.png and b/src-tauri/icons/128x128.png differ
diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png
index 0f7976f..17d37c1 100644
Binary files a/src-tauri/icons/128x128@2x.png and b/src-tauri/icons/128x128@2x.png differ
diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png
index 98fda06..9be3b64 100644
Binary files a/src-tauri/icons/32x32.png and b/src-tauri/icons/32x32.png differ
diff --git a/src-tauri/icons/64x64.png b/src-tauri/icons/64x64.png
new file mode 100644
index 0000000..31729af
Binary files /dev/null and b/src-tauri/icons/64x64.png differ
diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png
index f35d84f..3493fef 100644
Binary files a/src-tauri/icons/Square107x107Logo.png and b/src-tauri/icons/Square107x107Logo.png differ
diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png
index 1823bb2..58d0afd 100644
Binary files a/src-tauri/icons/Square142x142Logo.png and b/src-tauri/icons/Square142x142Logo.png differ
diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png
index dc2b22c..b52463b 100644
Binary files a/src-tauri/icons/Square150x150Logo.png and b/src-tauri/icons/Square150x150Logo.png differ
diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png
index 0ed3984..92f2155 100644
Binary files a/src-tauri/icons/Square284x284Logo.png and b/src-tauri/icons/Square284x284Logo.png differ
diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png
index 60bf0ea..1d811ec 100644
Binary files a/src-tauri/icons/Square30x30Logo.png and b/src-tauri/icons/Square30x30Logo.png differ
diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png
index c8ca0ad..73d76ed 100644
Binary files a/src-tauri/icons/Square310x310Logo.png and b/src-tauri/icons/Square310x310Logo.png differ
diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png
index 8756459..64f4f2e 100644
Binary files a/src-tauri/icons/Square44x44Logo.png and b/src-tauri/icons/Square44x44Logo.png differ
diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png
index 2c8023c..b07cd86 100644
Binary files a/src-tauri/icons/Square71x71Logo.png and b/src-tauri/icons/Square71x71Logo.png differ
diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png
index 2c5e603..cda91e8 100644
Binary files a/src-tauri/icons/Square89x89Logo.png and b/src-tauri/icons/Square89x89Logo.png differ
diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png
index 17d142c..48191aa 100644
Binary files a/src-tauri/icons/StoreLogo.png and b/src-tauri/icons/StoreLogo.png differ
diff --git a/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml b/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..2ffbf24
--- /dev/null
+++ b/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <background android:drawable="@color/ic_launcher_background"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..5669e5b
Binary files /dev/null and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png differ
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..aa01c46
Binary files /dev/null and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..f935e43
Binary files /dev/null and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..5c2e292
Binary files /dev/null and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png differ
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..f00535a
Binary files /dev/null and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..a78ef69
Binary files /dev/null and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..cee096e
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..9a77b5f
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..0723721
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..f6eb72e
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..50a7a37
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..30719e7
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..4927b1a
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..ee419d1
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..ed6fbd5
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/src-tauri/icons/android/values/ic_launcher_background.xml b/src-tauri/icons/android/values/ic_launcher_background.xml
new file mode 100644
index 0000000..ea9c223
--- /dev/null
+++ b/src-tauri/icons/android/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="ic_launcher_background">#fff</color>
+</resources>
\ No newline at end of file
diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
index a2993ad..41b1351 100644
Binary files a/src-tauri/icons/icon.icns and b/src-tauri/icons/icon.icns differ
diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico
index 06c23c8..53defd2 100644
Binary files a/src-tauri/icons/icon.ico and b/src-tauri/icons/icon.ico differ
diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png
index d1756ce..608ebc5 100644
Binary files a/src-tauri/icons/icon.png and b/src-tauri/icons/icon.png differ
diff --git a/src-tauri/icons/ios/AppIcon-20x20@1x.png b/src-tauri/icons/ios/AppIcon-20x20@1x.png
new file mode 100644
index 0000000..6e5e37c
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-20x20@1x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/src-tauri/icons/ios/AppIcon-20x20@2x-1.png
new file mode 100644
index 0000000..dfc2566
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-20x20@2x-1.png differ
diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x.png b/src-tauri/icons/ios/AppIcon-20x20@2x.png
new file mode 100644
index 0000000..dfc2566
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-20x20@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-20x20@3x.png b/src-tauri/icons/ios/AppIcon-20x20@3x.png
new file mode 100644
index 0000000..684b108
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-20x20@3x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-29x29@1x.png b/src-tauri/icons/ios/AppIcon-29x29@1x.png
new file mode 100644
index 0000000..168a979
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-29x29@1x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/src-tauri/icons/ios/AppIcon-29x29@2x-1.png
new file mode 100644
index 0000000..af4e656
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-29x29@2x-1.png differ
diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x.png b/src-tauri/icons/ios/AppIcon-29x29@2x.png
new file mode 100644
index 0000000..af4e656
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-29x29@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-29x29@3x.png b/src-tauri/icons/ios/AppIcon-29x29@3x.png
new file mode 100644
index 0000000..db7d5a6
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-29x29@3x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-40x40@1x.png b/src-tauri/icons/ios/AppIcon-40x40@1x.png
new file mode 100644
index 0000000..dfc2566
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-40x40@1x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/src-tauri/icons/ios/AppIcon-40x40@2x-1.png
new file mode 100644
index 0000000..edd5a02
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-40x40@2x-1.png differ
diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x.png b/src-tauri/icons/ios/AppIcon-40x40@2x.png
new file mode 100644
index 0000000..edd5a02
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-40x40@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-40x40@3x.png b/src-tauri/icons/ios/AppIcon-40x40@3x.png
new file mode 100644
index 0000000..a07fee8
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-40x40@3x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-512@2x.png b/src-tauri/icons/ios/AppIcon-512@2x.png
new file mode 100644
index 0000000..4fcd95f
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-512@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-60x60@2x.png b/src-tauri/icons/ios/AppIcon-60x60@2x.png
new file mode 100644
index 0000000..a07fee8
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-60x60@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-60x60@3x.png b/src-tauri/icons/ios/AppIcon-60x60@3x.png
new file mode 100644
index 0000000..0834e3e
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-60x60@3x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-76x76@1x.png b/src-tauri/icons/ios/AppIcon-76x76@1x.png
new file mode 100644
index 0000000..8dd9599
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-76x76@1x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-76x76@2x.png b/src-tauri/icons/ios/AppIcon-76x76@2x.png
new file mode 100644
index 0000000..7507b2b
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-76x76@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png
new file mode 100644
index 0000000..0eb8846
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png differ
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index 7962fad..d1dd55a 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -16,16 +16,14 @@ use tauri::{Listener, Manager};
 
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
-    let mut builder = tauri::Builder::default()
+    let builder = tauri::Builder::default()
         .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_http::init())
         .plugin(tauri_plugin_deep_link::init());
 
     #[cfg(debug_assertions)]
-    {
-        builder = builder.plugin(tauri_plugin_mcp_bridge::init());
-    }
+    let builder = builder.plugin(tauri_plugin_mcp_bridge::init());
 
     builder
         .setup(|app| {
diff --git a/src/components/elements/spinner.tsx b/src/components/elements/spinner.tsx
index a85a6aa..214fe9a 100644
--- a/src/components/elements/spinner.tsx
+++ b/src/components/elements/spinner.tsx
@@ -1,35 +1,46 @@
 /* Taken from the Rainbow Wallet repo a long time ago… */
 
-import { cn } from "@/lib/classes";
+import type { ComponentPropsWithoutRef } from "react"
+import { useId } from "react"
+import { cn } from "@/lib/classes"
 
-export const Spinner = ({
-  id = "spinner-01",
-  boxSize = 21,
-  className,
-}: {
-  id?: string;
-  boxSize?: string | number;
-  className?: string;
-}) => (
-  <svg
-    className={cn("animate-spin", className)}
-    fill="none"
-    height={boxSize}
-    viewBox="0 0 21 21"
-    width={boxSize}
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <clipPath id={id}>
-      <path d="M10.5 3C6.35786 3 3 6.35786 3 10.5C3 14.6421 6.35786 18 10.5 18C11.3284 18 12 18.6716 12 19.5C12 20.3284 11.3284 21 10.5 21C4.70101 21 0 16.299 0 10.5C0 4.70101 4.70101 0 10.5 0C16.299 0 21 4.70101 21 10.5C21 11.3284 20.3284 12 19.5 12C18.6716 12 18 11.3284 18 10.5C18 6.35786 14.6421 3 10.5 3Z" />
-    </clipPath>
-    <foreignObject clipPath={`url(#${id})`} height="21" width="21" x="0" y="0">
-      <div style={iconPath} />
-    </foreignObject>
-  </svg>
-);
+type SpinnerProps = Omit<ComponentPropsWithoutRef<"svg">, "children"> & {
+  clipPathId?: string
+}
+
+export function Spinner({ clipPathId, className, ...props }: SpinnerProps) {
+  const generatedId = useId().replace(/:/g, "")
+  const resolvedClipPathId = clipPathId ?? `spinner-${generatedId}`
+
+  return (
+    <svg
+      className={cn(
+        "size-em animate-spin motion-reduce:animate-none",
+        className
+      )}
+      fill="none"
+      viewBox="0 0 21 21"
+      xmlns="http://www.w3.org/2000/svg"
+      {...props}
+    >
+      <clipPath id={resolvedClipPathId}>
+        <path d="M10.5 3C6.35786 3 3 6.35786 3 10.5C3 14.6421 6.35786 18 10.5 18C11.3284 18 12 18.6716 12 19.5C12 20.3284 11.3284 21 10.5 21C4.70101 21 0 16.299 0 10.5C0 4.70101 4.70101 0 10.5 0C16.299 0 21 4.70101 21 10.5C21 11.3284 20.3284 12 19.5 12C18.6716 12 18 11.3284 18 10.5C18 6.35786 14.6421 3 10.5 3Z" />
+      </clipPath>
+      <foreignObject
+        clipPath={`url(#${resolvedClipPathId})`}
+        height="21"
+        width="21"
+        x="0"
+        y="0"
+      >
+        <div style={iconPath} />
+      </foreignObject>
+    </svg>
+  )
+}
 
 const iconPath = {
   background: `conic-gradient(from 180deg at 50% 50%, rgba(72, 146, 254, 0) 0deg, currentColor 282.04deg, rgba(72, 146, 254, 0) 319.86deg, rgba(72, 146, 254, 0) 360deg)`,
   height: 21,
   width: 21,
-};
+}
diff --git a/src/components/elements/svg.tsx b/src/components/elements/svg.tsx
new file mode 100644
index 0000000..9edd6b8
--- /dev/null
+++ b/src/components/elements/svg.tsx
@@ -0,0 +1,29 @@
+import type { ComponentPropsWithoutRef } from "react"
+
+interface SvgStyleProps {
+  boxSize?: string
+  useBoxSize?: boolean
+}
+
+export type SvgIconProps = ComponentPropsWithoutRef<"svg"> & SvgStyleProps
+
+export const Svg = ({
+  useBoxSize = true,
+  boxSize = "1em",
+  viewBox = "0 0 32 32",
+  className,
+  style,
+  ...props
+}: SvgIconProps) => (
+  <svg
+    className={className}
+    fill="none"
+    style={{
+      ...(useBoxSize ? { width: boxSize, height: boxSize } : {}),
+      ...style,
+    }}
+    viewBox={viewBox}
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  />
+)
diff --git a/src/components/icons/dc-icon2.tsx b/src/components/icons/dc-icon2.tsx
new file mode 100644
index 0000000..19bf573
--- /dev/null
+++ b/src/components/icons/dc-icon2.tsx
@@ -0,0 +1,71 @@
+import { useId } from "react"
+import {
+  Svg as SvgComponent,
+  type SvgIconProps,
+} from "@/components/elements/svg"
+
+export const DcIcon = (props: SvgIconProps) => {
+  const idPrefix = useId().replace(/:/g, "")
+  const clipPathId = `${idPrefix}-clip`
+  const bgGradientId = `${idPrefix}-bg-gradient`
+  const logoOverlayGradientId = `${idPrefix}-logo-overlay-gradient`
+
+  return (
+    <SvgComponent useBoxSize={true} viewBox="0 0 512 512" {...props}>
+      <g clipPath={`url(#${clipPathId})`}>
+        <rect width="512" height="512" fill={`url(#${bgGradientId})`} />
+        <path
+          d="M407.188 219.371C407.188 216.189 406.495 213.045 405.155 210.159C403.816 207.272 401.863 204.713 399.433 202.659C399.406 202.637 399.38 202.614 399.354 202.592L270.355 92.0222C266.409 88.693 261.413 86.866 256.25 86.866C251.086 86.866 246.09 88.6927 242.144 92.0222L113.146 202.592C113.12 202.614 113.094 202.637 113.067 202.659C110.637 204.713 108.684 207.272 107.345 210.159C106.005 213.045 105.312 216.189 105.312 219.371V385.312C105.312 391.114 107.617 396.678 111.72 400.78C115.822 404.882 121.386 407.187 127.188 407.187H385.312C391.114 407.187 396.678 404.882 400.78 400.78C404.883 396.678 407.188 391.114 407.188 385.312V219.371ZM437.188 385.312C437.188 399.07 431.723 412.265 421.994 421.994C412.266 431.722 399.071 437.187 385.312 437.187H127.188C113.429 437.187 100.234 431.722 90.5059 421.994C80.7774 412.265 75.3125 399.07 75.3125 385.312V219.375C75.3112 211.83 76.9562 204.376 80.1318 197.532C83.2087 190.901 87.6506 184.997 93.165 180.206L222.686 69.1882L222.765 69.1208C232.128 61.2075 243.991 56.866 256.25 56.866C268.126 56.866 279.631 60.9403 288.851 68.3894L289.735 69.1208L289.814 69.1882L419.335 180.206C424.849 184.997 429.292 190.901 432.369 197.532C435.545 204.376 437.189 211.83 437.188 219.375V385.312Z"
+          fill="var(--logo-base-color, #DFDFDF)"
+        />
+        <path
+          d="M407.188 219.371C407.188 216.189 406.495 213.045 405.155 210.159C403.816 207.272 401.863 204.713 399.433 202.659C399.406 202.637 399.38 202.614 399.354 202.592L270.355 92.0222C266.409 88.693 261.413 86.866 256.25 86.866C251.086 86.866 246.09 88.6927 242.144 92.0222L113.146 202.592C113.12 202.614 113.094 202.637 113.067 202.659C110.637 204.713 108.684 207.272 107.345 210.159C106.005 213.045 105.312 216.189 105.312 219.371V385.312C105.312 391.114 107.617 396.678 111.72 400.78C115.822 404.882 121.386 407.187 127.188 407.187H385.312C391.114 407.187 396.678 404.882 400.78 400.78C404.883 396.678 407.188 391.114 407.188 385.312V219.371ZM437.188 385.312C437.188 399.07 431.723 412.265 421.994 421.994C412.266 431.722 399.071 437.187 385.312 437.187H127.188C113.429 437.187 100.234 431.722 90.5059 421.994C80.7774 412.265 75.3125 399.07 75.3125 385.312V219.375C75.3112 211.83 76.9562 204.376 80.1318 197.532C83.2087 190.901 87.6506 184.997 93.165 180.206L222.686 69.1882L222.765 69.1208C232.128 61.2075 243.991 56.866 256.25 56.866C268.126 56.866 279.631 60.9403 288.851 68.3894L289.735 69.1208L289.814 69.1882L419.335 180.206C424.849 184.997 429.292 190.901 432.369 197.532C435.545 204.376 437.189 211.83 437.188 219.375V385.312Z"
+          fill={`url(#${logoOverlayGradientId})`}
+        />
+        <path
+          d="M347.516 311.009V343.737L265.377 261.598V163.414L288.978 187.016L301.883 174.111L256.25 128.478L210.617 174.111L223.522 187.016L247.124 163.414V261.598L164.985 343.737V311.009H146.731V374.895H210.617V356.642H177.89L256.25 278.281L334.611 356.642H301.883V374.895H365.769V311.009H347.516Z"
+          fill="var(--logo-base-color, #DFDFDF)"
+        />
+        <path
+          d="M347.516 311.009V343.737L265.377 261.598V163.414L288.978 187.016L301.883 174.111L256.25 128.478L210.617 174.111L223.522 187.016L247.124 163.414V261.598L164.985 343.737V311.009H146.731V374.895H210.617V356.642H177.89L256.25 278.281L334.611 356.642H301.883V374.895H365.769V311.009H347.516Z"
+          fill={`url(#${logoOverlayGradientId})`}
+        />
+        <path
+          d="M265.377 163.414L288.978 187.016L301.883 174.111L256.25 128.478L210.617 174.111L223.522 187.016L247.124 163.414V261.598L164.985 343.737V311.009H146.731V374.895H210.617V356.642H177.89L256.25 278.281L334.611 356.642H301.883V374.895H365.769V311.009H347.516V343.737L265.377 261.598V163.414ZM270.908 259.307L341.984 330.383V311.009C341.984 307.955 344.461 305.478 347.516 305.478H365.769C368.823 305.478 371.3 307.954 371.3 311.009V374.895C371.3 377.95 368.823 380.426 365.769 380.426H301.883C298.828 380.426 296.352 377.95 296.352 374.895V356.642C296.352 353.587 298.828 351.111 301.883 351.111H321.257L256.25 286.104L191.243 351.111H210.617C213.672 351.111 216.148 353.587 216.148 356.642V374.895C216.148 377.95 213.672 380.426 210.617 380.426H146.731C143.677 380.426 141.2 377.95 141.2 374.895V311.009C141.2 307.954 143.677 305.478 146.731 305.478H164.984C168.039 305.478 170.516 307.954 170.516 311.009V330.383L241.593 259.306V176.768L227.434 190.927C225.274 193.087 221.771 193.087 219.611 190.927L206.706 178.022C204.546 175.862 204.546 172.36 206.706 170.2L252.339 124.567C254.499 122.407 258.001 122.407 260.161 124.567L305.794 170.2C307.954 172.36 307.954 175.862 305.794 178.022L292.89 190.927C290.73 193.087 287.226 193.087 285.066 190.927L270.908 176.768V259.307Z"
+          fill="var(--logo-base-color, #DFDFDF)"
+        />
+        <path
+          d="M265.377 163.414L288.978 187.016L301.883 174.111L256.25 128.478L210.617 174.111L223.522 187.016L247.124 163.414V261.598L164.985 343.737V311.009H146.731V374.895H210.617V356.642H177.89L256.25 278.281L334.611 356.642H301.883V374.895H365.769V311.009H347.516V343.737L265.377 261.598V163.414ZM270.908 259.307L341.984 330.383V311.009C341.984 307.955 344.461 305.478 347.516 305.478H365.769C368.823 305.478 371.3 307.954 371.3 311.009V374.895C371.3 377.95 368.823 380.426 365.769 380.426H301.883C298.828 380.426 296.352 377.95 296.352 374.895V356.642C296.352 353.587 298.828 351.111 301.883 351.111H321.257L256.25 286.104L191.243 351.111H210.617C213.672 351.111 216.148 353.587 216.148 356.642V374.895C216.148 377.95 213.672 380.426 210.617 380.426H146.731C143.677 380.426 141.2 377.95 141.2 374.895V311.009C141.2 307.954 143.677 305.478 146.731 305.478H164.984C168.039 305.478 170.516 307.954 170.516 311.009V330.383L241.593 259.306V176.768L227.434 190.927C225.274 193.087 221.771 193.087 219.611 190.927L206.706 178.022C204.546 175.862 204.546 172.36 206.706 170.2L252.339 124.567C254.499 122.407 258.001 122.407 260.161 124.567L305.794 170.2C307.954 172.36 307.954 175.862 305.794 178.022L292.89 190.927C290.73 193.087 287.226 193.087 285.066 190.927L270.908 176.768V259.307Z"
+          fill={`url(#${logoOverlayGradientId})`}
+        />
+      </g>
+      <defs>
+        <linearGradient
+          id={bgGradientId}
+          x1="256"
+          y1="0"
+          x2="256"
+          y2="512"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="var(--logo-bg-stop-0, #353535)" />
+          <stop offset="1" stopColor="var(--logo-bg-stop-1, #010101)" />
+        </linearGradient>
+        <linearGradient
+          id={logoOverlayGradientId}
+          x1="256.25"
+          y1="128.478"
+          x2="256.25"
+          y2="374.895"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#000" stopOpacity="0" />
+          <stop offset="1" stopColor="#000" stopOpacity="0.5" />
+        </linearGradient>
+        <clipPath id={clipPathId}>
+          <rect width="512" height="512" rx="75" fill="white" />
+        </clipPath>
+      </defs>
+    </SvgComponent>
+  )
+}
diff --git a/src/components/icons/dc-logotype.tsx b/src/components/icons/dc-logotype.tsx
index f86e44d..5761e21 100644
--- a/src/components/icons/dc-logotype.tsx
+++ b/src/components/icons/dc-logotype.tsx
@@ -1,63 +1,78 @@
-import { Svg as SvgComponent, type SvgIconProps } from "@/components/utils/svg"
+import { useId } from "react"
+import {
+  Svg as SvgComponent,
+  type SvgIconProps,
+} from "@/components/elements/svg"
 
 export const DcLogotype = (props: SvgIconProps) => {
+  const logoGradientId = useId().replace(/:/g, "")
+  const tint = (color: string) =>
+    `color-mix(in oklab, ${color} calc(100% - var(--logo-tint-strength, 0%)), var(--logo-tint, #1e3a8a) var(--logo-tint-strength, 0%))`
+
   return (
-    <SvgComponent useBoxSize={false} viewBox="0 0 1615 165" {...props}>
+    <SvgComponent useBoxSize={false} viewBox="0 0 445 50" {...props}>
       <path
-        d="M396.836 165V110.786L438.086 0H461.657L502.907 110.786V165H479.336V126.814H420.407V165H396.836ZM424.886 103.243H474.857L450.107 37.2429H449.636L424.886 103.243Z"
-        fill="url(#logoGradient)"
+        d="M125.19 49.9998C116.95 49.9998 111.782 45.7401 111.782 38.9664C111.782 31.9133 116.81 27.5139 128.123 26.2569L137.411 25.2094V24.1619C137.411 19.4133 133.849 16.6201 128.751 16.6201C123.654 16.6201 120.232 19.4133 119.673 24.0921H111.852C112.9 16.1312 119.603 10.1955 128.751 10.1955C138.458 10.1955 145.371 15.6424 145.371 25.0698V49.4412H137.411V43.7149C135.665 47.4859 130.777 49.9998 125.19 49.9998ZM119.813 38.687C119.813 41.62 122.467 43.6451 126.237 43.6451C132.802 43.6451 137.411 39.2457 137.411 31.5641V31.2848L128.263 32.3323C122.536 32.9608 119.813 35.2652 119.813 38.687Z"
+        fill={`url(#${logoGradientId})`}
       />
       <path
-        d="M311.325 165V23.5714H271.254V0H374.968V23.5714H334.897V165H311.325Z"
-        fill="url(#logoGradient)"
+        d="M102.813 49.93C95.8992 49.93 90.7316 45.6702 90.7316 37.7094V17.2485H85.0054V10.7542H90.7316V2.72345H98.6925V10.7542H107.282V17.2485H98.6925V37.0111C98.6925 40.9217 100.787 43.0166 103.86 43.0166C105.117 43.0166 106.653 42.6675 107.841 42.2485V49.0222C106.374 49.5808 104.768 49.93 102.813 49.93Z"
+        fill={`url(#${logoGradientId})`}
       />
       <path
-        d="M145.172 165V110.786L186.422 0H209.993L251.243 110.786V165H227.672V126.814H168.743V165H145.172ZM173.222 103.243H223.193L198.443 37.2429H197.972L173.222 103.243Z"
-        fill="url(#logoGradient)"
+        d="M60.3361 49.9998C52.0959 49.9998 46.9283 45.7401 46.9283 38.9664C46.9283 31.9133 51.9562 27.5139 63.269 26.2569L72.5567 25.2094V24.1619C72.5567 19.4133 68.9953 16.6201 63.8975 16.6201C58.7998 16.6201 55.378 19.4133 54.8193 24.0921H46.9981C48.0456 16.1312 54.7495 10.1955 63.8975 10.1955C73.6042 10.1955 80.5176 15.6424 80.5176 25.0698V49.4412H72.5567V43.7149C70.8109 47.4859 65.9227 49.9998 60.3361 49.9998ZM54.959 38.687C54.959 41.62 57.6126 43.6451 61.3836 43.6451C67.9478 43.6451 72.5567 39.2457 72.5567 31.5641V31.2848L63.4087 32.3323C57.6825 32.9608 54.959 35.2652 54.959 38.687Z"
+        fill={`url(#${logoGradientId})`}
       />
       <path
-        d="M0 165V0H61.2857C84.6214 0 103.714 18.8571 103.714 42.4286V122.336C103.714 145.671 84.6214 165 61.2857 165H0ZM23.5714 141.193H61.2857C71.6571 141.193 80.1429 132.707 80.1429 122.336V42.4286C80.1429 32.0571 71.8929 23.5714 61.2857 23.5714H23.5714V141.193Z"
-        fill="url(#logoGradient)"
+        d="M18.6452 49.9998C7.61171 49.9998 0 42.1786 0 30.0977C0 18.0167 7.61171 10.1955 18.5754 10.1955C24.0223 10.1955 29.0502 12.7095 31.4943 16.3407V0H39.525V49.4412H31.4943V43.9244C29.0502 47.4859 24.0921 49.9998 18.6452 49.9998ZM8.10053 30.0977C8.10053 37.849 12.919 43.0864 19.8323 43.0864C26.6759 43.0864 31.4943 37.849 31.4943 30.0977C31.4943 22.3463 26.6759 17.039 19.8323 17.039C12.919 17.039 8.10053 22.3463 8.10053 30.0977Z"
+        fill={`url(#${logoGradientId})`}
       />
       <path
-        d="M1551.07 165V23.5714H1511V0H1614.71V23.5714H1574.64V165H1551.07Z"
-        fill="url(#logoGradient)"
+        d="M439.037 49.9302C432.123 49.9302 426.956 45.6704 426.956 37.7095V17.2487H421.23V10.7543H426.956V2.72362H434.917V10.7543H443.506V17.2487H434.917V37.0112C434.917 40.9218 437.012 43.0168 440.084 43.0168C441.341 43.0168 442.878 42.6676 444.065 42.2486V49.0224C442.598 49.581 440.992 49.9302 439.037 49.9302Z"
+        fill={`url(#${logoGradientId})`}
       />
       <path
-        d="M1413.52 165C1390.18 165 1371.09 145.671 1371.09 122.336V42.4286C1371.09 18.8571 1390.18 0 1413.52 0H1432.38C1455.95 0 1474.8 18.8571 1474.8 42.4286V55.3929H1451.23V42.4286C1451.23 31.8214 1442.98 23.5714 1432.38 23.5714H1413.52C1402.91 23.5714 1394.66 32.0571 1394.66 42.4286V122.336C1394.66 132.707 1403.15 141.193 1413.52 141.193H1432.38C1442.75 141.193 1451.23 132.707 1451.23 122.336V109.371H1474.8V122.336C1474.8 145.671 1455.95 165 1432.38 165H1413.52Z"
-        fill="url(#logoGradient)"
+        d="M400.643 50C389.47 50 381.3 41.69 381.3 30.0978C381.3 18.4359 389.47 10.1957 400.643 10.1957C410.35 10.1957 417.263 15.5727 418.381 24.3018H410.28C409.372 19.9722 405.601 17.0392 400.643 17.0392C394.219 17.0392 389.4 22.3465 389.4 30.0978C389.4 37.8492 394.289 43.0866 400.643 43.0866C405.951 43.0866 409.931 40.014 410.559 35.8241H418.73C417.822 43.9246 410.909 50 400.643 50Z"
+        fill={`url(#${logoGradientId})`}
       />
       <path
-        d="M1230.58 165V0H1324.87V23.5714H1254.15V66.7071H1315.67V90.2786H1254.15V141.429H1324.87V165H1230.58Z"
-        fill="url(#logoGradient)"
+        d="M358.362 50C346.56 50 339.088 41.7598 339.088 30.0978C339.088 18.4359 347.119 10.1957 358.153 10.1957C370.303 10.1957 377.845 19.5532 376.309 31.5643H347.049C347.538 38.9665 352.077 43.2263 358.362 43.2263C363.46 43.2263 367.021 40.7822 367.929 36.8716H376.169C374.563 44.2039 368.348 50 358.362 50ZM347.398 25.4889H368.069C367.929 20.042 363.949 16.6202 358.153 16.6202C352.496 16.6202 348.655 19.7627 347.398 25.4889Z"
+        fill={`url(#${logoGradientId})`}
       />
       <path
-        d="M1064.69 165V0H1100.28L1151.9 130.586V0H1175.47V165H1139.88L1088.26 34.4143V165H1064.69Z"
-        fill="url(#logoGradient)"
+        d="M297.061 49.4413V10.7543H305.092V16.6202C307.396 12.989 312.424 10.1957 318.011 10.1957C326.251 10.1957 332.466 15.6426 332.466 23.8828V49.4413H324.435V25.8381C324.435 20.6705 321.223 17.3185 316.195 17.3185C309.7 17.3185 305.092 22.3465 305.092 32.0531V49.4413H297.061Z"
+        fill={`url(#${logoGradientId})`}
       />
       <path
-        d="M898.797 165V0H934.39L986.011 130.586V0H1009.58V165H973.99L922.368 34.4143V165H898.797Z"
-        fill="url(#logoGradient)"
+        d="M252.938 49.4413V10.7543H260.969V16.6202C263.274 12.989 268.301 10.1957 273.888 10.1957C282.128 10.1957 288.343 15.6426 288.343 23.8828V49.4413H280.313V25.8381C280.313 20.6705 277.1 17.3185 272.072 17.3185C265.578 17.3185 260.969 22.3465 260.969 32.0531V49.4413H252.938Z"
+        fill={`url(#${logoGradientId})`}
       />
       <path
-        d="M781.334 165C757.055 165 737.02 145.671 737.02 122.336V42.4286C737.02 18.8571 757.055 0 781.334 0H801.134C825.648 0 845.448 18.8571 845.448 42.4286V122.336C845.448 145.671 825.648 165 801.134 165H781.334ZM760.355 122.336C760.355 132.707 770.02 141.193 781.334 141.193H801.134C812.448 141.193 822.112 132.707 822.112 122.336V42.4286C822.112 31.8214 812.92 23.5714 801.134 23.5714H781.334C769.548 23.5714 760.355 32.0571 760.355 42.4286V122.336Z"
-        fill="url(#logoGradient)"
+        d="M226.211 50C214.688 50 206.378 41.7598 206.378 30.0978C206.378 18.4359 214.688 10.1957 226.211 10.1957C237.733 10.1957 246.043 18.4359 246.043 30.0978C246.043 41.7598 237.733 50 226.211 50ZM214.479 30.0978C214.479 37.7794 219.297 43.0866 226.211 43.0866C233.054 43.0866 237.942 37.7794 237.942 30.0978C237.942 22.4163 233.054 17.0392 226.211 17.0392C219.297 17.0392 214.479 22.4163 214.479 30.0978Z"
+        fill={`url(#${logoGradientId})`}
       />
       <path
-        d="M627.835 165C604.499 165 585.406 145.671 585.406 122.336V42.4286C585.406 18.8571 604.499 0 627.835 0H646.692C670.263 0 689.121 18.8571 689.121 42.4286V55.3929H665.549V42.4286C665.549 31.8214 657.299 23.5714 646.692 23.5714H627.835C617.228 23.5714 608.978 32.0571 608.978 42.4286V122.336C608.978 132.707 617.463 141.193 627.835 141.193H646.692C657.063 141.193 665.549 132.707 665.549 122.336V109.371H689.121V122.336C689.121 145.671 670.263 165 646.692 165H627.835Z"
-        fill="url(#logoGradient)"
+        d="M181.172 50C167.415 50 157.01 40.7123 157.01 25.0001C157.01 9.35768 167.275 0.000166493 181.172 0.000166493C192.903 0.000166493 201.004 7.19288 201.982 17.1789H193.811C192.834 11.2431 187.945 7.05321 181.172 7.05321C171.884 7.05321 165.25 13.7571 165.25 25.0001C165.25 36.2431 171.954 42.947 181.172 42.947C187.945 42.947 193.113 38.338 194.021 32.3325H202.191C201.074 42.2486 193.043 50 181.172 50Z"
+        fill={`url(#${logoGradientId})`}
       />
       <defs>
         <linearGradient
-          id="logoGradient"
-          x1="0"
-          y1="166.63"
-          x2="0"
-          y2="3.00689"
+          id={logoGradientId}
+          x1="166.079"
+          y1="50.4939"
+          x2="166.079"
+          y2="0.91118"
           gradientUnits="userSpaceOnUse"
         >
-          <stop style={{ stopColor: "var(--logo-stop-0, #161616)" }} />
-          <stop offset="0.874814" style={{ stopColor: "var(--logo-stop-1, #888888)" }} />
+          <stop style={{ stopColor: tint("var(--logo-stop-0, #161616)") }} />
+          <stop
+            offset="0.658654"
+            style={{ stopColor: tint("var(--logo-stop-1, #888888)") }}
+          />
+          <stop
+            offset="1"
+            style={{ stopColor: tint("var(--logo-stop-2, #aaaaaa)") }}
+          />
         </linearGradient>
       </defs>
     </SvgComponent>
diff --git a/src/components/navigation/nav-item-styles.ts b/src/components/navigation/nav-item-styles.ts
new file mode 100644
index 0000000..e1f3ecc
--- /dev/null
+++ b/src/components/navigation/nav-item-styles.ts
@@ -0,0 +1,32 @@
+import { cn } from "@/lib/classes"
+
+// Shared interaction contract for navigation items across surfaces.
+const navItemInteractiveStateClasses = cn(
+  // Inactive: transparent + dim text/icon
+  "bg-transparent text-foreground-muted",
+  // Hover: subtle emphasis while inactive
+  "hover:bg-foreground/[0.03] hover:text-foreground",
+  // Active: stronger filled state
+  "aria-[current=page]:bg-foreground/[0.07] aria-[current=page]:text-foreground",
+  "aria-[current=page]:hover:bg-foreground/[0.07]"
+)
+
+export const topNavItemClassName = cn(
+  // layout & shape
+  "flex h-8 items-center justify-center",
+  "rounded-button px-4.5",
+  // transitions
+  "transition-all duration-150 ease-in-out",
+  navItemInteractiveStateClasses
+)
+
+export const settingsSidebarItemClassName = cn(
+  // layout & shape
+  "h-9 w-full justify-start gap-3 rounded-button px-3",
+  // typography
+  "text-small",
+  // icon sizing
+  "[&_svg]:text-current",
+  "[&_svg:not([class*='size-'])]:size-[1.2em]",
+  navItemInteractiveStateClasses
+)
diff --git a/src/components/top-nav.tsx b/src/components/top-nav.tsx
index 5dafaeb..3bc3554 100644
--- a/src/components/top-nav.tsx
+++ b/src/components/top-nav.tsx
@@ -1,12 +1,11 @@
 import { DcLogotype } from "@/components/icons/dc-logotype"
 import { IconMcp } from "@/components/icons/icon-mcp"
+import { topNavItemClassName } from "@/components/navigation/nav-item-styles"
 import { ROUTES } from "@/config/routes"
 import { cn } from "@/lib/classes"
 import type { LucideIcon } from "lucide-react"
-import {
-  HomeIcon,
-  UserRoundCogIcon,
-} from "lucide-react"
+import { HomeIcon, UserRoundCogIcon } from "lucide-react"
+import type { CSSProperties } from "react"
 import { NavLink } from "react-router-dom"
 
 type NavItem = {
@@ -16,17 +15,6 @@ type NavItem = {
   external?: boolean
 }
 
-const navItemBaseClasses = [
-  // layout & shape
-  "flex h-8 items-center justify-center",
-  "rounded-button px-4.5",
-  // transitions
-  "transition-all duration-150 ease-in-out",
-  // states
-  "hover:bg-foreground/[0.07] hover:text-foreground",
-]
-const navItemInactiveClasses = "bg-transparent text-muted-foreground"
-const navItemActiveClasses = "bg-foreground/[0.07] text-foreground"
 const navIconClasses = "size-[18px]"
 
 const navItems: NavItem[] = [
@@ -63,8 +51,16 @@ export function TopNav() {
           className="flex items-center gap-2"
           aria-label="Data Connect"
         >
-          {/* <DcIcon height={16} aria-hidden /> */}
-          <DcLogotype height={13} aria-hidden />
+          <DcLogotype
+            height={12}
+            style={
+              {
+                "--logo-stop-0": "var(--foreground)",
+                "--logo-stop-1":
+                  "color-mix(in oklab, var(--foreground) 50%, transparent)",
+              } as CSSProperties
+            }
+          />
         </NavLink>
 
         {/* Navigation Icons */}
@@ -79,7 +75,7 @@ export function TopNav() {
                   rel="noopener noreferrer"
                   title={label}
                   aria-label={label}
-                  className={cn(navItemBaseClasses, navItemInactiveClasses)}
+                  className={topNavItemClassName}
                 >
                   <Icon className={navIconClasses} aria-hidden />
                   <span className="sr-only">{label}</span>
@@ -92,12 +88,7 @@ export function TopNav() {
                 to={to}
                 title={label}
                 aria-label={label}
-                className={({ isActive }) =>
-                  cn(
-                    navItemBaseClasses,
-                    isActive ? navItemActiveClasses : navItemInactiveClasses
-                  )
-                }
+                className={topNavItemClassName}
               >
                 {Icon === IconMcp ? (
                   <IconMcp boxSize="18px" aria-hidden />
@@ -113,7 +104,7 @@ export function TopNav() {
 
       {/* Gradient fade below nav */}
       <div
-        className="pointer-events-none absolute left-0 right-0 top-full h-20 bg-gradient-to-b from-muted to-transparent"
+        className="pointer-events-none absolute left-0 right-0 top-full h-20 bg-linear-to-b from-muted to-transparent"
         aria-hidden="true"
       />
     </div>
diff --git a/src/components/typography/text.tsx b/src/components/typography/text.tsx
index 1b587b1..c2ee360 100644
--- a/src/components/typography/text.tsx
+++ b/src/components/typography/text.tsx
@@ -9,7 +9,7 @@ const eyebrowStyle =
 export const textVariants = cva(
   [
     // Basic defaults
-    "[&_strong]:font-medium",
+    "[&_strong]:font-semibold",
   ],
   {
     variants: {
diff --git a/src/config/links.ts b/src/config/links.ts
index c290c5a..c9dac53 100644
--- a/src/config/links.ts
+++ b/src/config/links.ts
@@ -3,6 +3,8 @@ export const LINKS = {
   appDevelopmentDocs: "https://www.vana.org/docs",
   vana: "https://www.vana.org/",
   openDataLabs: "https://opendatalabs.xyz/",
+  legalDataExtractionRiskResponsibilityDisclosure:
+    "https://github.com/vana-com/data-connect/blob/main/legal/data-extraction-risk-responsibility-disclosure.md",
   // Temporary stub for Settings > Account sign-in entrypoint.
   passportSignInStub: "https://passport.vana.org",
 } as const
diff --git a/src/pages/connect/index.tsx b/src/pages/connect/index.tsx
index a5d9086..ef423ee 100644
--- a/src/pages/connect/index.tsx
+++ b/src/pages/connect/index.tsx
@@ -61,7 +61,8 @@ export function Connect() {
   useEffect(() => {
     // Only pre-fetch for real sessions (not demo, needs secret)
     if (!params.sessionId || !params.secret) return
-    if (import.meta.env.DEV && params.sessionId.startsWith("grant-session-")) return
+    if (import.meta.env.DEV && params.sessionId.startsWith("grant-session-"))
+      return
     if (prefetchedSessionRef.current === params.sessionId) return // already started for this session
 
     void (async (): Promise<PrefetchedGrantData | null> => {
@@ -72,7 +73,7 @@ export function Connect() {
           sessionId: params.sessionId,
           hasSecret: Boolean(params.secret),
           timestamp: Date.now(),
-        });
+        })
         const claimed = await claimSession({
           sessionId: params.sessionId!,
           secret: params.secret!,
@@ -81,7 +82,7 @@ export function Connect() {
           sessionId: params.sessionId,
           granteeAddress: claimed.granteeAddress,
           scopes: claimed.scopes,
-        });
+        })
         session = {
           id: params.sessionId!,
           granteeAddress: claimed.granteeAddress,
@@ -105,21 +106,27 @@ export function Connect() {
       try {
         const builderManifest = await verifyBuilder(
           session.granteeAddress,
-          session.webhookUrl,
+          session.webhookUrl
         )
         const result = { session, builderManifest }
-        console.log("[Connect] Pre-fetch: builder verified, prefetched data ready", {
-          sessionId: params.sessionId,
-          builderName: builderManifest?.name,
-        });
+        console.log(
+          "[Connect] Pre-fetch: builder verified, prefetched data ready",
+          {
+            sessionId: params.sessionId,
+            builderName: builderManifest?.name,
+          }
+        )
         setPrefetched(result)
         return result
       } catch (err) {
         // Builder verification failed — still pass session so grant flow skips claim
-        console.warn("[Connect] Pre-fetch: builder verification failed, passing session only", {
-          sessionId: params.sessionId,
-          error: err,
-        })
+        console.warn(
+          "[Connect] Pre-fetch: builder verification failed, passing session only",
+          {
+            sessionId: params.sessionId,
+            error: err,
+          }
+        )
         const result: PrefetchedGrantData = { session }
         setPrefetched(result)
         return result
@@ -230,7 +237,7 @@ export function Connect() {
         prefetchedSession: prefetched?.session?.id,
         prefetchedBuilder: prefetched?.builderManifest?.name,
         grantHref,
-      });
+      })
       setConnectRunId(null)
       navigate(grantHref, {
         state: prefetched ? { prefetched } : undefined,
@@ -258,7 +265,7 @@ export function Connect() {
   }
 
   return (
-    <div className="container py-w24">
+    <div className="container pt-major">
       <div className="space-y-w6">
         <Text as="h1" intent="title">
           {connectTitle}
@@ -276,7 +283,9 @@ export function Connect() {
             className="relative gap-3 group disabled:opacity-100"
           >
             <PlatformIcon iconName={dataSourceLabel ?? "Data"} />
-            <span className={cn(isBusy ? "opacity-0" : undefined)}>{connectCta}</span>
+            <span className={cn(isBusy ? "opacity-0" : undefined)}>
+              {connectCta}
+            </span>
             {!connectPlatform && !isBusy ? (
               <EyebrowBadge
                 variant="outline"
@@ -288,7 +297,7 @@ export function Connect() {
               <ButtonArrow
                 icon={ChevronRight}
                 className={cn(
-                  "size-[1.5em] text-muted-foreground group-hover:text-foreground",
+                  "size-[2em] text-muted-foreground group-hover:text-foreground",
                   isBusy ? "opacity-0" : undefined
                 )}
                 aria-hidden="true"
diff --git a/src/pages/demo/demo-connect.tsx b/src/pages/demo/demo-connect.tsx
index 02967e1..47cb9f3 100644
--- a/src/pages/demo/demo-connect.tsx
+++ b/src/pages/demo/demo-connect.tsx
@@ -14,32 +14,32 @@ export function DemoConnect() {
   return (
     <>
       <TopNav />
-      <div className="container py-w24">
-      <div className="space-y-w6">
-        <Text as="h1" intent="title">
-          Connect your ChatGPT
-        </Text>
-        <Text as="p" intent="body">
-          This saves your ChatGPT data to your computer. <LearnMoreLink />
-        </Text>
+      <div className="container pt-major">
+        <div className="space-y-w6">
+          <Text as="h1" intent="title">
+            Connect your ChatGPT
+          </Text>
+          <Text as="p" intent="body">
+            This saves your ChatGPT data to your computer. <LearnMoreLink />
+          </Text>
 
-        <div className="action-outset">
-          <ActionButton
-            size="xl"
-            onClick={() => navigate("/demo/auth")}
-            className="relative gap-3 group"
-          >
-            <PlatformIcon iconName="ChatGPT" />
-            <span>Connect ChatGPT</span>
-            <ButtonArrow
-              icon={ChevronRight}
-              className="size-[1.5em] text-muted-foreground group-hover:text-foreground"
-              aria-hidden="true"
-            />
-          </ActionButton>
+          <div className="action-outset">
+            <ActionButton
+              size="xl"
+              onClick={() => navigate("/demo/auth")}
+              className="relative gap-3 group"
+            >
+              <PlatformIcon iconName="ChatGPT" />
+              <span>Connect ChatGPT</span>
+              <ButtonArrow
+                icon={ChevronRight}
+                className="size-[1.5em] text-muted-foreground group-hover:text-foreground"
+                aria-hidden="true"
+              />
+            </ActionButton>
+          </div>
         </div>
       </div>
-    </div>
     </>
   )
 }
diff --git a/src/pages/demo/demo-consent.tsx b/src/pages/demo/demo-consent.tsx
index 3b190e1..77761b9 100644
--- a/src/pages/demo/demo-consent.tsx
+++ b/src/pages/demo/demo-consent.tsx
@@ -14,52 +14,52 @@ export function DemoConsent() {
   return (
     <>
       <TopNav />
-      <div className="container py-w24">
-      <div className="space-y-w6">
-        <Text as="h1" intent="title">
-          Allow access to your ChatGPT data
-        </Text>
-        <Text as="p">
-          This will allow <strong>Rickroll</strong> to:
-        </Text>
+      <div className="container pt-major">
+        <div className="space-y-w6">
+          <Text as="h1" intent="title">
+            Allow access to your ChatGPT data
+          </Text>
+          <Text as="p">
+            This will allow <strong>Rickroll</strong> to:
+          </Text>
 
-        <div className="action-outsetx">
-          <ActionPanel className="justify-start gap-w4">
-            <div className="h-full flex items-center gap-1">
-              <PlatformIcon iconName="ChatGPT" aria-hidden="true" />
-              <ArrowRightIcon aria-hidden="true" className="size-[1.5em]" />
-              <PlatformIcon iconName="Rickroll" aria-hidden="true" />
-            </div>
-            <Text as="p" intent="button" weight="medium">
-              See your ChatGPT data
-            </Text>
-          </ActionPanel>
-        </div>
+          <div className="action-outsetx">
+            <ActionPanel className="justify-start gap-w4">
+              <div className="h-full flex items-center gap-1">
+                <PlatformIcon iconName="ChatGPT" aria-hidden="true" />
+                <ArrowRightIcon aria-hidden="true" className="size-[1.5em]" />
+                <PlatformIcon iconName="Rickroll" aria-hidden="true" />
+              </div>
+              <Text as="p" intent="button" weight="medium">
+                See your ChatGPT data
+              </Text>
+            </ActionPanel>
+          </div>
 
-        <div className="flex items-center justify-end gap-2.5">
-          <Button
-            asChild
-            variant="ghost"
-            className="text-muted-foreground border border-transparent hover:border-ring hover:bg-background"
-          >
-            <Link to="/demo">Cancel</Link>
-          </Button>
-          <Button
-            type="button"
-            onClick={() => navigate("/demo/success")}
-            variant="accent"
-            className="w-[140px]"
-          >
-            Allow
-          </Button>
-        </div>
+          <div className="flex items-center justify-end gap-2.5">
+            <Button
+              asChild
+              variant="ghost"
+              className="text-muted-foreground border border-transparent hover:border-ring hover:bg-background"
+            >
+              <Link to="/demo">Cancel</Link>
+            </Button>
+            <Button
+              type="button"
+              onClick={() => navigate("/demo/success")}
+              variant="accent"
+              className="w-[140px]"
+            >
+              Allow
+            </Button>
+          </div>
 
-        <hr />
-        <div className="flex justify-end">
-          <GrantWarning />
+          <hr />
+          <div className="flex justify-end">
+            <GrantWarning />
+          </div>
         </div>
       </div>
-    </div>
     </>
   )
 }
diff --git a/src/pages/demo/demo-success.tsx b/src/pages/demo/demo-success.tsx
index 7f5337c..c66d1de 100644
--- a/src/pages/demo/demo-success.tsx
+++ b/src/pages/demo/demo-success.tsx
@@ -10,45 +10,44 @@ export function DemoSuccess() {
   return (
     <>
       <TopNav />
-      <div className="container py-w24">
-      <div className="space-y-w6">
-        <Text as="h1" intent="title" className="relative">
-          <div className="absolute left-[-1.3em] top-[0.05em]">
-            <CheckIcon
-              className="size-9 text-success"
-              aria-hidden="true"
-              strokeWidth={2.5}
-            />
-          </div>
-          Rickroll has your ChatGPT data
-        </Text>
+      <div className="container pt-major">
+        <div className="space-y-w6">
+          <Text as="h1" intent="title" className="relative">
+            <div className="absolute left-[-1.3em] top-[0.05em]">
+              <CheckIcon
+                className="size-9 [--lucide-stroke-width:2.5] text-success"
+                aria-hidden="true"
+              />
+            </div>
+            Rickroll has your ChatGPT data
+          </Text>
 
-        <Text as="p">
-          You can{" "}
-          <Text as={Link} to="/demo" link="default">
-            revoke this permission
-          </Text>{" "}
-          at any time.
-        </Text>
+          <Text as="p">
+            You can{" "}
+            <Text as={Link} to="/demo" link="default">
+              revoke this permission
+            </Text>{" "}
+            at any time.
+          </Text>
 
-        <a
-          href="https://www.youtube.com/watch?v=dQw4w9WgXcQ"
-          target="_blank"
-          rel="noopener noreferrer"
-          className="action-outset block"
-        >
-          <ActionPanel className="gap-3 justify-start">
-            <PlatformIcon iconName="Rickroll" />
-            Return to Rickroll to continue
-          </ActionPanel>
-        </a>
+          <a
+            href="https://www.youtube.com/watch?v=dQw4w9WgXcQ"
+            target="_blank"
+            rel="noopener noreferrer"
+            className="action-outset block"
+          >
+            <ActionPanel className="gap-3 justify-start">
+              <PlatformIcon iconName="Rickroll" />
+              Return to Rickroll to continue
+            </ActionPanel>
+          </a>
 
-        <Text as={Link} to="/demo" dim withIcon link="default">
-          <UserRoundCogIcon aria-hidden="true" className="size-[1.1em]" />
-          Manage your account
-        </Text>
+          <Text as={Link} to="/demo" dim withIcon link="default">
+            <UserRoundCogIcon aria-hidden="true" className="size-[1.1em]" />
+            Manage your account
+          </Text>
+        </div>
       </div>
-    </div>
     </>
   )
 }
diff --git a/src/pages/demo/index.tsx b/src/pages/demo/index.tsx
index e38c5fa..52cb9e6 100644
--- a/src/pages/demo/index.tsx
+++ b/src/pages/demo/index.tsx
@@ -14,28 +14,28 @@ export function DemoIndex() {
   return (
     <>
       <TopNav />
-      <div className="container py-w24">
-      <div className="space-y-w6">
-        <Text as="h1" intent="title">
-          Demo Flow
-        </Text>
-        <Text as="p" dim>
-          Click through the grant flow. Start at step 1 or jump to any scene.
-        </Text>
+      <div className="container pt-major">
+        <div className="space-y-w6">
+          <Text as="h1" intent="title">
+            Demo Flow
+          </Text>
+          <Text as="p" dim>
+            Click through the grant flow. Start at step 1 or jump to any scene.
+          </Text>
 
-        <div className="space-y-2">
-          {DEMO_SCENES.map(scene => (
-            <Link
-              key={scene.path}
-              to={scene.path}
-              className="link block text-body"
-            >
-              {scene.label}
-            </Link>
-          ))}
+          <div className="space-y-2">
+            {DEMO_SCENES.map(scene => (
+              <Link
+                key={scene.path}
+                to={scene.path}
+                className="link block text-body"
+              >
+                {scene.label}
+              </Link>
+            ))}
+          </div>
         </div>
       </div>
-    </div>
     </>
   )
 }
diff --git a/src/pages/grant/components/consent/grant-consent-state.test.tsx b/src/pages/grant/components/consent/grant-consent-state.test.tsx
index 6388e6f..16fd25c 100644
--- a/src/pages/grant/components/consent/grant-consent-state.test.tsx
+++ b/src/pages/grant/components/consent/grant-consent-state.test.tsx
@@ -1,5 +1,6 @@
 import { cleanup, render, screen } from "@testing-library/react"
 import { afterEach, describe, expect, it, vi } from "vitest"
+import { LINKS } from "@/config/links"
 import type { BuilderManifest, GrantSession } from "../../types"
 import { GrantConsentState } from "./grant-consent-state"
 
@@ -71,70 +72,38 @@ describe("GrantConsentState scope action label", () => {
     ).toBeTruthy()
   })
 
-  it("falls back to generic copy and hides scope list when scopes are empty", () => {
+  it("falls back to generic copy when scopes are empty", () => {
     renderConsent([])
 
     expect(screen.getByText("See your data")).toBeTruthy()
-    expect(screen.queryByRole("list")).toBeNull()
   })
-})
 
-describe("GrantConsentState builder links sentence", () => {
-  it("renders one link naturally", () => {
-    renderConsent(["chatgpt.conversations"], {
-      builderManifest: createBuilderManifest({
-        privacyPolicyUrl: "https://demo.app/privacy",
-      }),
-    })
-
-    const sentence = screen.getByText(
-      (_, element) =>
-        element?.tagName.toLowerCase() === "p" &&
-        Boolean(element.textContent?.includes("Demo App's")) &&
-        Boolean(element.textContent?.includes("Privacy Policy"))
-    )
-    expect(sentence.textContent).toContain("Privacy Policy.")
-    expect(sentence.textContent).not.toContain(" and ")
-    expect(sentence.textContent).not.toContain(", ")
-  })
+  it("allows immediately without checkbox acknowledgement", () => {
+    renderConsent(["chatgpt.conversations"])
 
-  it("renders two links with 'and'", () => {
-    renderConsent(["chatgpt.conversations"], {
-      builderManifest: createBuilderManifest({
-        privacyPolicyUrl: "https://demo.app/privacy",
-        termsUrl: "https://demo.app/terms",
-      }),
-    })
-
-    const sentence = screen.getByText(
-      (_, element) =>
-        element?.tagName.toLowerCase() === "p" &&
-        Boolean(element.textContent?.includes("Demo App's")) &&
-        Boolean(element.textContent?.includes("Privacy Policy"))
-    )
-    expect(sentence.textContent).toContain(
-      "Privacy Policy and Terms of Service."
-    )
-    expect(sentence.textContent).not.toContain("Privacy Policy,")
+    const allowButton = screen.getByRole("button", { name: "Agree and Allow" })
+    expect((allowButton as HTMLButtonElement).disabled).toBe(false)
   })
 
-  it("renders three links with comma plus 'and'", () => {
-    renderConsent(["chatgpt.conversations"], {
-      builderManifest: createBuilderManifest({
-        privacyPolicyUrl: "https://demo.app/privacy",
-        termsUrl: "https://demo.app/terms",
-        supportUrl: "https://demo.app/support",
-      }),
-    })
-
-    const sentence = screen.getByText(
-      (_, element) =>
-        element?.tagName.toLowerCase() === "p" &&
-        Boolean(element.textContent?.includes("Demo App's")) &&
-        Boolean(element.textContent?.includes("Privacy Policy"))
-    )
-    expect(sentence.textContent).toContain(
-      "Privacy Policy, Terms of Service and Support."
-    )
+  it("renders compact clickwrap disclosure with legal doc link", () => {
+    renderConsent(["chatgpt.conversations"])
+
+    expect(
+      screen.getByText(
+        /you acknowledge that you are initiating access with credentials you control/i
+      )
+    ).toBeTruthy()
+    expect(
+      screen.getByRole("link", {
+        name: "Data Extraction Risk & Responsibility Disclosure",
+      })
+    ).toBeTruthy()
+    expect(
+      screen
+        .getByRole("link", {
+          name: "Data Extraction Risk & Responsibility Disclosure",
+        })
+        .getAttribute("href")
+    ).toBe(LINKS.legalDataExtractionRiskResponsibilityDisclosure)
   })
 })
diff --git a/src/pages/grant/components/consent/grant-consent-state.tsx b/src/pages/grant/components/consent/grant-consent-state.tsx
index 2583cd1..71f5d90 100644
--- a/src/pages/grant/components/consent/grant-consent-state.tsx
+++ b/src/pages/grant/components/consent/grant-consent-state.tsx
@@ -4,9 +4,9 @@ import { PlatformIcon } from "@/components/icons/platform-icon"
 import { Text } from "@/components/typography/text"
 import { OpenExternalLink } from "@/components/typography/link-open-external"
 import { cn } from "@/lib/classes"
+import { LINKS } from "@/config/links"
 import { formatScopeLabel, getPrimaryDataSourceLabel } from "@/lib/scope-labels"
 import type { BuilderManifest, GrantSession } from "../../types"
-import { GrantWarning } from "./grant-warning"
 import { ActionPanel } from "@/components/typography/button-action"
 
 // Note: `isApproving` maps to the "creating-grant" / "approving" states.
@@ -20,7 +20,7 @@ interface GrantConsentStateProps {
   onDeny?: () => void
 }
 
-/** Pick the best icon from the builder manifest icons array (prefer 48–96px). */
+/** Pick the best icon from builder manifest icons array (prefer 48–96px). */
 function pickBuilderIcon(manifest?: BuilderManifest): string | undefined {
   if (!manifest?.icons?.length) return undefined
   // Prefer an icon in the 48–96px range; fall back to first
@@ -53,17 +53,6 @@ export function GrantConsentState({
   const appName =
     builderName ?? builderManifest?.name ?? session?.appName ?? "this app"
   const builderIconSrc = pickBuilderIcon(builderManifest)
-  const privacyPolicyUrl = builderManifest?.privacyPolicyUrl
-  const termsUrl = builderManifest?.termsUrl
-  const supportUrl = builderManifest?.supportUrl
-  const builderLinks = [
-    privacyPolicyUrl
-      ? { href: privacyPolicyUrl, label: "Privacy Policy" }
-      : null,
-    termsUrl ? { href: termsUrl, label: "Terms of Service" } : null,
-    supportUrl ? { href: supportUrl, label: "Support" } : null,
-  ].filter(Boolean) as Array<{ href: string; label: string }>
-
   const handleCancel = () => {
     if (isApproving) return
     if (onDeny) {
@@ -72,7 +61,7 @@ export function GrantConsentState({
   }
 
   return (
-    <div className="container py-w24">
+    <div className="container pt-major">
       <div className="space-y-w6">
         <Text as="h1" intent="title">
           Allow access to your {dataLabel}
@@ -114,6 +103,20 @@ export function GrantConsentState({
           </Text>
         </ActionPanel>
 
+        <Text as="p" intent="fine" dim align="left" balance>
+          By clicking <strong>Agree and Allow</strong>, you acknowledge that you
+          are initiating access with credentials you control, that third-party
+          platform terms may restrict automated access, and that compliance
+          responsibility rests with you (not the Vana Foundation). Read the full
+          disclosure:{" "}
+          <OpenExternalLink
+            href={LINKS.legalDataExtractionRiskResponsibilityDisclosure}
+          >
+            Data Extraction Risk &amp; Responsibility Disclosure
+          </OpenExternalLink>
+          .
+        </Text>
+
         <div className="flex items-center justify-end gap-2.5">
           <Button
             type="button"
@@ -132,7 +135,7 @@ export function GrantConsentState({
             onClick={onApprove}
             disabled={isApproving}
             variant="accent"
-            className="w-[140px] disabled:opacity-100"
+            className="w-[156px] disabled:opacity-100"
           >
             {isApproving ? (
               <>
@@ -143,13 +146,13 @@ export function GrantConsentState({
                 <span aria-live="polite">Allowing…</span>
               </>
             ) : (
-              "Allow"
+              "Agree and Allow"
             )}
           </Button>
         </div>
 
-        <hr />
-        <div className="flex flex-col items-end gap-2">
+        {/* <hr /> */}
+        {/* <div className="flex flex-col items-end gap-2">
           {builderLinks.length > 0 && (
             <Text as="p" intent="body" dim align="right">
               Read {appName}'s{" "}
@@ -169,7 +172,7 @@ export function GrantConsentState({
             </Text>
           )}
           <GrantWarning align="right" />
-        </div>
+        </div> */}
       </div>
     </div>
   )
diff --git a/src/pages/grant/components/grant-auth-required-state.tsx b/src/pages/grant/components/grant-auth-required-state.tsx
index a267e8b..1baa1b4 100644
--- a/src/pages/grant/components/grant-auth-required-state.tsx
+++ b/src/pages/grant/components/grant-auth-required-state.tsx
@@ -1,7 +1,12 @@
-import { LoaderIcon } from "lucide-react"
+import type { MouseEvent } from "react"
+import { Link } from "react-router-dom"
+import { ArrowUpRightIcon } from "lucide-react"
 import { Text } from "@/components/typography/text"
-import { Button } from "@/components/ui/button"
+import { ActionButton } from "@/components/typography/button-action"
+import { ButtonArrow } from "@/components/ui/button"
 import { openExternalUrl } from "@/lib/open-resource"
+import { VanaV } from "@/components/icons/vana-v"
+import { ROUTES } from "@/config/routes"
 
 interface GrantAuthRequiredStateProps {
   appName?: string
@@ -18,69 +23,84 @@ export function GrantAuthRequiredState({
   onRetryAuth,
   onDeny,
 }: GrantAuthRequiredStateProps) {
+  const handleCancelLinkClick = (event: MouseEvent<HTMLAnchorElement>) => {
+    if (!onDeny) return
+    event.preventDefault()
+    onDeny()
+  }
+
   return (
-    <div className="grid min-h-screen place-items-center bg-muted p-6">
-      <div className="w-full max-w-[440px] rounded-card bg-background p-10 shadow-md">
-        <div className="flex flex-col items-center space-y-6 text-center">
-          <LoaderIcon
-            aria-hidden="true"
-            className="size-12 animate-spin text-accent motion-reduce:animate-none"
+    <div className="container pt-major">
+      <div className="space-y-w6">
+        <Text as="h1" intent="title">
+          Sign in to continue
+        </Text>
+        <Text as="p">
+          Sign in with Vana Passport to grant {appName ?? "this app"} access to
+          your data.
+        </Text>
+
+        {authError && (
+          <Text as="p" intent="small" color="destructive">
+            {authError}
+          </Text>
+        )}
+
+        {authUrl ? (
+          <AuthActionButton
+            label="Open Vana Passport"
+            onClick={() => openExternalUrl(authUrl)}
+          />
+        ) : (
+          <AuthActionButton
+            label="Try Opening Sign-In Again"
+            onClick={onRetryAuth}
           />
-          <div className="space-y-3">
-            <Text as="h1" intent="heading">
-              Sign In to Continue
-            </Text>
-            <Text as="p" intent="body" color="mutedForeground">
-              Open the sign-in page in your browser to grant{" "}
-              <strong>{appName || "this app"}</strong> access to your data.
-            </Text>
-          </div>
-          {authError && (
-            <Text as="p" intent="small" color="destructive">
-              {authError}
-            </Text>
-          )}
-          {authUrl ? (
-            <div className="w-full space-y-3">
-              <Button
-                type="button"
-                onClick={() => openExternalUrl(authUrl)}
-                fullWidth
-                className="hover:bg-foreground/90"
-              >
-                Open Sign-In Page
-              </Button>
-              <Text
-                as="div"
-                intent="fine"
-                color="mutedForeground"
-                mono
-                className="break-all"
-              >
-                {authUrl}
-              </Text>
-            </div>
-          ) : (
-            <Button
-              type="button"
-              onClick={onRetryAuth}
-              variant="outline"
-              fullWidth
-              className="border-border hover:bg-muted"
-            >
-              Try Opening Sign-In Again
-            </Button>
-          )}
-          <Button
-            type="button"
-            variant="outline"
-            className="border-border bg-transparent px-5 py-2.5 hover:bg-muted"
-            onClick={onDeny}
+        )}
+
+        <div className="flex items-center gap-3 pt-0.5">
+          <Text
+            as={Link}
+            to={ROUTES.home}
+            dim
+            withIcon
+            link="default"
+            onClick={handleCancelLinkClick}
           >
-            Cancel
-          </Button>
+            Cancel and return Home
+          </Text>
         </div>
       </div>
     </div>
   )
 }
+
+interface AuthActionButtonProps {
+  label: string
+  onClick: () => void
+}
+
+function AuthActionButton({ label, onClick }: AuthActionButtonProps) {
+  return (
+    <ActionButton
+      type="button"
+      onClick={onClick}
+      className="items-center gap-3 text-left"
+    >
+      {/* <div className="size-8 flex items-center justify-center [&_svg]:size-6">
+        <KeyRoundIcon aria-hidden="true" />
+      </div> */}
+      <div className="p-1">
+        <div className="border border-current p-0.75 rounded-soft">
+          <VanaV aria-hidden="true" className="size-[18px]!" />
+        </div>
+      </div>
+      <span className="flex-1">{label}</span>
+      <ButtonArrow
+        icon={ArrowUpRightIcon}
+        aria-hidden="true"
+        className="size-[2em] text-foreground-muted group-hover:text-foreground"
+      />
+    </ActionButton>
+  )
+}
diff --git a/src/pages/grant/components/grant-error-state.tsx b/src/pages/grant/components/grant-error-state.tsx
index cd2338c..1874b1d 100644
--- a/src/pages/grant/components/grant-error-state.tsx
+++ b/src/pages/grant/components/grant-error-state.tsx
@@ -1,7 +1,10 @@
+import type { ReactNode } from "react"
 import { Link } from "react-router-dom"
-import { XCircleIcon } from "lucide-react"
+import { ArrowRightIcon, HomeIcon, RotateCcwIcon, XIcon } from "lucide-react"
+import { ActionButton } from "@/components/typography/button-action"
 import { Text } from "@/components/typography/text"
-import { Button } from "@/components/ui/button"
+import { ButtonArrow } from "@/components/ui/button"
+import { ROUTES } from "@/config/routes"
 
 interface GrantErrorStateProps {
   error?: string
@@ -9,32 +12,103 @@ interface GrantErrorStateProps {
   onRetry?: () => void
 }
 
-export function GrantErrorState({ error, declineHref, onRetry }: GrantErrorStateProps) {
+export function GrantErrorState({
+  error,
+  declineHref,
+  onRetry,
+}: GrantErrorStateProps) {
   return (
-    <div className="grid min-h-screen place-items-center bg-muted p-6">
-      <div className="w-full max-w-[440px] rounded-card bg-background p-10 shadow-md">
-        <div className="flex flex-col items-center space-y-6 text-center">
-          <XCircleIcon aria-hidden="true" className="size-16 text-destructive" />
-          <div className="space-y-3">
-            <Text as="h1" intent="heading" weight="semi">
-              Something Went Wrong
-            </Text>
-            <Text as="p" intent="body" color="mutedForeground">
-              {error || "Please try again."}
-            </Text>
+    <div className="container pt-major">
+      <div className="space-y-w6">
+        <Text as="h1" intent="title" className="relative">
+          <div className="absolute left-[-1.3em] top-[0.05em]">
+            <XIcon
+              aria-hidden="true"
+              className="size-9 [--lucide-stroke-width:2] text-destructive-foreground"
+            />
           </div>
-          <div className="flex gap-3">
-            {onRetry ? (
-              <Button variant="default" onClick={onRetry}>
-                Try Again
-              </Button>
-            ) : null}
-            <Button asChild variant={onRetry ? "outline" : "default"}>
-              <Link to={declineHref}>Go to Your Data</Link>
-            </Button>
-          </div>
-        </div>
+          Something went wrong
+        </Text>
+
+        <Text as="p">{error || "Please try again."}</Text>
+
+        {onRetry ? (
+          <>
+            <GrantActionButton
+              label="Try Again"
+              onClick={onRetry}
+              icon={<RotateCcwIcon aria-hidden="true" />}
+            />
+            <div className="pt-px">
+              <Text as={Link} to={ROUTES.home} dim link="default">
+                Cancel and return Home
+              </Text>
+            </div>
+          </>
+        ) : (
+          <GrantActionButton
+            asChild
+            label="Return home"
+            to={declineHref}
+            icon={<HomeIcon aria-hidden="true" />}
+          />
+        )}
       </div>
     </div>
   )
 }
+
+interface GrantActionButtonProps {
+  label: string
+  icon: ReactNode
+  variant?: "default" | "outline"
+  onClick?: () => void
+  asChild?: boolean
+  to?: string
+}
+
+function GrantActionButton({
+  label,
+  icon,
+  variant = "outline",
+  onClick,
+  asChild = false,
+  to,
+}: GrantActionButtonProps) {
+  const content = (
+    <>
+      <div className="size-8 flex items-center justify-center [&_svg]:size-6">
+        {icon}
+      </div>
+      <span className="flex-1">{label}</span>
+      <ButtonArrow
+        icon={ArrowRightIcon}
+        aria-hidden="true"
+        className="size-[2em] text-foreground-muted group-hover:text-foreground"
+      />
+    </>
+  )
+
+  if (asChild && to) {
+    return (
+      <ActionButton
+        asChild
+        variant={variant}
+        className="items-center gap-3 text-left"
+      >
+        <Link to={to}>{content}</Link>
+      </ActionButton>
+    )
+  }
+
+  return (
+    <ActionButton
+      type="button"
+      variant={variant}
+      onClick={onClick}
+      className="items-center gap-3 text-left"
+    >
+      {content}
+    </ActionButton>
+  )
+}
diff --git a/src/pages/grant/components/grant-loading-state.tsx b/src/pages/grant/components/grant-loading-state.tsx
index 672eb8d..2ff4b44 100644
--- a/src/pages/grant/components/grant-loading-state.tsx
+++ b/src/pages/grant/components/grant-loading-state.tsx
@@ -1,20 +1,17 @@
-import { LoaderIcon } from "lucide-react"
+import { Spinner } from "@/components/elements/spinner"
 import { Text } from "@/components/typography/text"
 
 interface GrantLoadingStateProps {
-  message?: string
+  title?: string
 }
 
-export function GrantLoadingState({ message }: GrantLoadingStateProps) {
+export function GrantLoadingState({ title }: GrantLoadingStateProps) {
   return (
-    <div className="flex min-h-screen items-center justify-center bg-muted">
-      <div className="flex flex-col items-center gap-4 text-center">
-        <LoaderIcon
-          aria-hidden="true"
-          className="size-12 animate-spin text-accent motion-reduce:animate-none"
-        />
-        <Text as="p" intent="body" color="mutedForeground" aria-live="polite">
-          {message ?? "Loading…"}
+    <div className="container pt-major">
+      <div className="space-y-w6">
+        <Text as="h1" intent="title" withIcon aria-live="polite">
+          <Spinner className="size-[0.75em] motion-reduce:animate-none" />
+          {title ?? "Loading…"}
         </Text>
       </div>
     </div>
diff --git a/src/pages/grant/components/grant-success-state.tsx b/src/pages/grant/components/grant-success-state.tsx
index f65a433..2749c3d 100644
--- a/src/pages/grant/components/grant-success-state.tsx
+++ b/src/pages/grant/components/grant-success-state.tsx
@@ -17,14 +17,13 @@ export function GrantSuccessState({ appName, scopes }: GrantSuccessStateProps) {
   const dataLabel = dataSourceLabel ? `${dataSourceLabel} data` : "data"
 
   return (
-    <div className="container py-w24">
+    <div className="container pt-major">
       <div className="space-y-w6">
         <Text as="h1" intent="title" className="relative">
           <div className="absolute left-[-1.3em] top-[0.05em]">
             <CheckIcon
-              className="size-9 text-foreground-muted"
+              className="size-9 [--lucide-stroke-width:2] text-accent"
               aria-hidden="true"
-              strokeWidth={2.5}
             />
           </div>
           {resolvedAppName} has your {dataLabel}
diff --git a/src/pages/grant/index.test.tsx b/src/pages/grant/index.test.tsx
index c825939..c5af4a7 100644
--- a/src/pages/grant/index.test.tsx
+++ b/src/pages/grant/index.test.tsx
@@ -25,7 +25,7 @@ afterEach(() => {
 })
 
 describe("Grant debug status switching", () => {
-  it("keeps builder manifest links when toggling creating-grant back to consent", () => {
+  it("keeps disclosure link when toggling creating-grant back to consent", () => {
     mockUseGrantFlow.mockReturnValue({
       flowState: {
         sessionId: "session-1",
@@ -63,15 +63,19 @@ describe("Grant debug status switching", () => {
       </MemoryRouter>
     )
 
-    expect(screen.getByRole("link", { name: "Privacy Policy" })).toBeTruthy()
-    expect(screen.getByRole("link", { name: "Terms of Service" })).toBeTruthy()
-    expect(screen.getByRole("link", { name: "Support" })).toBeTruthy()
+    expect(
+      screen.getByRole("link", {
+        name: "Data Extraction Risk & Responsibility Disclosure",
+      })
+    ).toBeTruthy()
 
     fireEvent.click(screen.getByRole("button", { name: "creating-grant" }))
     fireEvent.click(screen.getByRole("button", { name: "consent" }))
 
-    expect(screen.getByRole("link", { name: "Privacy Policy" })).toBeTruthy()
-    expect(screen.getByRole("link", { name: "Terms of Service" })).toBeTruthy()
-    expect(screen.getByRole("link", { name: "Support" })).toBeTruthy()
+    expect(
+      screen.getByRole("link", {
+        name: "Data Extraction Risk & Responsibility Disclosure",
+      })
+    ).toBeTruthy()
   })
 })
diff --git a/src/pages/grant/index.tsx b/src/pages/grant/index.tsx
index c3ff4de..e47497e 100644
--- a/src/pages/grant/index.tsx
+++ b/src/pages/grant/index.tsx
@@ -1,5 +1,5 @@
-import { useState } from "react"
 import { useSearchParams, useLocation } from "react-router-dom"
+import { useState } from "react"
 import { getGrantParamsFromSearchParams } from "@/lib/grant-params"
 import { useBrowserStatus } from "./use-browser-status"
 import { useGrantFlow } from "./use-grant-flow"
@@ -10,7 +10,12 @@ import { GrantErrorState } from "./components/grant-error-state"
 import { GrantSuccessState } from "./components/grant-success-state"
 import { GrantConsentState } from "./components/consent/grant-consent-state"
 import { GrantDebugPanel } from "./components/grant-debug-panel.tsx"
-import type { BuilderManifest, GrantFlowState, GrantSession, PrefetchedGrantData } from "./types"
+import type {
+  BuilderManifest,
+  GrantFlowState,
+  GrantSession,
+  PrefetchedGrantData,
+} from "./types"
 
 const DEBUG_SESSION_ID = "grant-session-debug"
 function getDebugSession(): GrantSession {
@@ -31,14 +36,18 @@ export function Grant() {
   const params = getGrantParamsFromSearchParams(searchParams)
   // Pre-fetched session + builder data passed from the connect page via navigation state.
   // When available, the grant flow skips claim + verify steps (already done in background).
-  const prefetched = (location.state as { prefetched?: PrefetchedGrantData } | null)?.prefetched
+  const prefetched = (
+    location.state as { prefetched?: PrefetchedGrantData } | null
+  )?.prefetched
   console.log("[Grant] Extracted prefetched from location.state", {
     hasPrefetched: prefetched !== undefined,
     hasSession: Boolean(prefetched?.session),
     hasBuilderManifest: Boolean(prefetched?.builderManifest),
     sessionId: prefetched?.session?.id,
-    locationStateKeys: location.state ? Object.keys(location.state as object) : null,
-  });
+    locationStateKeys: location.state
+      ? Object.keys(location.state as object)
+      : null,
+  })
   const [debugStatus, setDebugStatus] = useState<
     GrantFlowState["status"] | null
   >(null)
@@ -82,17 +91,14 @@ export function Grant() {
       ? "https://passport.vana.org"
       : authUrl
   const resolvedAuthError = isDebugging ? null : authError
-  const resolvedBuilderName = isDebugging
-    ? debugSession.appName
-    : builderName
-  const debugBuilderManifest: BuilderManifest =
-    flowState.builderManifest ?? {
-      name: debugSession.appName ?? "Debug App",
-      appUrl: "https://example.com",
-      privacyPolicyUrl: "https://example.com/privacy",
-      termsUrl: "https://example.com/terms",
-      supportUrl: "https://example.com/support",
-    }
+  const resolvedBuilderName = isDebugging ? debugSession.appName : builderName
+  const debugBuilderManifest: BuilderManifest = flowState.builderManifest ?? {
+    name: debugSession.appName ?? "Debug App",
+    appUrl: "https://example.com",
+    privacyPolicyUrl: "https://example.com/privacy",
+    termsUrl: "https://example.com/terms",
+    supportUrl: "https://example.com/support",
+  }
   const resolvedBuilderManifest: BuilderManifest | undefined = isDebugging
     ? debugBuilderManifest
     : flowState.builderManifest
@@ -112,10 +118,13 @@ export function Grant() {
       </div>
     )
   } else if (isLoadingState || resolvedAuthLoading) {
-    const loadingMessage = resolvedFlowState.status === "preparing-server"
-      ? "Preparing secure connection…"
-      : undefined
-    content = <GrantLoadingState message={loadingMessage} />
+    const loadingTitle =
+      resolvedFlowState.status === "verifying-builder"
+        ? "Verifying app configuration…"
+        : resolvedFlowState.status === "preparing-server"
+          ? "Preparing connection…"
+          : "Loading…"
+    content = <GrantLoadingState title={loadingTitle} />
   } else if (resolvedFlowState.status === "auth-required") {
     content = (
       <GrantAuthRequiredState
diff --git a/src/pages/home/components/connected-apps-list.tsx b/src/pages/home/components/connected-apps-list.tsx
index 6e97c2b..b7ed88d 100644
--- a/src/pages/home/components/connected-apps-list.tsx
+++ b/src/pages/home/components/connected-apps-list.tsx
@@ -72,7 +72,7 @@ export function ConnectedAppsList({ apps }: ConnectedAppsListProps) {
         <Header />
         <div className="action-outset">
           <ActionPanel>
-            <Text muted>No connected apps</Text>
+            <Text weight="medium">No connected apps</Text>
           </ActionPanel>
         </div>
       </section>
@@ -117,9 +117,7 @@ export function ConnectedAppsList({ apps }: ConnectedAppsListProps) {
                 {/* Duplicated SourceRow LHS; RHS is different! */}
                 <PlatformIcon
                   iconName={app.icon?.trim() || app.name}
-                  fallbackLabel={
-                    app.name.charAt(0).toUpperCase()
-                  }
+                  fallbackLabel={app.name.charAt(0).toUpperCase()}
                 />
                 <div className="flex items-baseline gap-2">
                   {app.name}
diff --git a/src/pages/home/components/connected-sources-list.tsx b/src/pages/home/components/connected-sources-list.tsx
index 362862c..fba542a 100644
--- a/src/pages/home/components/connected-sources-list.tsx
+++ b/src/pages/home/components/connected-sources-list.tsx
@@ -29,7 +29,7 @@ export function ConnectedSourcesList({
         </Text>
         <div className="action-outset">
           <ActionPanel>
-            <Text muted>No sources yet</Text>
+            <Text weight="medium">No sources yet</Text>
           </ActionPanel>
         </div>
       </section>
diff --git a/src/pages/mock-apps/rickroll/index.tsx b/src/pages/mock-apps/rickroll/index.tsx
index 744049c..117fd8b 100644
--- a/src/pages/mock-apps/rickroll/index.tsx
+++ b/src/pages/mock-apps/rickroll/index.tsx
@@ -15,7 +15,7 @@ export function RickrollMockRoot() {
           // layout
           "container flex min-h-screen items-center justify-center",
           // spacing
-          "py-w24"
+          "pt-major"
         )}
       >
         <div className="space-y-gap">
diff --git a/src/pages/settings/components/settings-sidebar.tsx b/src/pages/settings/components/settings-sidebar.tsx
index 3101900..5ad8e5f 100644
--- a/src/pages/settings/components/settings-sidebar.tsx
+++ b/src/pages/settings/components/settings-sidebar.tsx
@@ -1,11 +1,11 @@
 import type { ReactNode } from "react"
+import { settingsSidebarItemClassName } from "@/components/navigation/nav-item-styles"
 import { Button } from "@/components/ui/button"
 import {
   Tooltip,
   TooltipContent,
   TooltipTrigger,
 } from "@/components/ui/tooltip"
-import { cn } from "@/lib/classes"
 import type { SettingsSection } from "../types"
 
 interface SettingsSidebarItem {
@@ -20,19 +20,6 @@ interface SettingsSidebarProps {
   onSectionChange: (section: SettingsSection) => void
 }
 
-const settingsNavButtonClassName = cn(
-  "h-9 w-full justify-start gap-3 rounded-button px-3",
-  "text-small",
-  "[&_svg]:text-current",
-  "[&_svg:not([class*='size-'])]:size-[1.2em]",
-  // Inactive: transparent + dim text/icon
-  "bg-transparent text-foreground-muted",
-  "hover:bg-foreground/[0.031] hover:text-foreground",
-  // Active: filled row + foreground text/icon
-  "aria-[current=page]:bg-foreground/[0.07] aria-[current=page]:text-foreground",
-  "aria-[current=page]:hover:bg-foreground/[0.07]"
-)
-
 export function SettingsSidebar({
   items,
   activeSection,
@@ -48,8 +35,10 @@ export function SettingsSidebar({
                 type="button"
                 variant="ghost"
                 onClick={() => onSectionChange(section.key)}
-                aria-current={activeSection === section.key ? "page" : undefined}
-                className={settingsNavButtonClassName}
+                aria-current={
+                  activeSection === section.key ? "page" : undefined
+                }
+                className={settingsSidebarItemClassName}
               >
                 {section.icon}
                 <span className="hidden md:inline">{section.label}</span>
diff --git a/src/pages/settings/index.test.tsx b/src/pages/settings/index.test.tsx
index 8e4f865..aff4fee 100644
--- a/src/pages/settings/index.test.tsx
+++ b/src/pages/settings/index.test.tsx
@@ -94,6 +94,9 @@ beforeEach(() => {
     if (command === "get_user_data_path") {
       return Promise.resolve("/tmp/dataconnect")
     }
+    if (command === "list_browser_sessions") {
+      return Promise.resolve([])
+    }
     if (command === "check_browser_available") {
       return Promise.resolve({
         available: false,
@@ -106,11 +109,10 @@ beforeEach(() => {
 })
 
 describe("Settings", () => {
-  it("shows the account section by default", () => {
+  it("shows the personal server section by default", () => {
     const { getAllByRole } = renderSettings()
 
-    expect(getAllByRole("heading", { name: "Account" }).length).toBeGreaterThan(0)
-    expect(getAllByRole("button", { name: "Sign in" }).length).toBeGreaterThan(0)
+    expect(getAllByRole("heading", { name: "Personal Server" }).length).toBeGreaterThan(0)
   })
 
   it("switches to the apps section from the nav", () => {
@@ -131,7 +133,7 @@ describe("Settings", () => {
       walletAddress: null,
     })
 
-    const { getAllByText } = renderSettings()
+    const { getAllByText } = renderSettings(`${ROUTES.settings}?section=account`)
 
     expect(getAllByText("Sign out").length).toBeGreaterThan(0)
   })
@@ -142,9 +144,9 @@ describe("Settings", () => {
     expect(getByRole("heading", { name: "Storage & Server" })).toBeTruthy()
   })
 
-  it("falls back to account for invalid section values", () => {
+  it("falls back to personal server for invalid section values", () => {
     const { getAllByRole } = renderSettings(`${ROUTES.settings}?section=invalid`)
-    expect(getAllByRole("heading", { name: "Account" }).length).toBeGreaterThan(0)
+    expect(getAllByRole("heading", { name: "Personal Server" }).length).toBeGreaterThan(0)
   })
 
   it("clears source param when switching between non-import sections", () => {
@@ -152,8 +154,10 @@ describe("Settings", () => {
       `${ROUTES.settings}?section=apps&source=github`
     )
 
-    const [accountButton] = getAllByRole("button", { name: "Account" })
-    fireEvent.click(accountButton)
+    const [personalServerButton] = getAllByRole("button", {
+      name: "Personal Server",
+    })
+    fireEvent.click(personalServerButton)
 
     expect(getByTestId("search").textContent).toBe("")
   })
diff --git a/src/pages/settings/index.tsx b/src/pages/settings/index.tsx
index 10262f1..24fccd9 100644
--- a/src/pages/settings/index.tsx
+++ b/src/pages/settings/index.tsx
@@ -24,8 +24,8 @@ import { useSettingsPage } from "./use-settings-page"
 
 const sectionIcons: Record<SettingsSection, ReactNode> = {
   account: <UserIcon aria-hidden="true" />,
-  apps: <BoxIcon aria-hidden="true" />,
   personalServer: <ServerIcon aria-hidden="true" />,
+  apps: <BoxIcon aria-hidden="true" />,
   storage: <HousePlusIcon aria-hidden="true" />,
   imports: <ActivityIcon aria-hidden="true" />,
   credentials: <KeyRoundIcon aria-hidden="true" />,
@@ -37,12 +37,12 @@ const settingsSections: Array<{
   label: string
   icon: ReactNode
 }> = SETTINGS_SECTION_ORDER
-  // Temporarily hide Storage in nav; keep storage section implementation intact.
-  .filter(section => section !== "storage")
+  // Temporarily hide Account and Storage in nav; keep section implementations intact.
+  .filter(section => section !== "account" && section !== "storage")
   .map(section => ({
-  key: section,
-  label: SETTINGS_SECTION_META[section].navLabel,
-  icon: sectionIcons[section],
+    key: section,
+    label: SETTINGS_SECTION_META[section].navLabel,
+    icon: sectionIcons[section],
   }))
 
 export function Settings() {
diff --git a/src/pages/settings/sections.ts b/src/pages/settings/sections.ts
index 91f3d55..c01cfb6 100644
--- a/src/pages/settings/sections.ts
+++ b/src/pages/settings/sections.ts
@@ -2,8 +2,8 @@ import type { SettingsSection } from "./types"
 
 export const SETTINGS_SECTION_ORDER: SettingsSection[] = [
   "account",
-  "apps",
   "personalServer",
+  "apps",
   "storage",
   "imports",
   "credentials",
diff --git a/src/pages/settings/sections/personal-server/components/row.tsx b/src/pages/settings/sections/personal-server/components/row.tsx
index 2bce671..fb1967a 100644
--- a/src/pages/settings/sections/personal-server/components/row.tsx
+++ b/src/pages/settings/sections/personal-server/components/row.tsx
@@ -76,7 +76,7 @@ export function RowDot({ className }: RowDotProps) {
 }
 
 export const tooltipStyle = [
-  "text-fine bg-background",
+  "text-fine bg-foreground text-background",
   "ring-2 ring-foreground rounded-soft",
   "px-2.5 py-2",
 ]
diff --git a/src/pages/settings/url.ts b/src/pages/settings/url.ts
index a4129e6..504fb55 100644
--- a/src/pages/settings/url.ts
+++ b/src/pages/settings/url.ts
@@ -3,7 +3,7 @@ import { SETTINGS_SECTION_ORDER } from "./sections"
 import type { SettingsSection } from "./types"
 
 export const SETTINGS_SECTION_PARAM = "section"
-export const DEFAULT_SETTINGS_SECTION: SettingsSection = "account"
+export const DEFAULT_SETTINGS_SECTION: SettingsSection = "personalServer"
 
 export function isSettingsSection(value: string | null): value is SettingsSection {
   return value !== null && SETTINGS_SECTION_ORDER.includes(value as SettingsSection)
diff --git a/src/styles/index.css b/src/styles/index.css
index a15719c..0453ae0 100644
--- a/src/styles/index.css
+++ b/src/styles/index.css
@@ -45,9 +45,12 @@
 /* https://tailwindcss.com/docs/adding-custom-styles#adding-custom-variants */
 @custom-variant dark (&:is(.dark *));
 
-/* lucide defaults */
+/* lucide defaults + opt-in overrides */
+:root {
+  --icon-stroke-width: 1.5;
+}
 .lucide {
-  stroke-width: 1.5;
+  stroke-width: var(--lucide-stroke-width, var(--icon-stroke-width));
 }
 
 /*
@@ -75,7 +78,7 @@
     "Courier New", monospace;
 
   /* custom font weights */
-  --font-weight-semibold: 550;
+  /* --font-weight-semibold: 550; */
 
   /* text sizes */
   /* --text-* is a theme variable namespace that controls text-* utilities, and Tailwind only registers those when they’re defined via @theme. inline is explicitly required when a theme variable references another variable, which your alias lines do (e.g. --text-sm: var(--text-small)). */