diff --git a/Makefile b/Makefile
index a7f32377..51bf7474 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ modules-install: submodules
 	cd modules/hdwallet && yarn install
 
 modules-build: modules-install
-	cd modules/hdwallet && yarn build
+	cd modules/hdwallet && yarn tsc --build --force
 
 modules-clean:
 	cd modules/proto-tx-builder && rm -rf dist node_modules
@@ -80,7 +80,7 @@ dmg:
 	echo "Verifying extracted app..."; \
 	codesign --verify --deep --strict "$$APP" || (echo "ERROR: codesign verification failed"; exit 1); \
 	ln -s /Applications "$$STAGING/Applications"; \
-	DMG_OUT="$(PROJECT_DIR)/artifacts/$(DMG_NAME)"; \
+	DMG_OUT="$$(pwd)/$(PROJECT_DIR)/artifacts/$(DMG_NAME)"; \
 	rm -f "$$DMG_OUT"; \
 	echo "Creating DMG..."; \
 	hdiutil create -volname "KeepKey Vault" -srcfolder "$$STAGING" -ov -format UDZO "$$DMG_OUT"; \
@@ -96,7 +96,7 @@ dmg:
 	echo "DMG ready: $$DMG_OUT"
 
 clean: modules-clean
-	cd $(PROJECT_DIR) && rm -rf dist node_modules build artifacts
+	cd $(PROJECT_DIR) && rm -rf dist node_modules build _build artifacts
 
 # --- Audit & SBOM ---
 
@@ -118,8 +118,8 @@ sign-check:
 	@security find-identity -v -p codesigning | grep "$$ELECTROBUN_DEVELOPER_ID" || echo "WARNING: Certificate not found in keychain"
 
 verify:
-	@APP=$$(find $(PROJECT_DIR)/build -name "*.app" -maxdepth 2 | head -1); \
-	if [ -z "$$APP" ]; then echo "No .app bundle found in build/"; exit 1; fi; \
+	@APP=$$(find $(PROJECT_DIR)/_build -name "*.app" -maxdepth 2 | head -1); \
+	if [ -z "$$APP" ]; then echo "No .app bundle found in _build/"; exit 1; fi; \
 	echo "Verifying: $$APP"; \
 	echo "--- codesign ---"; \
 	codesign --verify --deep --strict "$$APP" && echo "codesign: PASS" || echo "codesign: FAIL"; \
diff --git a/docs/firmware/BUILD.md b/docs/firmware/BUILD.md
new file mode 100644
index 00000000..087f47e0
--- /dev/null
+++ b/docs/firmware/BUILD.md
@@ -0,0 +1,259 @@
+# Firmware Build Guide (v7.11.0+ with Solana)
+
+## Quick Start
+
+```bash
+cd projects/keepkey-vault-v11-solana   # or whichever worktree has firmware
+make firmware-build                     # Docker build → artifacts/firmware/
+make firmware-flash FW_PATH=artifacts/firmware/firmware.keepkey.<label>.bin
+```
+
+## Prerequisites
+
+- **Docker** — all builds happen inside `kktech/firmware:v15`
+- **Device in bootloader mode** — hold button while plugging in (for flashing only)
+- **Firmware submodules initialized** — `make firmware-init` handles this automatically
+
+## Build Targets
+
+| Target | What It Does |
+|--------|-------------|
+| `make firmware-init` | Init firmware submodules (auto-recovers empty worktrees) |
+| `make firmware-build` | Release build via Docker, outputs labeled artifacts |
+| `make firmware-build-debug` | Debug build with symbols + debug-link enabled |
+| `make firmware-collect` | Create `firmware-latest.bin` symlink to latest build |
+| `make firmware-flash FW_PATH=<path>` | Flash binary to device (bootloader mode required) |
+| `make firmware-dev` | Build + collect in one step |
+| `make firmware-info` | Query connected device for firmware version/signing status |
+| `make firmware-clean` | Remove all build artifacts |
+
+## How the Build Works
+
+### Pipeline
+
+```
+make firmware-build
+  |
+  v
+firmware-init  (git submodule update --init for 6 deps)
+  |
+  v
+scripts/build/docker/device/release.sh
+  |
+  v
+docker run kktech/firmware:v15
+  |-- cmake -C cmake/caches/device.cmake -DCMAKE_BUILD_TYPE=MinSizeRel
+  |-- make                (ARM Cortex-M3 cross-compile)
+  |-- cp bin/*.bin bin/*.elf -> modules/keepkey-firmware/bin/
+  v
+Copy to artifacts/firmware/firmware.keepkey.<label>.bin
+```
+
+### Docker Image: `kktech/firmware:v15`
+
+This image contains the full ARM cross-compilation toolchain:
+
+| Component | Version | Purpose |
+|-----------|---------|---------|
+| `arm-none-eabi-gcc` | 10-2020-q4 | ARM Cortex-M3 cross-compiler |
+| `protoc` | 3.5.1 | Protobuf compiler |
+| `nanopb` | 0.3.9.8 | Nanopb C protobuf generator |
+| `libopencm3` | docker-v9 | ARM Cortex-M library (pre-built) |
+| `cmake` | 3.9+ | Build system |
+| `clang/gcc/g++` | system | Host compilers (emulator builds) |
+
+**The image must be v15.** Older versions (v8) lack the correct libopencm3 build with `cortex-m-generic.ld`.
+
+### Artifact Labeling
+
+Build artifacts are labeled: `firmware.keepkey.solana-{commit}-{date}-{time}`
+
+Example: `firmware.keepkey.solana-fb4bfe30-20260306-155927.bin`
+
+Variables from Makefile:
+```makefile
+FW_BRANCH := $(shell cd $(FW_DIR) && git branch --show-current)
+FW_COMMIT := $(shell cd $(FW_DIR) && git rev-parse --short HEAD)
+FW_TIMESTAMP := $(shell date +%Y%m%d-%H%M%S)
+FW_LABEL := solana-$(FW_COMMIT)-$(FW_TIMESTAMP)
+```
+
+### Build Types
+
+| Type | Script | CMake Flag | Binary Size | Use Case |
+|------|--------|-----------|-------------|----------|
+| Release | `device/release.sh` | `-DCMAKE_BUILD_TYPE=MinSizeRel` | ~523KB | Production flashing |
+| Debug | `device/debug.sh` | `-DCMAKE_BUILD_TYPE=Debug -DKK_DEBUG_LINK=ON` | ~1MB | Development/debugging |
+| Emulator | `emulator/debug.sh` | `-DKK_EMULATOR=ON` (clang, native) | N/A | Host-side testing |
+
+## Changing the Firmware Version
+
+Edit `modules/keepkey-firmware/CMakeLists.txt` line 5:
+
+```cmake
+project(
+  KeepKeyFirmware
+  VERSION 7.11.0        # <-- change this
+  LANGUAGES C CXX ASM)
+```
+
+Verify after build:
+```bash
+strings firmware.keepkey.*.bin | grep VERSION
+# Output: VERSION7.11.0
+```
+
+## Submodule Dependencies
+
+`make firmware-init` initializes these (skips `deps/python-keepkey` to avoid dangling refs):
+
+| Submodule | Purpose |
+|-----------|---------|
+| `deps/device-protocol` | Protobuf message definitions (includes `messages-solana.proto`) |
+| `deps/crypto/hw-crypto` | Cryptographic primitives (Ed25519, secp256k1, etc.) |
+| `deps/googletest` | Unit testing framework |
+| `deps/qrenc/QR-Code-generator` | QR code generation for on-device display |
+| `deps/sca-hardening/SecAESSTM32` | Side-channel attack hardening |
+| `code-signing-keys` | Code signing key material |
+
+### Git Worktree Recovery
+
+Nested git worktrees sometimes leave submodule directories empty. `firmware-init` detects and recovers:
+
+```bash
+# For each submodule: if .git exists but dir is empty, force checkout
+if [ -f "$sm/.git" ] && [ $(ls -A "$sm" | grep -cv '^\.git$') -eq 0 ]; then
+    cd "$sm" && git checkout HEAD -- .
+fi
+```
+
+## Solana Firmware Files
+
+The Solana implementation adds these files to the firmware:
+
+| File | LOC | Purpose |
+|------|-----|---------|
+| `lib/firmware/solana.c` | 117 | Ed25519 key derivation, Base58 address encoding |
+| `lib/firmware/solana_tx.c` | 377 | Transaction parser (compact-u16, accounts, instructions) |
+| `lib/firmware/solana_msg.c` | 107 | Off-chain message signing (`\x19Solana Signed Message:\n` prefix) |
+| `lib/firmware/fsm_msg_solana.h` | 188 | FSM message handlers for GetAddress, SignTx, SignMessage |
+| `include/keepkey/firmware/solana.h` | — | Public function declarations |
+| `include/keepkey/firmware/solana_tx.h` | 101 | TX parsing structures |
+| `lib/transport/generated/messages-solana.pb.c` | — | Pre-generated nanopb C bindings |
+| `lib/transport/generated/messages-solana.pb.h` | — | Pre-generated nanopb C headers |
+
+### Protocol Message IDs
+
+| ID | Message | Direction |
+|----|---------|-----------|
+| 750 | `SolanaGetAddress` | wire_in |
+| 751 | `SolanaAddress` | wire_out |
+| 752 | `SolanaSignTx` | wire_in |
+| 753 | `SolanaSignedTx` | wire_out |
+| 754 | `SolanaSignMessage` | wire_in |
+| 755 | `SolanaMessageSignature` | wire_out |
+
+## Regenerating Python Protobuf Files
+
+When `device-protocol` changes (new messages), regenerate python-keepkey pb2 files:
+
+```bash
+cd projects/python-keepkey
+
+# Ensure device-protocol submodule has the new proto files
+cd device-protocol && git checkout <branch-with-changes> && cd ..
+
+# Generate using the firmware Docker image (protoc 3.5.1)
+./docker_build_pb.sh
+```
+
+This runs `build_pb.sh` inside `kktech/firmware:v8` which:
+1. Iterates all `.proto` files in `device-protocol/`
+2. Generates `keepkeylib/messages_*_pb2.py` with `protoc --python_out`
+3. Fixes imports to use relative paths (`from . import`)
+
+**The proto list in `build_pb.sh` must include `messages-solana`:**
+```bash
+for i in messages messages-ethereum ... messages-solana types ; do
+```
+
+## Full Stack Build Order
+
+For a clean Solana firmware build from scratch:
+
+```
+1. device-protocol   (messages-solana.proto)
+   |
+2. keepkey-firmware   (C implementation + pre-generated nanopb)
+   |   |
+   |   +-- deps/device-protocol -> feature-solana branch
+   |   +-- deps/python-keepkey  -> feature/solana branch (for emulator tests)
+   |
+3. python-keepkey     (pb2 files + client methods, for testing)
+   |
+4. hdwallet           (master already has Solana jspb shims)
+   |
+5. keepkey-vault      (RPC handlers, UI — future work)
+```
+
+## Branch Management (BitHighlander Forks)
+
+All Solana work is staged on BitHighlander forks. Upstream push is blocked.
+
+### Firmware PRs (BitHighlander/keepkey-firmware -> develop)
+
+| PR | Branch | Description |
+|----|--------|-------------|
+| #8 | `fix/hw-crypto-migration` | Migrate from trezor-firmware to hw-crypto submodule |
+| #9 | `fix/pre-generated-protobuf` | Eliminate Python/nanopb build-time dependency |
+| #10 | `feature/solana` | Solana GetAddress, SignTx, SignMessage (depends on #8, #9) |
+
+### Device Protocol (BitHighlander/device-protocol)
+
+| Branch | Description |
+|--------|-------------|
+| `feature-solana` | 1 commit: `messages-solana.proto` (750-755) on top of master |
+
+### Python-KeepKey (BitHighlander/python-keepkey)
+
+| PR | Branch | Base | Description |
+|----|--------|------|-------------|
+| #3 | `feature/solana` | `fix/combined-cleanup` | pb2 + client methods |
+
+### HDWallet (keepkey/hdwallet)
+
+Solana already merged to `master` — no separate branch needed.
+
+## Unsigned Firmware Storage
+
+Unsigned firmware binaries for testing are stored at:
+```
+projects/keepkey-vault-v11/firmware/unsigned/
+```
+
+Naming convention: `firmware.keepkey.solana-<version>.bin`
+
+Example: `firmware.keepkey.solana-7.11.0.bin`
+
+## Troubleshooting
+
+### Build fails: "No such file: cortex-m-generic.ld"
+You're using the wrong Docker image. Must be `kktech/firmware:v15`, not v8.
+
+### Build fails: "ModuleNotFoundError: No module named 'requests'"
+The Docker image is missing Python deps. Use `kktech/firmware:v15` which has them pre-installed, or add `pip3 install requests` before cmake.
+
+### Build fails: zxappliquid.c "maybe-uninitialized"
+Initialize the `ttoken` variable: `const TokenType *WETH, *ttoken = NULL;`
+This is a pre-existing issue in the upstream code with `-Werror` enabled.
+
+### Submodules empty after git worktree checkout
+Run `make firmware-init` — it detects and recovers empty worktree directories.
+
+### python-keepkey pb2 files incompatible
+The pb2 files must be generated with protoc 3.x (the Docker image has 3.5.1). Protoc 33+ generates a completely different format that is incompatible with the existing `protobuf==3.17.3` Python package.
+
+### Flash fails: device not responding
+1. Ensure device is in bootloader mode (hold button while plugging in)
+2. The bootloader does NOT respond to HID Initialize messages — use WebUSB
+3. Power cycle and retry
diff --git a/docs/security/fault-injection-assessment.md b/docs/security/fault-injection-assessment.md
new file mode 100644
index 00000000..dd855a75
--- /dev/null
+++ b/docs/security/fault-injection-assessment.md
@@ -0,0 +1,313 @@
+# Fault-Injection Vulnerability Assessment
+
+**Date:** 2026-03-06
+**Sources:** Findus fault-injection-library (Dr. Matthias Kesenheimer), KeepKey firmware source, prior disclosures (VULN-21020, CVE-2022-30330, Kraken write-up)
+**Related docs:** `fault.md` (hardening analysis), `findus-library-analysis.md` (toolchain details)
+
+---
+
+## MCU Identification
+
+**Chip:** STM32F205 (ARM Cortex-M3, 120 MHz)
+**Package:** LQFP-144
+**Flash:** 1 MB (sectors 0-11)
+**SRAM:** 128 KB
+**RDP:** Level 2 (`OPTION_RDP = 0xCCFF`) — **irreversible, permanently disables debug**
+
+The Findus library targets STM32F4xx (Cortex-M4) and STM32L4xx (Cortex-M4). KeepKey uses STM32F2xx (Cortex-M3). Same vendor, similar architecture, but different BootROM and option-byte behavior.
+
+---
+
+## Verdict Summary
+
+| # | Finding | Verdict | Action |
+|---|---------|---------|--------|
+| F1 | BootROM RDP downgrade via voltage glitch | **NOT APPLICABLE** | RDP Level 2 is irreversible |
+| F2 | Bootloader UART Read Memory bypass | **NOT APPLICABLE** | RDP L2 disables bootloader memory commands |
+| F3 | `signatures_ok()` early-return chain | **WORTH PATCHING** | Infective aggregation eliminates single-fault bypass |
+| F4 | No BOR/PVD voltage monitoring | **WORTH RESEARCHING** | STM32F2 supports BOR option bytes + PVD interrupt |
+| F5 | Firmware-side re-invocation of `signatures_ok()` | **WORTH PATCHING** | Replace with short metadata check (VULN-21020 fix) |
+| F6 | `fi_defense_delay` brute-force window | **ALREADY PATCHED** | Randomized 0-20K iteration loop with dual-variable invariant |
+| F7 | MPU privilege separation | **ALREADY PATCHED** | 8-region MPU config, flash read-only, flash-controller privileged-only |
+| F8 | `svhandler_flash_*` range check bypass | **ALREADY PATCHED** | Overlap-aware validation merged (post CVE-2022-30330) |
+| F9 | Storage encryption (mnemonic in flash) | **ALREADY PATCHED** | AES-256 encrypted secrets, PIN-wrapped key, SCA-hardened AES |
+| F10 | No boot-loop quarantine / reset telemetry | **WORTH RESEARCHING** | Persistent fault counter would detect glitch campaigns |
+| F11 | No PCROP enforcement | **WORTH RESEARCHING** | Defense-in-depth layer available on STM32F2 |
+| F12 | Stack canary at privilege boundary | **ALREADY PATCHED** | `__stack_chk_guard = fi_defense_delay(random32())` |
+
+---
+
+## Detailed Analysis
+
+### F1: BootROM RDP Downgrade — NOT APPLICABLE
+
+**Findus attack:** `projects/stm32l422/stm32l4-rdp-downgrade.py` — loads RDP-downgrade ELF to RAM via SWD, glitches during option-byte write to downgrade RDP L1 → L0.
+
+**Why not applicable to KeepKey:**
+
+KeepKey firmware sets **RDP Level 2** (`0xCC` in option bytes):
+
+```c
+// memory.h:87
+#define OPTION_RDP 0xCCFF  // RDP Level 2 (Irreversible)
+```
+
+RDP Level 2 on STM32F2:
+- **Permanently** disables JTAG/SWD debug access — cannot be re-enabled
+- **Cannot be downgraded** — any attempt triggers mass erase + permanent lock
+- BootROM enforces this in silicon; no software or voltage glitch can reverse it
+- The Findus STM32L422 attack specifically targets L1→L0 downgrade; L2 is out of scope
+
+**Confidence:** High. RDP L2 is silicon-enforced. The entire `stm32l4-rdp-downgrade.py` attack chain requires SWD access to load the downgrade ELF, which RDP L2 blocks at the hardware level.
+
+**Caveat:** This assumes production devices have RDP L2 programmed. Debug builds (`DEBUG_ON`) skip `memory_protect()`:
+```c
+#if !defined(DEBUG_ON) && (MEMORY_PROTECT == 0)
+#error "To compile release version, please set MEMORY_PROTECT flag"
+#endif
+```
+Build system correctly enforces this as a compile-time error.
+
+---
+
+### F2: Bootloader UART Read Memory Bypass — NOT APPLICABLE
+
+**Findus attack:** `projects/stm32f40x/stm32f4-glitching.py` — enters UART bootloader, sends `0x11 0xEE` (Read Memory), glitches during RDP check so bootloader returns ACK instead of NACK.
+
+**Why not applicable:**
+
+Under RDP Level 2, the STM32 system bootloader **disables memory-read commands entirely**. The BootROM doesn't even reach the RDP check — the command is rejected at the protocol level.
+
+From ST's reference manual (RM0033, STM32F2): "When RDP Level 2 is active, all protections provided by Level 1 are active and the MCU is fully protected. The RDP Level 2 is an irreversible protection."
+
+Additionally, JTAG/SWD are permanently disabled, preventing the `register-brute-force.py` attack which requires SWD stepping.
+
+**Confidence:** High.
+
+---
+
+### F3: `signatures_ok()` Early-Return Chain — WORTH PATCHING
+
+**Current code** (`lib/board/signatures.c:33-92`):
+
+```c
+int signatures_ok(void) {
+  // 6 early returns for SIG_FAIL (index validation)
+  // 3 early returns for KEY_EXPIRED (key validity)
+  sha256_Raw(app, codelen, digest);  // ~0.5-1s on STM32F2
+  if (ecdsa_verify_digest(...sig1...) != 0) return SIG_FAIL;  // early return
+  if (ecdsa_verify_digest(...sig2...) != 0) return SIG_FAIL;  // early return
+  if (ecdsa_verify_digest(...sig3...) != 0) return SIG_FAIL;  // early return
+  return SIG_OK;
+}
+```
+
+**Vulnerability:** Each `ecdsa_verify_digest` call is followed by an early return. A single voltage glitch that corrupts the return value or skips the `if` branch causes the function to fall through to the next check (or to `return SIG_OK`) — this is the classic "instruction skip" fault model.
+
+**What `fault.md` recommends (and is correct):**
+
+Replace early-return chain with infective aggregation:
+```c
+int r1 = ecdsa_verify_digest(...sig1...);
+int r2 = ecdsa_verify_digest(...sig2...);
+int r3 = ecdsa_verify_digest(...sig3...);
+uint32_t acc = (r1 | r2 | r3);
+return (acc == 0) ? SIG_OK : SIG_FAIL;
+```
+
+This forces the attacker to corrupt all three verify results, not just one branch.
+
+**Additional recommendation:** Double-compute SHA-256 with constant-time comparison before use (catches transient fault during hash computation).
+
+**Priority:** HIGH. Even with RDP L2 preventing direct flash readout, a faulted signature check could allow booting unsigned/malicious firmware that exfiltrates secrets at runtime.
+
+---
+
+### F4: No BOR/PVD Voltage Monitoring — WORTH RESEARCHING
+
+**Current state:** Zero references to BOR, PVD, PWR_CR, or VDDA in the entire firmware codebase. The MCU's built-in voltage monitoring is completely unused.
+
+**What STM32F2 offers:**
+- **BOR (Brown-Out Reset):** Configurable via option bytes. Holds MCU in reset when VDD drops below threshold (1.8V / 2.1V / 2.4V / 2.7V). This directly defeats crowbar glitches that drop voltage.
+- **PVD (Programmable Voltage Detector):** Interrupt-capable comparator. Can fire EXTI interrupt when VDD crosses configurable threshold, allowing firmware to abort crypto operations.
+
+**Why worth researching (not "worth patching" yet):**
+1. BOR is an option-byte setting — changing it on deployed devices requires careful update flow
+2. Must verify BOR threshold doesn't interfere with normal operation (cold starts, battery sag)
+3. PVD interrupt latency on STM32F2 needs measurement against glitch pulse widths (5-10ns glitch vs ~100ns interrupt latency)
+4. Even if PVD can't catch every glitch, BOR at the right threshold eliminates the entire "gray zone" attack surface
+
+**Recommended research:**
+- Measure KeepKey's actual VDD rail behavior during normal operation
+- Test BOR Level 3 (2.7V threshold) for false-positive rate
+- Prototype PVD interrupt handler that sets fault flag + aborts crypto
+- Evaluate whether Pico Glitcher's crowbar pulse would trigger BOR reset
+
+---
+
+### F5: Firmware Re-Invocation of `signatures_ok()` — WORTH PATCHING
+
+**Current code** (`tools/firmware/keepkey_main.c:177-179`):
+
+```c
+int sigRet = SIG_FAIL;
+sigRet = signatures_ok();       // ~1 second long-running crypto
+flash_collectHWEntropy(SIG_OK == sigRet);
+```
+
+This is the VULN-21020 class: firmware re-runs the full signature verification after the bootloader already verified it. The long computation window (~1 second) gives the attacker a wide timing window for glitching.
+
+**`fault.md` recommended fix:** Replace with short metadata presence check:
+```c
+// Instead of re-running signatures_ok():
+return *(volatile uint8_t*)FLASH_META_SIGINDEX1 != 0;
+```
+
+Or better: use a bootloader-to-firmware attestation token (redundancy-encoded value in backup SRAM).
+
+**Priority:** HIGH. This is a documented vulnerability class with a known fix direction.
+
+---
+
+### F6: `fi_defense_delay` — ALREADY PATCHED (adequate)
+
+**Implementation** (`lib/board/timer.c:239-257`):
+
+```c
+uint32_t fi_defense_delay(volatile uint32_t value) {
+  int wait = random32() & 0x4fff;  // 0-20479 random iterations
+  volatile int i = 0;
+  volatile int j = wait;
+  while (i < wait) {
+    if (i + j != wait) shutdown();  // invariant check every iteration
+    ++i; --j;
+  }
+  if (i != wait || j != 0) shutdown();  // final check
+  return value;
+}
+```
+
+**Assessment:** This is a well-designed fault detection loop:
+- Random timing defeats deterministic delay attacks
+- Dual-variable invariant (`i + j == wait`) catches single-variable corruption
+- Final boundary check catches late-stage loop exit faults
+- `volatile` prevents compiler optimization
+- `shutdown()` is terminal (no recovery path to skip)
+
+**Used at critical decision points:**
+- `fi_defense_delay(trust)` — wraps signature decision before boot
+- `fi_defense_delay(random32())` — wraps stack canary init
+- `fi_defense_delay(storage_protect_status())` — wraps storage protection check
+
+**Remaining risk:** Multi-instruction-skip fault model could potentially skip both the invariant check AND the loop increment. However, the random iteration count means the attacker doesn't know when to fire. Adequate for the threat model.
+
+---
+
+### F7-F9: MPU, Flash Gate, Storage Encryption — ALREADY PATCHED
+
+These are well-implemented:
+
+- **MPU:** 8 regions, flash read-only from unprivileged, flash controller privileged-only, SRAM XN
+- **Flash gate:** SVC handlers with overlap-aware range validation (post CVE-2022-30330 fix)
+- **Storage:** AES-256 encrypted secrets with SCA-hardened AES implementation (`deps/sca-hardening/SecAESSTM32`), PIN-wrapped key
+
+---
+
+### F10: No Boot-Loop Quarantine — WORTH RESEARCHING
+
+**Current state:** No persistent counter tracks abnormal resets during boot. An attacker running a glitch campaign (15,000+ resets over 4-6 hours) goes completely undetected by firmware.
+
+**Recommendation from `fault.md`:**
+```c
+// On each boot, read reset flags:
+if (RCC_CSR & BORRSTF) boot_fault_cnt++;
+if (boot_fault_cnt > MAX_ALLOWED) enter_safe_boot();
+```
+
+Store counter in backup registers or backup SRAM with redundant encoding (value + complement + CRC).
+
+**Why "research" not "patch":**
+- Need to determine appropriate threshold (legitimate rapid resets during firmware update vs attack)
+- Counter storage in backup SRAM survives soft reset but not power cycle — attacker can clear it
+- Best paired with BOR (F4) so that voltage drops actually trigger BOR reset flag
+- May cause false positives during development/testing
+
+---
+
+### F11: No PCROP — WORTH RESEARCHING
+
+**Current state:** PCROP (Proprietary Code ReadOut Protection) bits not configured. PCROP provides per-sector code-execute-only protection — even if RDP is somehow bypassed, PCROP-protected sectors return zeros when read.
+
+**Why worth researching:**
+- STM32F2 PCROP support needs verification (some F2 variants don't support it)
+- Could protect bootloader code (sectors 5-6) from reverse engineering
+- Doesn't protect storage sectors (need read/write), so limited value for seed protection
+- Requires careful flash layout planning
+
+---
+
+### F12: Stack Canary — ALREADY PATCHED
+
+```c
+// bootloader/main.c:328
+__stack_chk_guard = fi_defense_delay(random32());
+```
+
+Randomized at boot, wrapped in fault-detection delay. Adequate.
+
+---
+
+## Priority Matrix
+
+### Tier 1: WORTH PATCHING (firmware changes, no hardware)
+
+| ID | Fix | Effort | Impact |
+|----|-----|--------|--------|
+| F3 | Infective aggregation in `signatures_ok()` — remove early returns | 2-4 hours | Eliminates single-fault signature bypass |
+| F5 | Remove firmware-side `signatures_ok()` re-invocation (VULN-21020 fix) | 2-4 hours | Eliminates 1-second timing window for glitch |
+
+Both are code-only changes in `lib/board/signatures.c` and `tools/firmware/keepkey_main.c`. No hardware modification needed. Combined effort ~1 day including testing.
+
+### Tier 2: WORTH RESEARCHING (may need hardware or option-byte changes)
+
+| ID | Research | Effort | Impact |
+|----|----------|--------|--------|
+| F4 | BOR option-byte threshold + PVD interrupt handler | 1-2 weeks | Hardware-level glitch rejection |
+| F10 | Boot-loop quarantine with persistent fault counter | 3-5 days | Detects glitch campaigns |
+| F11 | PCROP availability/applicability on STM32F205 | 1-2 days | Defense-in-depth for bootloader code |
+
+### Tier 3: ALREADY PATCHED / NOT APPLICABLE
+
+| ID | Status | Why |
+|----|--------|-----|
+| F1 | NOT APPLICABLE | RDP Level 2 is irreversible — SWD permanently disabled |
+| F2 | NOT APPLICABLE | RDP L2 disables bootloader memory commands |
+| F6 | ALREADY PATCHED | `fi_defense_delay` with random timing + dual invariant |
+| F7 | ALREADY PATCHED | 8-region MPU, flash RO, flash-controller privileged |
+| F8 | ALREADY PATCHED | Overlap-aware flash gate (post CVE-2022-30330) |
+| F9 | ALREADY PATCHED | AES-256 encrypted secrets, SCA-hardened AES |
+| F12 | ALREADY PATCHED | Randomized stack canary wrapped in fault detection |
+
+---
+
+## Relationship to Findus Attack Scripts
+
+| Findus Script | Target | KeepKey Applicable? | Why |
+|---------------|--------|--------------------|----|
+| `stm32l4-rdp-downgrade.py` | RDP L1→L0 via SWD + glitch | **No** | KeepKey uses RDP L2 (irreversible) |
+| `stm32f4-glitching.py` | Bootloader Read Memory via UART | **No** | RDP L2 disables memory commands |
+| `register-brute-force.py` | SWD register stepping | **No** | SWD permanently disabled by RDP L2 |
+| `stm32f4-glitching-shorter-timeouts.py` | Same as above | **No** | Same reason |
+| All `stm32f42x/` scripts | V_CAP line glitching | **Partially** | Glitch hardware applicable, but attack target (RDP L1 bootloader) is not |
+
+**Key insight:** The Findus library's STM32 attacks all assume RDP Level 0 or 1. KeepKey's RDP Level 2 blocks the entire attack chain at the silicon level. The remaining attack surface is **bootloader/firmware logic faults** (F3, F5) — which can allow booting modified firmware, not direct flash readout.
+
+---
+
+## Conclusion
+
+KeepKey's hardware security posture is **strong** against the specific attacks documented in the Findus fault-injection library. RDP Level 2 is the primary defense and it holds — the entire RDP-downgrade and bootloader-memory-read attack classes are not applicable.
+
+The remaining firmware-level vulnerabilities (F3, F5) are **logic faults in the signature verification chain** that could allow booting unsigned/modified firmware. These are worth patching as they represent the most practical remaining attack vector for a physical attacker: glitch the boot verification, install malicious firmware, then exfiltrate secrets through the device's own interfaces.
+
+The research items (F4, F10, F11) would add defense-in-depth layers but are lower priority given that RDP L2 already eliminates the direct flash-readout threat.
diff --git a/docs/security/fault.md b/docs/security/fault.md
new file mode 100644
index 00000000..86bfbf6d
--- /dev/null
+++ b/docs/security/fault.md
@@ -0,0 +1,142 @@
+KeepKey firmware hardening against voltage/glitch fault injection
+Executive summary
+KeepKey’s secure-boot and runtime isolation design (bootloader signature validation + MPU-based privilege separation with a privileged “supervisor” for sensitive operations) has historically contained fault-sensitive decision points where a physical fault can push execution into a “less protected” state instead of a “more protected” one. The clearest example is the previously disclosed TOCTOU-style weakness (VULN-21020): the firmware reused the long-running signatures_ok() routine during early boot to decide whether to drop privileges and enable protections; a fault that turns a valid signature check into SIG_FAIL/KEY_EXPIRED could cause protections to be skipped while still booting “normally.”
+
+Separately, KeepKey’s supervisor boundary has had issues (CVE-2022-30330) where range checks in svhandler_flash_* could be bypassed, enabling writes into protected flash regions in some conditions. A later upstream patch strengthened these checks by adding overlap-aware validation to ensure the entire write range stays within allowed flash sectors.
+
+A key limitation: some STM32-family attacks target immutable BootROM behaviors or early option-byte loading (e.g., readout protection downgrades). Vendor firmware alone cannot “patch” BootROM vulnerabilities, so mitigations must focus on (a) ensuring faults cannot downgrade software security state (“fail-closed”), (b) reducing single-point-of-failure checks, and (c) adding software-level fault detection/infection and reset-safe telemetry (fault counters) to detect repeated abnormal resets.
+
+This report provides code-path mapping, an exploit-primitive-to-code map, and a concrete hardening patch set (C/pseudocode) designed to be handed off to an engineering agent for implementation.
+
+Scope and threat model
+This analysis is code-only: it focuses on how voltage/glitch fault models manifest as instruction skips, branch inversions, register/stack corruption, faulty return codes, or early-exit behavior inside KeepKey bootloader/firmware routines—then maps those fault models to specific checks and software mitigations.
+
+Assumptions:
+
+The device is STM32-based (KeepKey has been documented as using an STM32F205 family MCU in prior disclosures).
+Fault injection can disturb computation during long-running cryptographic checks and can also cause instruction skip / multi-skip behavior (which is especially relevant for Thumb/Thumb-2 encodings and pipeline effects).
+BootROM-targeting attacks exist in the broader STM32 ecosystem (e.g., RDP downgrade glitching described in hardware-wallet research), but those are not directly fixable by application firmware; defenses must instead harden what happens after boot and signature verification.
+Tooling priority (for defensive testing and reproducibility guidance): Markus Kesenheimer’s fault-injection-library (“Findus”) is a common automation framework for fault-injection experimentation; importantly for defenders, it models campaigns in terms of parameters like delay/length and trigger sources (without being specific to any one target).
+
+Boot and verification sequence
+High-level chain of trust and “protection enablement”
+The VULN-21020 disclosure describes a two-path design goal: for signed firmware, the firmware enables certain protections; for custom/unsigned firmware, the bootloader enables protections. This split creates fault-sensitive seams if the signed/unsigned decision is evaluated more than once or evaluated with a long-running check in multiple places.
+
+The disclosed boot process contains these important stages:
+
+Bootloader invokes signatures_ok() to determine whether firmware signatures are valid and selects user flow (SIG_OK, SIG_FAIL, KEY_EXPIRED) accordingly.
+Firmware startup logic (earlier versions) re-invoked signatures_ok() inside canDropPrivs() to decide whether to drop privileges / enable protections, creating a TOCTOU-like dependence on a second long-running computation.
+Runtime isolation: svhandler_flash_* privileged handlers gate flash operations. A hardened range-check implementation was later merged to ensure disallowed sectors can’t be partially overlapped by crafted ranges.
+Boot + verification flowchart with fault target points
+mermaid
+Copy
+flowchart TD
+A[Reset / BootROM] --> B[Bootloader start]
+B --> C[signatures_ok(): hash firmware + verify 3 ECDSA sigs]
+C -->|SIG_OK| D[Boot approved → chainload firmware]
+C -->|SIG_FAIL / KEY_EXPIRED| E[Warn / update-required / unofficial prompt]
+D --> F[Firmware early init]
+F --> G[Protection decision: MPU/privilege configuration]
+G --> H[Normal operation (unprivileged app + privileged supervisor)]
+H --> I[Flash operations via svhandler_flash_* gate]
+
+%% fault targets
+C -. fault: corrupt long crypto computation / early return .-> C
+G -. fault: invert signed/unsigned decision → skip protections .-> G
+I -. fault: bypass range checks → write forbidden flash .-> I
+(“Reset / BootROM” is included for completeness; its vulnerability class is not patched by firmware, but downstream decisions can be hardened.)
+
+Vulnerable code paths and fault models
+Reuse of long-running signature verification in a security decision
+The disclosed signatures_ok() routine performs: read firmware flash, compute SHA-256, verify three ECDSA signatures, return SIG_OK only if all checks pass. The disclosure notes the routine is long-running (on the order of ~1 second in the cited context), which increases exposure to broad fault timing windows.
+
+The key weakness (VULN-21020) was not “accepting a bad signature,” but instead the inverse: under fault injection, making a good signature check return a failure code at the wrong time can push the firmware into skipping protections—because the firmware was using SIG_OK == signatures_ok() as a policy predicate.
+
+Vendor fix direction (as described in the disclosure): replace the lengthy check inside firmware (canDropPrivs) with a much simpler check (presence of signature metadata already validated by bootloader), reducing attack surface and boot time.
+
+Supervisor flash gating edge cases
+CVE-2022-30330 and related analysis describe failures in address range validation in privileged flash handlers (svhandler_flash_*), enabling overwriting protected flash ranges in certain layouts.
+
+A later upstream patch (commit message: “more robust address range checks in svhandler_flash_*”) introduced overlap-aware validation helpers (e.g., do_memory_ranges_overlap, allow_svhandler_flash_range) and enforced that both start and end addresses land in allowed sectors while rejecting any overlap with disallowed sectors.
+
+Additional fault-sensitive runtime checks worth hardening
+Hardware-wallet research and KeepKey-specific disclosures emphasize that secrets or key material can be present in RAM during early boot or prior to user authentication, increasing the value of any fault that enables RAM readout or bypasses checks. For example, Kraken’s KeepKey write-up describes a boot path where configuration (including encrypted seed material) is loaded into RAM before PIN entry, and then is later attackable if the hardware security configuration is downgraded.
+
+Separately, common fault models against firmware include “instruction skip” and “multiple instruction skip,” meaning simplistic “duplicate one branch” countermeasures can be insufficient unless designed for multi-skip models (e.g., inserting additional sensors/counters or using idempotent duplication patterns).
+
+Exploit primitives mapped to code locations
+Table mapping boot/verification code paths, functions, and vulnerable checks
+Stage	Code path (as referenced in public sources)	Function(s) / check(s)	Likely fault outcome	Why it is fault-sensitive
+Bootloader signature gate	tools/bootloader/main.c → boot()	int signed_firmware = signatures_ok(); then if (signed_firmware == KEY_EXPIRED) / if (signed_firmware != SIG_OK)	Fault flips return code or branch outcome, changing control flow (e.g., warning path vs proceed)	Decision is immediate and high-impact; branch inversion or corrupted return code changes boot policy.
+Firmware protection decision (historical)	tools/firmware/keepkey_main.c → canDropPrivs()	return SIG_OK == signatures_ok(); for certain bootloader kinds	Fault-induced SIG_FAIL/KEY_EXPIRED for valid firmware causes protections to be skipped (“fail-open”)	Long-running crypto check reused as a policy predicate; “false negative” signature results become security-relevant.
+Signature verification core	lib/board/signatures.c → signatures_ok()	sha256_Raw(...) then 3× ecdsa_verify_digest(...) != 0 with early returns SIG_FAIL/KEY_EXPIRED, else SIG_OK	Early return, corrupted digest, corrupted signature index, corrupted verify result	Early-return structure amplifies “single fault” impact: one disturbed verify can exit early with failure code.
+Runtime privileged flash gate (pre-fix)	lib/board/supervise.c → svhandler_flash_*	Range/sector validation on (beginAddr, length)	Fault/corner case enables partial overlap into forbidden flash, persistence or boot compromise	Privileged write primitive is extremely sensitive; range math and sector boundary logic must be overlap-complete.
+Runtime privileged flash gate (post-fix baseline)	lib/board/supervise.c	do_memory_ranges_overlap(), allow_svhandler_flash_range(), plus allowed-sector enumeration	Narrowed bypass surface; still sensitive to single-point checks if not redundant	Patch explicitly prevents forbidden-sector overlap and overflow cases; becomes a pattern for other gates.
+Early secret material exposure	keepkey_main.c → storage_init → storage_fromFlash (as described)	Loading storage structures (incl. encrypted secret fields) into RAM before PIN unlock	If a separate fault enables RAM readout or bypasses later PIN checks, attacker gains material for offline attack	Increases payoff of any fault that enables debug/RAM read; strengthens need for fault-aware reset telemetry and defense-in-depth.
+
+Table of exploit primitives (timing/width/trigger) and mapping to code locations
+This table is intentionally non-procedural (no hardware setup, no parameter values). It captures generic fault “knobs” defenders should model in test harnesses and where those knobs “land” in code.
+
+Primitive category	Typical abstraction (defender modeling terms)	Trigger anchor (software-observable)	Code locations most impacted	Expected corrupted artifact
+Long-computation corruption	“Fault during compute window” (broad timing)	Entry/exit of signatures_ok(); any coarse boot milestone	signatures_ok() including SHA and ECDSA verify calls	Wrong digest, wrong ECDSA result, early exit path selected.
+Single-branch inversion	“Fault near conditional branch”	Immediately after return from signature verify or policy predicate	if (signed_firmware != SIG_OK), if (… == KEY_EXPIRED), SIG_OK == signatures_ok()	Control-flow flip (“accept” vs “reject”; “enable protections” vs “skip protections”).
+Instruction skip / multi-skip	“Skip N instructions” / “multi-skip fault model”	Short windows around critical check blocks	Any short critical sequence that implements validation or sets state (MPU/privilege config gates, range-check blocks)	Skipped validation step(s); duplicated-check countermeasures may fail under multi-skip.
+Parameter corruption (range math)	“Corrupt arithmetic intermediate”	During address/length computation in privileged flash handler	svhandler_flash_* validation and any helper range functions	Overflow/underflow leading to false “allowed” classification.
+Brownout-adjacent destabilization	“Supply dips that stay above POR but affect compute”	PVD/BOR events available via PWR/RCC flags; EXTI PVD line (family-dependent)	Any long crypto or key-derivation loop, plus early boot state setting	Silent compute corruption unless trapped; can be mitigated by BOR option bytes and PVD interrupts.
+Fault-campaign automation parameters	“delay/length/triggered campaign parameters” as used in open tooling	External trigger sources (e.g., UART-trigger abstraction) as a concept	Used to structure defender test campaigns; map into windows around signature verify and policy predicates	Reproducible fault-space exploration to validate mitigations.
+
+Concrete code-level hardening patches
+Design principles for this patch set
+Fail-closed on ambiguity: any anomalous result during signature/protection decision must default to maximum protections enabled, not minimum. This directly addresses the VULN-21020 failure mode (false-negative signature → protections skipped).
+Remove “long check as policy predicate”: keep long cryptographic verification in the bootloader’s trust boundary, then pass a short, redundancy-encoded, non-cryptographic attestation to firmware (or have bootloader always enable baseline protections).
+Use redundancy designed for instruction skip and multi-skip: naive duplication can be defeated by multi-skip faults; use counters/sentinels and idempotent duplication patterns.
+Treat privileged gates like parsers: range checks must be overlap-complete and overflow-safe; reuse the strengthened svhandler_flash_* pattern broadly.
+Exploit MCU power supervision features in software: BOR (option bytes) and PVD (interrupt + flags) are explicitly intended to keep execution in safe regions during supply disturbances; firmware should record and react to frequent BOR/PVD events during sensitive phases.
+Table of recommended code patches (diffs/pseudocode snippets in C)
+Each row includes: code example, insertion point, rationale, residual risk, and test/verification steps.
+
+Mitigation	Where to insert (repo path / function)	Code example (C / pseudocode)	Rationale	Residual risk	Test / verification steps
+Fail-closed protection policy for signedness ambiguity	tools/firmware/keepkey_main.c (or equivalent early init), in/around canDropPrivs() and the MPU/privilege setup gate	Policy change: treat “cannot prove signedness” as “keep protections on.”<br><br>bool signed_ok = read_boot_attest();<br>if (!signed_ok) { enable_mpu_hardened(); enter_unprivileged(); } else { enable_mpu_hardened(); enter_unprivileged(); /* signed may request extra caps via supervisor */ }	Eliminates the specific VULN-21020 class where a false-negative signature result disables protections.
+If attacker can fault the protection-enable code itself, additional redundancy is required (see CFI/sentinels below). Also does not address BootROM-class faults.
+Unit: assert protections enabled for all signedness states (“unknown”, “fail”, “ok”). Integration: simulate faulted return codes from signatures_ok() and confirm protections remain enabled.
+Replace long signatures_ok() in firmware with short metadata presence check (as disclosed fix direction)	tools/firmware/keepkey_main.c → canDropPrivs()	Minimal diff pattern (conceptual):<br>// old: return SIG_OK == signatures_ok();<br>// new: return *(volatile uint8_t*)FLASH_META_SIGINDEX1 != 0;	Reduces fault surface by removing long-running crypto from firmware policy logic and relying on bootloader-validated metadata.
+Attackers may still target bootloader check or corrupt metadata reads; must pair with bootloader-to-firmware attestation redundancy.
+Regression: boot signed/unsigned firmware images and confirm correct policy. Fault testing: corrupt metadata byte in test harness and ensure firmware still fails-closed (protections on).
+Bootloader-to-firmware attestation token with redundancy (instead of recomputing signatures)	Bootloader (tools/bootloader/main.c) sets token; firmware reads token early	Bootloader: write token to a “handoff” region (backup SRAM or dedicated RAM word) as value + complement + CRC:<br>token = 0xA5A5A5A5;<br>tok_x = token ^ 0xFFFFFFFF;<br>`tok_crc = crc32(token		tok_x	
+Double-computation + consistency check for cryptographic digest (bootloader side)	lib/board/signatures.c or wherever digest computed in bootloader	Compute SHA-256 twice, compare in constant time before using:<br>sha256_Raw(app, len, h1);<br>sha256_Raw(app, len, h2);<br>if (ct_memeq(h1,h2,32)!=1) return SIG_FAIL;	Defends against transient fault corrupting a single digest computation, a common FI target. 
+Costs boot time; still susceptible to correlated faults that corrupt both runs similarly; “infective” patterns help (below). 
+Unit: deterministic vectors ensure both hashes equal. Fault sim: flip a byte in one hash and expect fail. Measure boot-time impact.
+Remove early returns in signatures_ok(); aggregate results (“infective” style)	lib/board/signatures.c → signatures_ok()	Replace early-return chain with full evaluation and single decision:<br>int r1 = ecdsa_verify(...sig1...);<br>int r2 = ecdsa_verify(...sig2...);<br>int r3 = ecdsa_verify(...sig3...);<br>`uint32_t acc = (r1	r2	r3);<br>return (acc==0) ? SIG_OK : SIG_FAIL_OR_EXPIRED;`	Early returns increase sensitivity to a single fault; aggregation forces attacker to influence multiple steps or the final accumulator. 
+Instruction-skip-aware check blocks using counters/sentinels	Around critical security predicates (signature decision, privilege drop, flash gate entry)	Pattern using a hardware counter or monotonic software counter checked twice:<br>volatile uint32_t s=0;<br>s+=0x11111111;<br>CRITICAL_CHECK();<br>s+=0x22222222;<br>if (s != 0x33333333) fault_panic();	Multi-instruction skip models defeat naive duplication; adding “sensors” and nontrivial invariants aligns with published instruction-skip countermeasure research. 
+If attacker can fault both increments or skip the final compare, protection can fail; mitigate by scattering multiple sensors and by making fault_panic() non-bypassable (e.g., infinite loop + watchdog reset). 
+Build a fault-simulation test that removes/patches out sequences (simulate skips) and confirm the invariant catches them. Use compiler flags to prevent optimization removing sentinels (e.g., volatile, asm volatile("" ::: "memory")). 
+Constant-time comparisons for security decisions (PIN, hashes, tokens)	Wherever comparisons guard security (e.g., PIN fingerprint compare in storage path; signedness token compare)	Replace memcmp-style early exits with constant-time compare returning 1/0:<br>`uint8_t diff=0; for(i=0;i<n;i++) diff	= a[i]^b[i]; return (diff==0);`	Reduces fault-amplified timing signals and avoids early-exit behavior that can be faulted more easily than straight-line code. 
+Does not stop direct branch inversion faults; must combine with sentinels and fail-closed logic. 
+Watchdog + reset-cause telemetry and “boot-loop quarantine”	Bootloader early init and firmware early init; store counters in backup registers / backup SRAM	On each boot, read reset flags; increment “suspicious reset during boot” counter; if exceeds threshold, enter safe mode requiring user action.<br>`if (RCC_CSR & (BORRSTF	...)) boot_fault_cnt++;<br>if (boot_fault_cnt>MAX) enter_safe_boot();`	If faults repeatedly occur during signature/protection windows, persistent counters provide a software signal to refuse normal operation. BOR exists explicitly to keep MCU in safe reset during undervoltage.
+Counter storage itself could be faulted; store as redundant value+complement+CRC (same pattern as signedness token). Also: not a complete defense; it escalates attacker cost and improves detection.
+PVD-driven early warning → “stop doing crypto now”	Firmware and/or bootloader PWR init (STM32 family dependent): enable PVD interrupt; handle EXTI callback	Configure PVD threshold and on interrupt set a global fault flag and immediately abort sensitive operations:<br>void PVD_IRQHandler(){ fault_flag=1; }<br>if (fault_flag) goto fail_closed;	STM32 reference manuals describe PVD as an interrupt-capable early warning for VDD dropping toward BOR, explicitly for safe shutdown tasks.
+Requires correct MCU-family-specific register programming and careful ISR design; attacker may still fault the ISR or the flag check. Treat PVD as an input to fail-closed policy, not sole defense.
+Hardware-in-loop is ideal, but code-only verification can mock PVD flag and ensure every sensitive loop checks fault_flag frequently (static analysis / grep gates in CI).
+Ensure BOR is enabled at a meaningful threshold (bootloader enforcement)	Bootloader option-byte management (where KeepKey manages persistent MCU config)	Verify BOR level is not “off”; if off, refuse to proceed or require explicit maintainer mode.<br>Conceptually: if (BOR_OFF) enter_update_required();	STM32F205 reference manual: BOR threshold configured via option bytes; BOR keeps device in reset when VDD below VBOR and generates reset on drops. For FI resilience, BOR materially reduces “gray-zone execution.”
+Programming option bytes is irreversible-risky if wrong; must be done with careful UX and safe update flow. Also can’t fix fast transients fully.
+Add build-time configuration assertion that BOR settings are audited. In production, include a boot screen showing BOR level and require signed update to change it.
+Secure bootloader flash-gate hardening (adopt and extend upstream overlap checks)	lib/board/supervise.c and any other privileged memory write/erase APIs	Use the upstream pattern (overlap checks, allowed-sector enumeration, overflow guards) broadly; baseline diff exists in upstream commit.
+This class is directly tied to persistence and boot compromise; overlapping-range logic is a known source of security bugs and the upstream patch is a concrete, reviewable baseline.
+Faults can still skip checks unless protected with sentinels; pair with CFI/sentinel increments around privileged entry points.
+Regression tests: exhaustive range fuzzing against allow_svhandler_flash_range(): generate random (start,end) and assert “no overlap with forbidden sectors.” Add a property test for contiguity assumptions.
+Stack canary / guard region at privilege boundary	Supervisor entry/exit stubs + unprivileged thread init	Place a canary word in the supervisor stack frame and validate on exit; if corrupted, reset to safe boot.<br>uint32_t can=0xDEADBEEF; …; if (can!=0xDEADBEEF) fault_panic();	Faults can corrupt stack/return addresses; canaries add detection and convert silent corruption into reset. This is consistent with general software FI countermeasure goals (detection/infection).
+Not sufficient against deliberate instruction skip of the canary check; pair with multi-skip-aware sentinels and watchdog-based panic loops.
+Unit test: compile-time ensure canary not optimized away (volatile). Add negative tests that corrupt the stack frame in a harness / emulator build and confirm panic path.
+
+Notes on “no-hardware-instructions” compliance
+The above mitigations describe software insertion points and logic only.
+Even when tooling (e.g., Findus) is referenced, it is used purely as a conceptual model for structuring defensive test campaigns (parameter-space exploration), not as a how-to for injecting faults.
+Practical prioritization for an engineering handoff
+If you have to pick an order that maximizes security impact per engineering effort:
+
+Fail-closed policy + remove firmware-side signatures_ok() predicate (directly addresses VULN-21020 class).
+Bootloader-to-firmware attestation token (redundant encoding) to eliminate multiple evaluations of signedness.
+Adopt/extend the svhandler_flash_* overlap-complete checks and wrap privileged entry points with sentinels.
+Instruction-skip-aware sentinels + watchdog panic loops around all “single-branch decides security” blocks.
+BOR/PVD-driven reset telemetry + boot-loop quarantine to detect repeated abnormal boot faults.
+These are complementary: the goal is not to “prevent all faults,” but to ensure faults cannot reliably downgrade security state and that repeated faults produce detectable, user-visible safe states.
\ No newline at end of file
diff --git a/docs/security/findus-library-analysis.md b/docs/security/findus-library-analysis.md
new file mode 100644
index 00000000..44dee1f8
--- /dev/null
+++ b/docs/security/findus-library-analysis.md
@@ -0,0 +1,362 @@
+# Fault-Injection Library — KeepKey Stack Relevance Analysis
+
+## Repository Overview
+
+**Name:** Findus (fault-injection-library)
+**Author:** Dr. Matthias Kesenheimer
+**License:** GPL v3
+**Version:** 1.13.1
+**Repository:** `github.com/MKesenheimer/fault-injection-library`
+**Hardware:** Pico Glitcher (v1/v2/v3), ChipWhisperer Pro, ChipWhisperer Husky
+
+A Python-based toolchain for performing voltage glitching fault-injection attacks on microcontrollers. The library provides parameter-space exploration, automated campaign management with SQLite-backed databases, web-based visualization, and a genetic algorithm for optimizing attack parameters.
+
+---
+
+## Architecture
+
+```
+findus/                     # Core Python library (pip install findus)
+├── findus.py               # Database, Serial, PicoGlitcher, Glitcher base classes
+├── STM32Bootloader.py      # STM32 UART bootloader protocol (8E1, ACK/NACK framing)
+├── DebugInterface.py       # OpenOCD/GDB integration (SWD, JTAG, ST-Link)
+├── GlitchState.py          # Response classification enums (Success/Error/Warning/Expected)
+├── GeneticAlgorithm.py     # Evolutionary parameter optimization
+├── AnalogPlot.py           # ADC voltage trace visualization
+├── ProGlitcher.py          # ChipWhisperer Pro driver
+├── HuskyGlitcher.py        # ChipWhisperer Husky driver
+├── firmware/               # Pico Glitcher MicroPython firmware
+│   ├── PicoGlitcher.py     # State machine control, trigger detection
+│   ├── PulseGenerator.py   # Glitch waveform generation
+│   ├── AD910X.py           # DDS chip for analog pulse shaping
+│   ├── FastADC.py          # ADC sampling during glitch
+│   ├── Statemachines.py    # RP2040 PIO state machines
+│   └── config_v*/          # Hardware version configs (JSON)
+├── analyzer/               # Dash web app for campaign visualization
+└── helper/                 # Upload, power cycle, database utilities
+
+projects/                   # Target-specific attack implementations
+├── stm32l422/              # *** MOST RELEVANT TO KEEPKEY ***
+├── stm32f40x/              # STM32F4 bootloader glitching
+├── stm32f42x/              # STM32F42x bootloader glitching
+├── stm32f412/              # STM32F412 bootloader glitching
+├── stm32l05x/              # STM32L0 RDP downgrade
+├── nrf52832/               # Nordic nRF52 (AirTag, keyboards)
+├── rp2040/                 # Raspberry Pi Pico
+├── rp2350/                 # Raspberry Pi Pico 2
+├── esp32v1.3/              # Espressif ESP32
+├── atmega328p/             # Atmel ATmega328P
+├── lpc1311/                # NXP LPC1311
+└── stm8s/                  # STM8S series
+```
+
+---
+
+## Attack Methodology
+
+### Voltage Glitching Flow
+
+1. Power up target MCU
+2. Establish trigger condition (GPIO rising edge, UART byte pattern, edge count)
+3. Wait configurable **delay** (nanoseconds) after trigger for vulnerable code window
+4. Apply voltage **glitch** (crowbar MOSFET shorts VCC to GND for nanoseconds)
+5. Read device response (UART bootloader, SWD debugger, GPIO state)
+6. Classify result: `Success` / `Expected` / `Error` / `Warning`
+7. Store parameters + result in SQLite database
+8. Repeat with randomized or genetically-optimized parameters
+
+### Glitch Types
+
+| Type | Mechanism | Resolution | Use Case |
+|------|-----------|------------|----------|
+| Crowbar (LP) | IRLML2502 MOSFET shorts VCC→GND | ~5ns | Most targets, sharp edges |
+| Crowbar (HP) | SI4134DY MOSFET (66A capacity) | ~10ns | Large decoupling caps |
+| Multiplexing | Switch between 4 voltage levels in ~1ns | ~1ns | Precision voltage manipulation |
+| Pulse Shaping | AD910X DDS analog waveform | Continuous | Complex glitch profiles |
+| Burst | N repeated pulses with configurable spacing | Per-pulse | RDP downgrade on STM32L4 |
+
+### Parameter Space
+
+| Parameter | Typical Range | Purpose |
+|-----------|---------------|---------|
+| `delay` | 100 – 10,000,000 ns | Time from trigger to glitch |
+| `length` | 10 – 10,000 ns | Glitch duration |
+| `delay_between` | 100 – 100,000 ns | Inter-pulse spacing (burst mode) |
+| `number_of_pulses` | 1 – 18 | Pulse count in burst |
+
+---
+
+## KeepKey-Relevant Targets
+
+### STM32L422 — RDP Downgrade Attack
+
+**Location:** `projects/stm32l422/`
+**MCU:** STM32L422 (ARM Cortex-M4, ultra-low-power)
+**Attack:** Read-Out Protection (RDP) Level 1 → Level 0 downgrade via voltage glitch
+
+**Why this matters:** The STM32L4 family is used in secure embedded applications. The RDP mechanism protects flash contents (firmware, keys, seeds) from extraction via debug interfaces. This attack bypasses that protection.
+
+#### Attack Flow (stm32l4-rdp-downgrade.py)
+
+```
+1. Program target with test firmware + enable RDP Level 1
+2. Load RDP-downgrade ELF to RAM via SWD (rdp-downgrade-stm32l422.elf)
+   - This program triggers RDP downgrade from Level 1 → Level 0
+   - Toggles GPIO PA12 as trigger signal
+3. Configure Pico Glitcher:
+   - Trigger: rising edge on PA12 (TRIGGER pin)
+   - Glitch: burst of 18 pulses
+   - Parameters: delay + length randomized per experiment
+4. ARM the glitcher, then execute the RAM program
+5. Glitch fires during RDP register verification
+6. After power cycle, attempt to read flash at 0x08000000 via SWD
+7. Classify result:
+   - "RDP inactive" → SUCCESS (flash readable)
+   - "RDP active" → Expected (protection held)
+   - "RDP value modified" → SUCCESS (RDP register corrupted)
+8. On success: dump entire flash memory to binary file
+```
+
+#### Key Technical Details
+
+- **Target address:** `0x08000000` (flash base)
+- **Debug interface:** ST-Link via SWD (`hla_swd` transport)
+- **OpenOCD target config:** `target/stm32l4x.cfg`
+- **Burst mode:** 18 glitch pulses per attempt
+- **Voltage during glitch:** Target powered at 2.2V (reduced from 3.3V) for easier glitching
+- **RDP values:** `0xAA` = Level 0 (unprotected), `0xCC` = Level 2 (permanent), anything else = Level 1
+- **PCROP monitoring:** Proprietary Code ReadOut Protection bits tracked separately; if set, bootloader masks responses with zeros
+
+#### Physical Connections (LQFP32 package)
+
+| Signal | Pin | STM32 | Purpose |
+|--------|-----|-------|---------|
+| UART TX | 19 | PA9 | Serial output |
+| UART RX | 20 | PA10 | Serial input |
+| SWDIO | 23 | PA13 | Debug data |
+| SWDCLK | 24 | PA14 | Debug clock |
+| LED ERROR | 2 | PC14 | Error indicator |
+| LED OK | 3 | PC15 | Status indicator |
+| TRIGGER | 22 | PA12 | Glitch trigger output |
+
+#### Companion Script: Register Brute Force (register-brute-force.py)
+
+Steps through addresses 0x8000404 – 0x8000804 in 4-byte increments, loading each address into all CPU registers (r0–r12, PC, SP), single-stepping, and checking for side-effects. Based on [Include Security's Cortex-M0 firmware dumping technique](https://blog.includesecurity.com/2015/11/firmware-dumping-technique-for-an-arm-cortex-m0-soc/).
+
+### STM32F40x — Bootloader Read Memory Bypass
+
+**Location:** `projects/stm32f40x/`
+**Attack:** Glitch bootloader during `Read Memory` (0x11) command to bypass RDP check
+
+#### Attack Flow (stm32f4-glitching.py)
+
+```
+1. Reset target into bootloader mode
+2. Initialize bootloader via UART (send 0x7F, expect ACK 0x79)
+3. Send Read Memory command: 0x11 0xEE
+   - UART trigger configured on byte 0x11
+   - Glitch fires after configurable delay from trigger byte
+4. Bootloader checks RDP:
+   - Normal: Returns NACK (0x1F) — "RDP active"
+   - Glitched: Returns ACK (0x79) — "RDP inactive" → can read memory
+5. On ACK: send address (0x08000000) + length (0xFF) + checksums
+6. Read 255 bytes of flash memory
+7. Repeat with incrementing addresses to dump entire flash
+```
+
+#### UART Bootloader Protocol (STM32Bootloader.py)
+
+```
+Serial config: 115200 baud, 8E1 (8 data bits, even parity, 1 stop bit)
+
+Init:      TX → 0x7F             → RX ← ACK (0x79) or NACK (0x1F)
+Get ID:    TX → 0x02 0xFD        → RX ← ACK + 3-byte chip ID
+Read Mem:  TX → 0x11 0xEE        → RX ← ACK (success) or NACK (RDP active)
+           TX → ADDR[4] + XOR    → RX ← ACK
+           TX → SIZE[1] + ~XOR   → RX ← ACK + data[SIZE]
+
+Checksum:  XOR of all bytes (address), or complement XOR (size)
+```
+
+### STM32F42x — V_CAP Line Glitching
+
+**Location:** `projects/stm32f42x/`
+**Key difference:** Glitch inserted on internal V_CAP line (requires removing V_CAP_1 and V_CAP_2 capacitors from board)
+**Successful parameters (CW Pro):** delay=90,500–91,500 ns, length=230–240 ns
+
+### STM32F412 — Same bootloader attack
+
+**Location:** `projects/stm32f412/`
+**Successful parameters (Pico Glitcher):** delay=103,000–105,000 ns, length=225–235 ns
+**Notable:** Flash gets erased occasionally during glitching; only 96 successful reads needed out of ~15,000 attempts for full bootloader dump (~24kB)
+
+---
+
+## KeepKey Stack Relevance Matrix
+
+### Direct Hardware Overlap
+
+| Component | KeepKey Stack | Findus Target | Match |
+|-----------|--------------|---------------|-------|
+| MCU Family | STM32 (various) | STM32L4, STM32F4 | Direct |
+| Debug Interface | SWD (SWDIO/SWDCLK) | SWD via ST-Link | Direct |
+| Boot Mode | System bootloader (ROM) | UART bootloader protocol | Direct |
+| Protection | RDP (Read-Out Protection) | RDP bypass via glitching | Direct |
+| USB Transport | WebUSB/HID/Interrupt | Not targeted (UART focus) | Indirect |
+| Firmware | Custom (hdwallet integration) | Generic test programs | Indirect |
+
+### Attack Surface Analysis
+
+**Physical access required:** Yes — voltage glitching requires direct electrical connection to target MCU power rails.
+
+**Equipment cost:** ~$200 (Pico Glitcher) or ~$3,000 (ChipWhisperer Pro)
+
+**Time to exploit:** Minutes to hours per campaign (15,000 experiments at ~1 experiment/second = ~4 hours for STM32F412 bootloader dump)
+
+**Destructive risk:** Glitching can erase flash or set PCROP bits — attacker risks destroying the data they're trying to extract.
+
+### What Could Be Extracted
+
+If RDP is bypassed on a KeepKey device:
+
+1. **Firmware binary** — Full flash dump enables reverse engineering
+2. **BIP-39 seed words** — If stored in flash (depends on storage architecture)
+3. **Private keys** — Derived key material in flash/SRAM
+4. **Device configuration** — PIN hash, settings, metadata
+5. **Bootloader code** — System memory at 0x1FFF0000 (useful for finding additional vulnerabilities)
+
+### Applicable Mitigations
+
+| Mitigation | Effectiveness | Notes |
+|------------|--------------|-------|
+| RDP Level 2 (permanent) | High | Irreversible; cannot be downgraded. But disables SWD permanently |
+| Voltage monitoring (brown-out detection) | Medium | MCU can detect supply drops; may reset before glitch takes effect |
+| Decoupling capacitors | Low | Absorb short glitches; defeated by high-power MOSFETs |
+| Tamper detection mesh | High | Physical layer; detects board modification |
+| Secure element (separate chip) | High | Keys stored in dedicated SE, not in MCU flash |
+| PCROP (Proprietary Code ReadOut Protection) | Medium | Masks flash reads even if RDP bypassed; but can be unset |
+| Redundant RDP checks in firmware | Medium | Multiple verification points harder to glitch simultaneously |
+| Clock jitter / randomization | Medium | Makes timing-based attacks less reproducible |
+
+---
+
+## Core Library Capabilities
+
+### Database (findus.py)
+
+- SQLite storage for all campaign experiments
+- Columns: `experiment_id`, `delay`, `length`, custom params, `color` (classification), `response`
+- Resume support: continue campaigns across sessions
+- Cleanup: remove expected results to reduce DB size
+- Web visualization via analyzer dashboard
+
+### PicoGlitcher (findus.py)
+
+- Controls Pico Glitcher hardware via MicroPython REPL over USB serial
+- Trigger modes: rising edge, falling edge, UART byte match, edge counting
+- Glitch modes: single, double, burst (N pulses), multiplexing, pulse shaping
+- Power control: `power_cycle_target()`, `power_cycle_reset()`, `reset_target()`
+- MOSFET selection: `set_lpglitch()` (precision), `set_hpglitch()` (high current)
+- ADC sampling: capture voltage trace during glitch for oscilloscope-like analysis
+
+### DebugInterface (DebugInterface.py)
+
+- OpenOCD process management (start/stop/attach/detach)
+- GDB integration for loading ELF to RAM
+- Flash programming with RDP level control
+- Memory read/write at arbitrary addresses
+- RDP + PCROP register inspection
+- Target unlock (RDP removal + mass erase) and lock (RDP enable)
+
+### GeneticAlgorithm (GeneticAlgorithm.py)
+
+- Evolutionary parameter optimization for finding successful glitch windows
+- Population-based search with breeding, mutation, health-based selection
+- Parameter space binning with weighted exploration
+- Malus factors to prevent redundant parameter exploration
+- `OptimizationController` orchestrates the search lifecycle
+
+### Response Classification (GlitchState.py)
+
+```python
+Success:    rdp_inactive, dump_ok, dump_successful, dump_finished
+Expected:   rdp_active (protection held — normal behavior)
+Error:      nack, no_response, bootloader_not_available, bootloader_error
+Warning:    flash_reset, timeout
+OK:         ack, bootloader_ok, dump_error (partial success)
+```
+
+Color mapping for visualization:
+- **Green (G):** Expected behavior (RDP active)
+- **Red (R):** Success (RDP bypassed)
+- **Yellow (Y):** Timeout
+- **Magenta (M):** Error
+- **Cyan (C):** Warning (flash may have been erased)
+- **Blue (B):** Other failure
+
+---
+
+## Hardware Specifications
+
+### Pico Glitcher v1
+
+- **MCU:** Raspberry Pi Pico (RP2040, 125MHz, dual Cortex-M0+)
+- **Glitch MOSFETs:** IRLML2502 (LP, precise) + SI4134DY (HP, 66A)
+- **Level shifters:** Bidirectional for 1.8V–5V compatibility
+- **Power supply:** 1.8V, 3.3V, 5V taps; software-controllable VTARGET
+- **Trigger:** Single GPIO input (rising/falling edge)
+
+### Pico Glitcher v2
+
+- **Additions:** Multiplexing stage (4 voltage levels), Schmitt trigger inputs (EXT1, EXT2)
+- **Multiplexing:** ~1ns switching between voltage levels for precision glitch shaping
+
+### Pico Glitcher v3
+
+- **MCU:** Raspberry Pi Pico 2 (higher clock = better timing resolution)
+- **Power supply:** 1.2V, 1.8V, 3.3V, 5V
+- **Improved Schmitt triggers:** Better noise rejection on trigger inputs
+
+---
+
+## Analyzer Tool
+
+Web-based campaign visualization:
+
+```bash
+analyzer --directory databases
+# Opens http://127.0.0.1:8080
+```
+
+Features:
+- 2D/3D parameter space heatmaps (delay vs. length vs. result)
+- Color-coded scatter plots by classification
+- Interactive filtering and zoom
+- Campaign statistics and timing
+- Database selector for multiple campaigns
+
+---
+
+## Referenced Research
+
+- [Glitching the STM32F4](https://mkesenheimer.github.io/blog/glitching-the-stm32f4.html) — Detailed writeup by library author
+- [Include Security: Firmware Dumping for ARM Cortex-M0](https://blog.includesecurity.com/2015/11/firmware-dumping-technique-for-an-arm-cortex-m0-soc/) — Register brute force technique
+- [STM32 Bootloader AN2606](https://www.st.com/resource/en/application_note/an2606-stm32-microcontroller-system-memory-boot-mode-stmicroelectronics.pdf) — Official bootloader documentation
+- [STM32F4 Hardware AN4488](https://www.st.com/resource/en/application_note/an4488-getting-started-with-stm32f4xxxx-mcu-hardware-development-stmicroelectronics.pdf) — Power supply design showing V_CAP insertion points
+- [Pico Glitcher v3](https://mkesenheimer.github.io/blog/pico-glitcher-v3.html) — Hardware design details
+- [Findus documentation](https://fault-injection-library.readthedocs.io/) — Full library docs
+- [Pico Glitcher store](https://faultyhardware.de) — Hardware purchase
+
+---
+
+## Dependencies
+
+```
+Python: >=3.8
+Packages: adafruit-ampy, pyserial, plotly, pandas, dash, matplotlib, scipy
+Optional: rd6006 (Riden power supply control)
+System: OpenOCD, arm-none-eabi-gdb, ST-Link drivers
+Platform: Linux/macOS (serial device paths)
+```
+
+Install: `pip install findus`
diff --git a/modules/hdwallet b/modules/hdwallet
index fd141c7f..15b6b23e 160000
--- a/modules/hdwallet
+++ b/modules/hdwallet
@@ -1 +1 @@
-Subproject commit fd141c7f6e346117c07ccad68e3d8b2892b33de9
+Subproject commit 15b6b23e4dd96b780b71a2382dde30bc369968ab
diff --git a/projects/keepkey-vault/electrobun.config.ts b/projects/keepkey-vault/electrobun.config.ts
index fe648d06..a04dce2c 100644
--- a/projects/keepkey-vault/electrobun.config.ts
+++ b/projects/keepkey-vault/electrobun.config.ts
@@ -4,10 +4,11 @@ export default {
 	app: {
 		name: "keepkey-vault",
 		identifier: "com.keepkey.vault",
-		version: "1.1.0",
+		version: "1.1.2",
 		urlSchemes: ["keepkey"],
 	},
 	build: {
+		buildFolder: "_build",
 		bun: {
 			// Mark native addons and protobuf-dependent packages as external
 			// so Bun loads them at runtime instead of bundling them.
@@ -29,15 +30,16 @@ export default {
 		copy: {
 			"dist/index.html": "views/mainview/index.html",
 			"dist/assets": "views/mainview/assets",
-			"build/_ext_modules": "node_modules",
+			"_build/_ext_modules": "node_modules",
 		},
 		mac: {
 			bundleCEF: false,
 			icons: "icon.iconset",
 			// Code signing — requires ELECTROBUN_DEVELOPER_ID, ELECTROBUN_TEAMID env vars
-			codesign: true,
+			// Disabled in CI (no Apple certs on Linux runners)
+			codesign: process.env.CI !== 'true',
 			// Notarization — requires ELECTROBUN_APPLEID, ELECTROBUN_APPLEIDPASS env vars
-			notarize: true,
+			notarize: process.env.CI !== 'true',
 			// Entitlements for native USB modules (node-hid, usb, hdwallet)
 			entitlements: {
 				"com.apple.security.cs.allow-jit": true,
diff --git a/projects/keepkey-vault/package.json b/projects/keepkey-vault/package.json
index ec9ff91c..2b05bc90 100644
--- a/projects/keepkey-vault/package.json
+++ b/projects/keepkey-vault/package.json
@@ -1,6 +1,6 @@
 {
   "name": "keepkey-vault",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "KeepKey Vault - Desktop hardware wallet management powered by Electrobun",
   "scripts": {
     "dev": "vite build && bun scripts/collect-externals.ts && electrobun build && electrobun dev",
@@ -24,7 +24,6 @@
     "@pioneer-platform/pioneer-caip": "^9.27.10",
     "@pioneer-platform/pioneer-client": "^11.0.0",
     "@pioneer-platform/pioneer-coins": "^11.0.0",
-    "@pioneer-platform/pioneer-discovery": "^10.0.4",
     "coinselect": "^3.1.13",
     "electrobun": "1.13.1",
     "ethers": "5",
@@ -37,7 +36,7 @@
     "react-dom": "^18.3.1",
     "react-i18next": "^16.5.4",
     "react-icons": "^5.5.0",
-    "react-router-dom": "^7.0.0",
+    "pdf-lib": "^1.17.1",
     "usb": "^2.17.0",
     "zod": "^4.3.6"
   },
diff --git a/projects/keepkey-vault/scripts/collect-externals.ts b/projects/keepkey-vault/scripts/collect-externals.ts
index c6a1cfeb..aa6c25d8 100644
--- a/projects/keepkey-vault/scripts/collect-externals.ts
+++ b/projects/keepkey-vault/scripts/collect-externals.ts
@@ -23,7 +23,7 @@ const EXTERNALS = [
 
 const projectRoot = join(import.meta.dir, '..')
 const nmSource = join(projectRoot, 'node_modules')
-const nmDest = join(projectRoot, 'build', '_ext_modules')
+const nmDest = join(projectRoot, '_build', '_ext_modules')
 
 // Resolve file: linked packages to their actual source directories.
 // Bun's file: resolution can leave broken stubs in node_modules (empty dir with only node_modules/).
@@ -226,7 +226,7 @@ for (const dep of sorted) {
 
   // Ensure parent dir exists for scoped packages (@keepkey/...)
   mkdirSync(dirname(dst), { recursive: true })
-  cpSync(src, dst, { recursive: true })
+  cpSync(src, dst, { recursive: true, dereference: true })
   copiedCount++
 }
 
@@ -259,7 +259,7 @@ let nestedCount = 0
 for (const { src, dst } of nestedCopies) {
   if (!existsSync(src)) continue
   mkdirSync(dirname(dst), { recursive: true })
-  cpSync(src, dst, { recursive: true })
+  cpSync(src, dst, { recursive: true, dereference: true })
   nestedCount++
 }
 if (nestedCount > 0) {
diff --git a/projects/keepkey-vault/src/bun/db.ts b/projects/keepkey-vault/src/bun/db.ts
index 5d2d739b..9fe60e65 100644
--- a/projects/keepkey-vault/src/bun/db.ts
+++ b/projects/keepkey-vault/src/bun/db.ts
@@ -8,7 +8,7 @@ import { Database } from 'bun:sqlite'
 import { Utils } from 'electrobun/bun'
 import { join } from 'node:path'
 import { mkdirSync } from 'node:fs'
-import type { ChainBalance, CustomToken, CustomChain, PairedAppInfo, ApiLogEntry } from '../shared/types'
+import type { ChainBalance, CustomToken, CustomChain, PairedAppInfo, ApiLogEntry, ReportMeta, ReportData } from '../shared/types'
 
 const SCHEMA_VERSION = '7'
 
@@ -145,6 +145,21 @@ export function initDb() {
     `)
 
 
+    db.exec(`
+      CREATE TABLE IF NOT EXISTS reports (
+        id          TEXT PRIMARY KEY,
+        device_id   TEXT NOT NULL,
+        created_at  INTEGER NOT NULL,
+        chain       TEXT NOT NULL DEFAULT 'all',
+        lod         INTEGER NOT NULL DEFAULT 0,
+        total_usd   REAL NOT NULL DEFAULT 0,
+        status      TEXT NOT NULL DEFAULT 'complete',
+        error       TEXT,
+        data_json   TEXT NOT NULL
+      )
+    `)
+    db.exec(`CREATE INDEX IF NOT EXISTS idx_reports_created ON reports(created_at DESC)`)
+
     // Migrations: add columns to existing tables (safe to re-run)
     for (const col of ['explorer_address_link TEXT', 'explorer_tx_link TEXT']) {
       try { db.exec(`ALTER TABLE custom_chains ADD COLUMN ${col}`) } catch { /* already exists */ }
@@ -566,3 +581,103 @@ export function getCachedPubkeys(deviceId: string): Array<{ chainId: string; pat
   }
 }
 
+// ── Reports ──────────────────────────────────────────────────────────
+
+const MAX_REPORTS = 50
+
+export function saveReport(deviceId: string, id: string, chain: string, lod: number, totalUsd: number, status: string, dataJson: string, error?: string) {
+  try {
+    if (!db) return
+    db.run(
+      `INSERT OR REPLACE INTO reports (id, device_id, created_at, chain, lod, total_usd, status, error, data_json)
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      [id, deviceId, Date.now(), chain, lod, totalUsd, status, error || null, dataJson]
+    )
+    // Prune old reports beyond MAX_REPORTS per device
+    try {
+      db.run(
+        `DELETE FROM reports WHERE device_id = ? AND id NOT IN (
+          SELECT id FROM reports WHERE device_id = ? ORDER BY created_at DESC LIMIT ?
+        )`,
+        [deviceId, deviceId, MAX_REPORTS]
+      )
+    } catch { /* pruning is best-effort */ }
+  } catch (e: any) {
+    console.warn('[db] saveReport failed:', e.message)
+  }
+}
+
+export function getReportsList(deviceId: string, limit = 20): ReportMeta[] {
+  try {
+    if (!db) return []
+    const rows = db.query(
+      'SELECT id, created_at, chain, lod, total_usd, status, error FROM reports WHERE device_id = ? ORDER BY created_at DESC LIMIT ?'
+    ).all(deviceId, limit) as Array<{ id: string; created_at: number; chain: string; lod: number; total_usd: number; status: string; error: string | null }>
+    return rows.map(r => ({
+      id: r.id,
+      createdAt: r.created_at,
+      chain: r.chain,
+      totalUsd: r.total_usd,
+      status: r.status as ReportMeta['status'],
+      error: r.error || undefined,
+    }))
+  } catch (e: any) {
+    console.warn('[db] getReportsList failed:', e.message)
+    return []
+  }
+}
+
+export function getReportById(id: string, deviceId?: string): { meta: ReportMeta; data: ReportData } | null {
+  try {
+    if (!db) return null
+    const query = deviceId
+      ? 'SELECT id, created_at, chain, lod, total_usd, status, error, data_json FROM reports WHERE id = ? AND device_id = ?'
+      : 'SELECT id, created_at, chain, lod, total_usd, status, error, data_json FROM reports WHERE id = ?'
+    const params = deviceId ? [id, deviceId] : [id]
+    const row = db.query(query).get(...params) as { id: string; created_at: number; chain: string; lod: number; total_usd: number; status: string; error: string | null; data_json: string } | null
+    if (!row) return null
+    const meta: ReportMeta = {
+      id: row.id,
+      createdAt: row.created_at,
+      chain: row.chain,
+      totalUsd: row.total_usd,
+      status: row.status as ReportMeta['status'],
+      error: row.error || undefined,
+    }
+    let data: ReportData
+    try {
+      data = JSON.parse(row.data_json)
+    } catch {
+      console.warn(`[db] Report ${id} has corrupted JSON data`)
+      return { meta: { ...meta, status: 'error', error: 'Report data corrupted' }, data: { title: 'Corrupted Report', subtitle: '', generatedDate: '', sections: [] } }
+    }
+    return { meta, data }
+  } catch (e: any) {
+    console.warn('[db] getReportById failed:', e.message)
+    return null
+  }
+}
+
+export function deleteReport(id: string, deviceId?: string) {
+  try {
+    if (!db) return
+    if (deviceId) {
+      db.run('DELETE FROM reports WHERE id = ? AND device_id = ?', [id, deviceId])
+    } else {
+      db.run('DELETE FROM reports WHERE id = ?', [id])
+    }
+  } catch (e: any) {
+    console.warn('[db] deleteReport failed:', e.message)
+  }
+}
+
+export function reportExists(id: string): boolean {
+  try {
+    if (!db) return false
+    const row = db.query('SELECT 1 FROM reports WHERE id = ?').get(id)
+    return !!row
+  } catch {
+    return false
+  }
+}
+
diff --git a/projects/keepkey-vault/src/bun/engine-controller.ts b/projects/keepkey-vault/src/bun/engine-controller.ts
index 06e01b88..a7525539 100644
--- a/projects/keepkey-vault/src/bun/engine-controller.ts
+++ b/projects/keepkey-vault/src/bun/engine-controller.ts
@@ -5,6 +5,7 @@ import { NodeWebUSBKeepKeyAdapter } from '@keepkey/hdwallet-keepkey-nodewebusb'
 import { usb } from 'usb'
 import { saveDeviceSnapshot } from './db'
 import type { DeviceStateInfo, ActiveTransport, UpdatePhase, DeviceState, FirmwareManifest, PinRequestType } from '../shared/types'
+import { resolveOndeviceFirmwareVersion } from '../shared/firmware-versions'
 
 const KEEPKEY_VENDOR_ID = 0x2B24 // 11044
 const MANIFEST_URL = 'https://raw.githubusercontent.com/keepkey/keepkey-desktop/master/firmware/releases.json'
@@ -52,7 +53,7 @@ function extractErrorMessage(err: any): string {
   return String(err)
 }
 
-function withTimeout<T>(promise: Promise<T>, ms: number, label: string): Promise<T> {
+export function withTimeout<T>(promise: Promise<T>, ms: number, label: string): Promise<T> {
   let timer: ReturnType<typeof setTimeout>
   return Promise.race([
     promise,
@@ -79,6 +80,7 @@ export class EngineController extends EventEmitter {
   private syncing = false
   private lastError: string | null = null
   private retryTimer: ReturnType<typeof setTimeout> | null = null
+  private rebootPollTimer: ReturnType<typeof setInterval> | null = null
 
   // PIN flow tracking — device sends PIN_REQUEST mid-operation
   private setupInProgress = false
@@ -177,6 +179,13 @@ export class EngineController extends EventEmitter {
       if (device.deviceDescriptor.idVendor !== KEEPKEY_VENDOR_ID) return
       console.log('[Engine] KeepKey USB detached')
       this.clearRetry()
+      // M1 fix: During firmware reboot, device disconnects/reconnects — don't
+      // clear wallet state or emit disconnected (reboot poll handles reconnection)
+      if (this.updatePhase === 'rebooting') {
+        console.log('[Engine] Detach during reboot phase — ignoring (reboot poll active)')
+        this.clearWallet()
+        return
+      }
       this.clearWallet()
       this.lastError = null
       this.updateState('disconnected')
@@ -190,6 +199,7 @@ export class EngineController extends EventEmitter {
 
   stop() {
     this.clearRetry()
+    this.stopRebootPoll()
     usb.removeAllListeners('attach')
     usb.removeAllListeners('detach')
   }
@@ -225,6 +235,16 @@ export class EngineController extends EventEmitter {
         })
       }, delay)
     }
+
+    // Same for needs_passphrase — device has passphrase protection but PIN is
+    // already cached (or disabled).  We must call promptPin() → getPublicKeys()
+    // so the device sends PASSPHRASE_REQUEST; without it, the UI overlay shows
+    // but sendPassphrase() has no pending device request to respond to.
+    if (state === 'needs_passphrase' && !this.promptPinActive) {
+      this.promptPin().catch(err => {
+        console.warn('[Engine] Auto prompt-passphrase failed:', err?.message)
+      })
+    }
   }
 
   // ── Firmware Manifest ──────────────────────────────────────────────────
@@ -321,15 +341,22 @@ export class EngineController extends EventEmitter {
           )
           const hashVerification = this.verifyHashes(this.cachedFeatures)
           console.log('[Engine] Features:', JSON.stringify({
-            initialized: this.cachedFeatures?.initialized,
+            deviceId: this.cachedFeatures?.deviceId || '(empty)',
+            initialized: this.cachedFeatures?.initialized ?? '(undefined)',
             firmwareVersion: this.extractVersion(this.cachedFeatures),
             bootloaderMode: this.cachedFeatures?.bootloaderMode,
-            label: this.cachedFeatures?.label,
+            label: this.cachedFeatures?.label || '(none)',
             firmwareHash: hashVerification.firmwareHash,
             firmwareVerified: hashVerification.firmwareVerified,
             bootloaderHash: hashVerification.bootloaderHash,
             bootloaderVerified: hashVerification.bootloaderVerified,
           }))
+          // Device reconnected after firmware/bootloader flash — stop polling
+          if (this.updatePhase === 'rebooting') {
+            console.log('[Engine] Device reconnected after reboot, clearing reboot phase')
+            this.updatePhase = 'idle'
+            this.stopRebootPoll()
+          }
           this.updateState(this.deriveState(this.cachedFeatures))
         } catch (err) {
           console.error('[Engine] Failed to get features after pairing:', err)
@@ -342,6 +369,14 @@ export class EngineController extends EventEmitter {
         console.warn(`[Engine] Device seen but not paired: ${this.lastError}`)
         this.updateState('connected_unpaired')
       } else if (this.lastState !== 'disconnected') {
+        // During reboot phase, device is expected to be absent — don't emit
+        // 'disconnected' which would cause unnecessary state churn in the UI.
+        // The detach handler already suppresses for the USB event; this covers
+        // the rebootPoll → syncState() path.
+        if (this.updatePhase === 'rebooting') {
+          console.log('[Engine] syncState: no device during reboot phase — suppressing disconnected')
+          return
+        }
         this.lastError = null
         this.updateState('disconnected')
       }
@@ -372,6 +407,45 @@ export class EngineController extends EventEmitter {
     }
   }
 
+  /**
+   * Start polling syncState() every 5s while updatePhase === 'rebooting'.
+   * On Windows 10, usb.on('attach') may not fire after a device reboot,
+   * so this ensures the device is re-detected via periodic scanning.
+   * The existing `syncing` guard prevents concurrent runs.
+   */
+  private rebootPollCount = 0
+  private static readonly MAX_REBOOT_POLLS = 60 // 60 × 5s = 5 minutes max
+
+  private startRebootPoll() {
+    this.stopRebootPoll()
+    this.rebootPollCount = 0
+    console.log('[Engine] Starting reboot poll (5s interval, max 5 min)')
+    this.rebootPollTimer = setInterval(() => {
+      if (this.updatePhase !== 'rebooting') {
+        console.log('[Engine] Reboot poll: updatePhase is no longer rebooting, stopping')
+        this.stopRebootPoll()
+        return
+      }
+      this.rebootPollCount++
+      if (this.rebootPollCount >= EngineController.MAX_REBOOT_POLLS) {
+        console.warn('[Engine] Reboot poll: max attempts reached (5 min), stopping')
+        this.updatePhase = 'idle'
+        this.stopRebootPoll()
+        this.updateState('disconnected')
+        return
+      }
+      if (this.rebootPollCount % 6 === 0) console.log(`[Engine] Reboot poll ${this.rebootPollCount}/${EngineController.MAX_REBOOT_POLLS}: calling syncState()`)
+      this.syncState()
+    }, 5000)
+  }
+
+  private stopRebootPoll() {
+    if (this.rebootPollTimer) {
+      clearInterval(this.rebootPollTimer)
+      this.rebootPollTimer = null
+    }
+  }
+
   // ── Dual-Transport Wallet Init (Desktop Pattern) ─────────────────────
   //
   // Uses getDevice() + pairRawDevice() instead of getDevices() + pairDevice().
@@ -539,6 +613,14 @@ export class EngineController extends EventEmitter {
 
     const hashes = features ? this.verifyHashes(features) : {}
 
+    // In bootloader mode, resolve installed firmware version from on-device hash.
+    // Known official hashes → version string; unknown hash → custom firmware.
+    const resolvedFwVersion = bootloaderMode
+      ? resolveOndeviceFirmwareVersion(hashes.firmwareHash) ?? undefined
+      : undefined
+    // Firmware is "present" if the on-device hash is non-empty (not all zeros)
+    const firmwarePresent = !!hashes.firmwareHash && !/^0+$/.test(hashes.firmwareHash)
+
     return {
       state: this.lastState,
       activeTransport: this.activeTransport,
@@ -554,7 +636,11 @@ export class EngineController extends EventEmitter {
       needsFirmwareUpdate: needsFw,
       needsInit: !initialized,
       initialized,
-      isOob: bootloaderMode || fwVersion === '4.0.0',
+      // In bootloader mode the device can't report `initialized` — use firmware
+      // hash presence instead. If firmware bytes exist on flash, the device has
+      // been set up before and entered bootloader for an update (not OOB).
+      isOob: bootloaderMode ? !firmwarePresent : fwVersion === '4.0.0',
+      resolvedFwVersion,
       firmwareHash: hashes.firmwareHash,
       bootloaderHash: hashes.bootloaderHash,
       firmwareVerified: hashes.firmwareVerified,
@@ -601,6 +687,7 @@ export class EngineController extends EventEmitter {
       this.clearWallet()
       this.emit('state-change', this.getDeviceState())
       this.emit('firmware-progress', { percent: 100, message: 'Bootloader update complete' })
+      this.startRebootPoll()
     } catch (err: any) {
       this.updatePhase = 'idle'
       this.emit('state-change', this.getDeviceState())
@@ -650,6 +737,7 @@ export class EngineController extends EventEmitter {
       this.clearWallet()
       this.emit('state-change', this.getDeviceState())
       this.emit('firmware-progress', { percent: 100, message: 'Firmware update complete' })
+      this.startRebootPoll()
     } catch (err: any) {
       this.updatePhase = 'idle'
       this.emit('state-change', this.getDeviceState())
@@ -804,7 +892,11 @@ export class EngineController extends EventEmitter {
     if (opts.autoLockDelayMs !== undefined) settings.autoLockDelayMs = opts.autoLockDelayMs
     await this.wallet.applySettings(settings)
     this.cachedFeatures = await this.wallet.getFeatures()
-    this.emit('state-change', this.getDeviceState())
+    // Route through updateState so needs_passphrase triggers promptPin() →
+    // getPublicKeys() → PASSPHRASE_REQUEST.  Previously this emitted directly,
+    // so enabling passphrase from settings showed the overlay but the device
+    // never received the passphrase (no pending request to respond to).
+    this.updateState(this.deriveState(this.cachedFeatures))
   }
 
   async changePin() {
@@ -1047,6 +1139,7 @@ export class EngineController extends EventEmitter {
       this.clearWallet()
       this.emit('state-change', this.getDeviceState())
       this.emit('firmware-progress', { percent: 100, message: 'Custom firmware flash complete' })
+      this.startRebootPoll()
     } catch (err: any) {
       this.updatePhase = 'idle'
       this.emit('state-change', this.getDeviceState())
diff --git a/projects/keepkey-vault/src/bun/index.ts b/projects/keepkey-vault/src/bun/index.ts
index 9e0dda34..fa1fce4f 100644
--- a/projects/keepkey-vault/src/bun/index.ts
+++ b/projects/keepkey-vault/src/bun/index.ts
@@ -8,7 +8,7 @@ process.on('unhandledRejection', (reason) => {
 	console.error('[Vault] UNHANDLED REJECTION:', reason)
 })
 
-import { EngineController } from "./engine-controller"
+import { EngineController, withTimeout } from "./engine-controller"
 import { startRestApi, type RestApiCallbacks } from "./rest-api"
 import { AuthStore } from "./auth"
 import { getPioneer, getPioneerApiBase, resetPioneer } from "./pioneer"
@@ -17,24 +17,18 @@ import { CHAINS, customChainToChainDef } from "../shared/chains"
 import type { ChainDef } from "../shared/chains"
 import { BtcAccountManager } from "./btc-accounts"
 import { EvmAddressManager, evmAddressPath } from "./evm-addresses"
-import { initDb, getCustomTokens, addCustomToken as dbAddCustomToken, removeCustomToken as dbRemoveCustomToken, getCustomChains, addCustomChainDb, removeCustomChainDb, getSetting, setSetting, setTokenVisibility as dbSetTokenVisibility, removeTokenVisibility as dbRemoveTokenVisibility, getAllTokenVisibility, insertApiLog, getApiLogs, clearApiLogs, setCachedBalances, getCachedBalances, saveCachedPubkey, getLatestDeviceSnapshot, getCachedPubkeys } from "./db"
+import { initDb, getCustomTokens, addCustomToken as dbAddCustomToken, removeCustomToken as dbRemoveCustomToken, getCustomChains, addCustomChainDb, removeCustomChainDb, getSetting, setSetting, setTokenVisibility as dbSetTokenVisibility, removeTokenVisibility as dbRemoveTokenVisibility, getAllTokenVisibility, insertApiLog, getApiLogs, clearApiLogs, setCachedBalances, getCachedBalances, saveCachedPubkey, getLatestDeviceSnapshot, getCachedPubkeys, saveReport, getReportsList, getReportById, deleteReport, reportExists } from "./db"
+import { generateReport, reportToPdfBuffer } from "./reports"
+import { extractTransactionsFromReport, toCoinTrackerCsv, toZenLedgerCsv } from "./tax-export"
+import * as os from "os"
+import * as path from "path"
 import { EVM_RPC_URLS, getTokenMetadata, broadcastEvmTx } from "./evm-rpc"
 import { startCamera, stopCamera } from "./camera"
 import type { ChainBalance, TokenBalance, CustomToken, SigningRequestInfo, ApiLogEntry, PioneerChainInfo, EvmAddressSet } from "../shared/types"
 import type { VaultRPCSchema } from "../shared/rpc-schema"
 
-/** Timeout wrapper for external API calls */
-function withTimeout<T>(promise: Promise<T>, ms: number, label: string): Promise<T> {
-	let timer: ReturnType<typeof setTimeout>
-	return Promise.race([
-		promise,
-		new Promise<never>((_, reject) => {
-			timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms)
-		}),
-	]).finally(() => clearTimeout(timer!))
-}
-
-const PIONEER_TIMEOUT_MS = 30_000
+// L3 fix: withTimeout imported from engine-controller (was duplicated here)
+const PIONEER_TIMEOUT_MS = 60_000
 
 // ── Pioneer chain discovery catalog (lazy-loaded, 30-min cache) ──────
 function getDiscoveryUrl(): string {
@@ -245,7 +239,7 @@ if (!restApiEnabled) console.log('[Vault] REST API disabled (enable in Settings
 
 // ── RPC Bridge (Electrobun UI ↔ Bun) ─────────────────────────────────
 const rpc = BrowserView.defineRPC<VaultRPCSchema>({
-	maxRequestTime: Infinity, // no timeout — user can take as long as needed to confirm on device
+	maxRequestTime: 1_800_000, // 30 minutes — generous for device-interactive ops, but not infinite
 	handlers: {
 		requests: {
 			// ── Device lifecycle ──────────────────────────────────────
@@ -254,11 +248,15 @@ const rpc = BrowserView.defineRPC<VaultRPCSchema>({
 			startFirmwareUpdate: async () => { await engine.startFirmwareUpdate() },
 			flashFirmware: async () => { await engine.flashFirmware() },
 			analyzeFirmware: async (params) => {
+				if (params.data.length > 10_000_000) throw new Error('Firmware data too large (max ~7.5MB)')
 				const buf = Buffer.from(params.data, 'base64')
+				if (buf.length > 7_500_000) throw new Error('Decoded firmware exceeds 7.5MB limit')
 				return engine.analyzeFirmware(buf)
 			},
 			flashCustomFirmware: async (params) => {
+				if (params.data.length > 10_000_000) throw new Error('Firmware data too large (max ~7.5MB)')
 				const buf = Buffer.from(params.data, 'base64')
+				if (buf.length > 7_500_000) throw new Error('Decoded firmware exceeds 7.5MB limit')
 				await engine.flashCustomFirmware(buf)
 			},
 			resetDevice: async (params) => { await engine.resetDevice(params) },
@@ -418,6 +416,7 @@ const rpc = BrowserView.defineRPC<VaultRPCSchema>({
 			solanaSignMessage: async (params) => {
 				if (!engine.wallet) throw new Error('No device connected')
 				const result = await engine.wallet.solanaSignMessage(params)
+				if (!result) throw new Error('solanaSignMessage returned no result')
 				return {
 					signature: result.signature instanceof Uint8Array
 						? Buffer.from(result.signature).toString('base64')
@@ -515,7 +514,21 @@ const rpc = BrowserView.defineRPC<VaultRPCSchema>({
 
 				// 3. Add ALL BTC xpubs from multi-account manager
 				const btcChain = allChains.find(c => c.id === 'bitcoin')!
-				const btcPubkeyEntries = btcAccounts.getAllPubkeyEntries(btcChain.caip)
+				let btcPubkeyEntries = btcAccounts.getAllPubkeyEntries(btcChain.caip)
+
+				// Fallback: if btcAccounts didn't initialize, try cached pubkeys from DB
+				if (btcPubkeyEntries.length === 0) {
+					const devId = engine.getDeviceState().deviceId
+					if (devId) {
+						const cachedPks = getCachedPubkeys(devId)
+						const btcPks = cachedPks.filter(p => p.chainId === 'bitcoin' && p.xpub)
+						if (btcPks.length > 0) {
+							btcPubkeyEntries = btcPks.map(p => ({ caip: btcChain.caip, pubkey: p.xpub }))
+							console.log(`[getBalances] BTC xpubs from cached_pubkeys DB fallback: ${btcPubkeyEntries.length}`)
+						}
+					}
+				}
+
 				// Track BTC entries separately for per-xpub balance update
 				const btcPubkeySet = new Set(btcPubkeyEntries.map(e => e.pubkey))
 				for (const entry of btcPubkeyEntries) {
@@ -548,6 +561,12 @@ const rpc = BrowserView.defineRPC<VaultRPCSchema>({
 					const portfolioTokens: any[] = portfolio.tokens || []
 
 					console.log(`[getBalances] GetPortfolio response: ${nativeEntries.length} balances, ${portfolioTokens.length} tokens`)
+					// Log BTC-specific entries for debugging
+					const btcNatives = nativeEntries.filter((d: any) => d.caip?.includes('bip122') || d.pubkey?.startsWith('xpub') || d.pubkey?.startsWith('ypub') || d.pubkey?.startsWith('zpub'))
+					console.log(`[getBalances] BTC native entries from Pioneer: ${btcNatives.length}`)
+					for (const b of btcNatives) {
+						console.log(`  BTC: caip=${b.caip}, pubkey=${String(b.pubkey).substring(0, 24)}..., balance=${b.balance}, valueUsd=${b.valueUsd}, address=${b.address}`)
+					}
 
 					// Convert portfolio.tokens (different shape) into the same format as native entries
 					// so our existing token grouping logic works on them
@@ -652,6 +671,12 @@ const rpc = BrowserView.defineRPC<VaultRPCSchema>({
 					} catch { /* custom tokens lookup failed, non-fatal */ }
 
 					// Aggregate BTC entries into one ChainBalance + update per-xpub balances
+					console.log(`[getBalances] pureNatives count: ${pureNatives.length}`)
+					for (const n of pureNatives) {
+						if (n.caip?.includes('bip122') || n.pubkey?.startsWith('xpub') || n.pubkey?.startsWith('ypub') || n.pubkey?.startsWith('zpub')) {
+							console.log(`[getBalances] BTC native entry: caip=${n.caip}, pubkey=${n.pubkey?.substring(0, 20)}..., balance=${n.balance}, usd=${n.valueUsd}`)
+						}
+					}
 					let btcTotalBalance = 0
 					let btcTotalUsd = 0
 					let btcAddress = ''
@@ -664,6 +689,7 @@ const rpc = BrowserView.defineRPC<VaultRPCSchema>({
 							// Find the Pioneer response for this xpub
 							const match = pureNatives.find((d: any) => d.pubkey === entry.pubkey)
 								|| pureNatives.find((d: any) => d.caip === entry.caip && d.address === entry.pubkey)
+							console.log(`[getBalances] BTC match for ${entry.pubkey?.substring(0, 20)}...: ${match ? `balance=${match.balance}, usd=${match.valueUsd}` : 'NO MATCH'}`)
 							const bal = parseFloat(String(match?.balance ?? '0'))
 							const usd = Number(match?.valueUsd ?? 0)
 							btcTotalBalance += bal
@@ -727,6 +753,33 @@ const rpc = BrowserView.defineRPC<VaultRPCSchema>({
 						})
 					}
 
+					// BTC fallback: GetPortfolio (charts/portfolio) returns empty for BTC xpubs.
+					// Use GetPortfolioBalances (/portfolio) which correctly returns BTC data.
+					if (btcTotalBalance === 0 && btcPubkeyEntries.length > 0 && pioneer) {
+						console.log('[getBalances] BTC zero from GetPortfolio (charts) — trying GetPortfolioBalances fallback')
+						try {
+							const btcResp = await withTimeout(
+								pioneer.GetPortfolioBalances({
+									pubkeys: btcPubkeyEntries.map(e => ({ caip: e.caip, pubkey: e.pubkey }))
+								}),
+								PIONEER_TIMEOUT_MS,
+								'GetPortfolioBalances-BTC'
+							)
+							const btcBalances = btcResp?.data?.balances || btcResp?.data || []
+							for (const b of (Array.isArray(btcBalances) ? btcBalances : [])) {
+								const bal = parseFloat(String(b.balance ?? '0'))
+								const usd = Number(b.valueUsd ?? 0)
+								btcTotalBalance += bal
+								btcTotalUsd += usd
+								if (!btcAddress && b.address) btcAddress = b.address
+								if (b.pubkey) btcAccounts.updateXpubBalance(b.pubkey, String(b.balance ?? '0'), usd)
+							}
+							console.log(`[getBalances] BTC fallback result: ${btcTotalBalance.toFixed(8)} BTC, $${btcTotalUsd.toFixed(2)}`)
+						} catch (e: any) {
+							console.warn('[getBalances] BTC GetPortfolioBalances fallback failed:', e.message)
+						}
+					}
+
 					// Push one aggregated BTC entry
 					if (btcPubkeyEntries.length > 0) {
 						const selectedXpub = btcAccounts.getSelectedXpub()
@@ -1154,6 +1207,166 @@ const rpc = BrowserView.defineRPC<VaultRPCSchema>({
 				clearApiLogs()
 			},
 
+			// ── Reports ─────────────────────────────────────────────
+			generateReport: async () => {
+				const deviceId = engine.getDeviceState().deviceId
+				if (!deviceId) throw new Error('No device connected')
+
+				const reportId = `rpt_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`
+
+				// Get cached balances for report data
+				const cached = getCachedBalances(deviceId)
+				const balances = cached?.balances || []
+				if (balances.length === 0) {
+					throw new Error('No cached balances available. Please refresh your portfolio first.')
+				}
+
+				// Gather BTC xpubs from BtcAccountManager (try init if needed)
+				let btcXpubs: Array<{ xpub: string; scriptType: string; path: number[] }> | undefined
+				console.log(`[generateReport] btcAccounts.isInitialized=${btcAccounts.isInitialized}`)
+				if (!btcAccounts.isInitialized && engine.wallet) {
+					try {
+						console.log('[generateReport] Initializing BTC accounts for report...')
+						await btcAccounts.initialize(engine.wallet as any)
+					} catch (e: any) {
+						console.warn('[generateReport] BTC accounts init failed:', e.message)
+					}
+				}
+				if (btcAccounts.isInitialized) {
+					const btcSet = btcAccounts.toAccountSet()
+					btcXpubs = []
+					for (const acct of btcSet.accounts) {
+						for (const x of acct.xpubs) {
+							if (x.xpub) btcXpubs.push({ xpub: x.xpub, scriptType: x.scriptType, path: x.path })
+						}
+					}
+					console.log(`[generateReport] btcXpubs from BtcAccountManager: ${btcXpubs.length}`)
+				}
+				// Fallback: check cached_pubkeys DB for BTC xpubs
+				if (!btcXpubs || btcXpubs.length === 0) {
+					const cachedPks = getCachedPubkeys(deviceId)
+					const btcPks = cachedPks.filter(p => p.chainId === 'bitcoin' && p.xpub)
+					if (btcPks.length > 0) {
+						btcXpubs = btcPks.map(p => ({
+							xpub: p.xpub,
+							scriptType: p.scriptType || 'p2wpkh',
+							path: p.path ? p.path.split('/').filter(Boolean).map(s => parseInt(s.replace("'", ''), 10)) : [],
+						}))
+						console.log(`[generateReport] btcXpubs from cached_pubkeys DB: ${btcXpubs.length}`)
+					} else {
+						console.warn('[generateReport] No BTC xpubs found anywhere — BTC sections will be skipped')
+					}
+				}
+
+				const deviceLabel = engine.getDeviceState().label || 'KeepKey'
+
+				// Save placeholder (lod=5 always)
+				saveReport(deviceId, reportId, 'all', 5, 0, 'generating', '{}')
+
+				// Send initial progress
+				try { rpc.send['report-progress']({ id: reportId, message: 'Starting...', percent: 0 }) } catch {}
+
+				try {
+					const reportData = await generateReport({
+						balances,
+						btcXpubs,
+						deviceId,
+						deviceLabel,
+						onProgress: (message, percent) => {
+							try { rpc.send['report-progress']({ id: reportId, message, percent }) } catch {}
+						},
+					})
+
+					const totalUsd = balances.reduce((s, b) => s + (b.balanceUsd || 0), 0)
+					// M7: Only save final result if report wasn't deleted during generation
+					if (reportExists(reportId)) {
+						saveReport(deviceId, reportId, 'all', 5, totalUsd, 'complete', JSON.stringify(reportData))
+					}
+
+					try { rpc.send['report-progress']({ id: reportId, message: 'Complete', percent: 100 }) } catch {}
+
+					return {
+						id: reportId,
+						createdAt: Date.now(),
+						chain: 'all',
+						totalUsd,
+						status: 'complete' as const,
+					}
+				} catch (e: any) {
+					// M9: Sanitize error messages — strip auth keys and URLs
+					const safeMsg = e.message?.replace(/key:[^\s"',}]+/gi, 'key:***').replace(/https?:\/\/[^\s"',}]+/gi, '<url>') || 'Report generation failed'
+					saveReport(deviceId, reportId, 'all', 5, 0, 'error', '{}', safeMsg)
+					try { rpc.send['report-progress']({ id: reportId, message: `Error: ${safeMsg}`, percent: 100 }) } catch {}
+					throw new Error(safeMsg)
+				}
+			},
+
+			listReports: async () => {
+				const deviceId = engine.getDeviceState().deviceId
+				if (!deviceId) return []
+				return getReportsList(deviceId)
+			},
+
+			// H1: Scope getReport/deleteReport to the current device
+			getReport: async (params) => {
+				const deviceId = engine.getDeviceState().deviceId
+				if (!deviceId) throw new Error('No device connected')
+				return getReportById(params.id, deviceId)
+			},
+
+			deleteReport: async (params) => {
+				const deviceId = engine.getDeviceState().deviceId
+				if (!deviceId) throw new Error('No device connected')
+				deleteReport(params.id, deviceId)
+			},
+
+			saveReportFile: async (params) => {
+				const deviceId = engine.getDeviceState().deviceId
+				if (!deviceId) throw new Error('No device connected')
+				const report = getReportById(params.id, deviceId)
+				if (!report) throw new Error('Report not found')
+
+				const dateSuffix = new Date(report.meta.createdAt).toISOString().split('T')[0]
+				const year = new Date(report.meta.createdAt).getFullYear()
+				const downloadsDir = path.join(os.homedir(), 'Downloads')
+
+				console.log(`[reports] saveReportFile: format=${params.format}, id=${params.id}`)
+
+				let filePath: string
+				if (params.format === 'cointracker') {
+					filePath = path.join(downloadsDir, `keepkey_cointracker_${year}.csv`)
+					const txs = extractTransactionsFromReport(report.data)
+					await Bun.write(filePath, toCoinTrackerCsv(txs))
+				} else if (params.format === 'zenledger') {
+					filePath = path.join(downloadsDir, `keepkey_zenledger_${year}.csv`)
+					const txs = extractTransactionsFromReport(report.data)
+					await Bun.write(filePath, toZenLedgerCsv(txs))
+				} else if (params.format === 'pdf') {
+					const shortId = params.id.slice(-6).replace(/[^a-zA-Z0-9]/g, '')
+					const safeChain = (report.meta.chain || 'all').replace(/[^a-zA-Z0-9_-]/g, '_')
+					filePath = path.join(downloadsDir, `keepkey-report-${safeChain}-${dateSuffix}-${shortId}.pdf`)
+					console.log(`[reports] Generating PDF to ${filePath}...`)
+					const pdfBuffer = await reportToPdfBuffer(report.data)
+					console.log(`[reports] PDF buffer ready: ${pdfBuffer.length} bytes`)
+					await Bun.write(filePath, pdfBuffer)
+					console.log(`[reports] PDF written to disk`)
+				} else {
+					throw new Error(`Unknown export format: ${params.format}`)
+				}
+
+				// L3: Reveal in Finder / file manager (with error handling)
+				try {
+					const cmd = process.platform === 'win32' ? 'explorer' : process.platform === 'linux' ? 'xdg-open' : 'open'
+					const args = process.platform === 'darwin' ? ['-R', filePath] : [filePath]
+					Bun.spawn([cmd, ...args])
+				} catch (e: any) {
+					console.warn('[reports] Failed to reveal file:', e.message)
+				}
+
+				console.log(`[reports] File saved: ${filePath}`)
+				return { filePath }
+			},
+
 			// ── Balance cache (instant portfolio) ────────────────────
 			getCachedBalances: async () => {
 				const deviceId = engine.getDeviceState().deviceId
@@ -1223,7 +1436,7 @@ const rpc = BrowserView.defineRPC<VaultRPCSchema>({
 			windowClose: async () => { _mainWindow?.close() },
 			windowMinimize: async () => { _mainWindow?.minimize() },
 			windowMaximize: async () => { _mainWindow?.maximize() },
-			windowGetFrame: async () => _mainWindow!.getFrame(),
+			windowGetFrame: async () => { if (!_mainWindow) throw new Error('Window not ready'); return _mainWindow.getFrame() },
 			windowSetPosition: async ({ x, y }) => { _mainWindow?.setPosition(x, y) },
 			windowSetFrame: async ({ x, y, width, height }) => { _mainWindow?.setFrame(x, y, width, height) },
 		},
@@ -1450,7 +1663,10 @@ mainWindow.on("open-url", (e: any) => {
 })
 
 // Cleanup and quit helper — shared between window close and app quit
+let quitting = false
 function cleanupAndQuit() {
+	if (quitting) return
+	quitting = true
 	stopCamera()
 	engine.stop()
 	restServer?.stop()
diff --git a/projects/keepkey-vault/src/bun/reports.ts b/projects/keepkey-vault/src/bun/reports.ts
new file mode 100644
index 00000000..11d9686a
--- /dev/null
+++ b/projects/keepkey-vault/src/bun/reports.ts
@@ -0,0 +1,1113 @@
+/**
+ * Report generator for KeepKey Vault v11.
+ *
+ * Always generates LOD 5 (maximum detail). Includes:
+ *   1. Device Information (from device_snapshot DB)
+ *   2. Portfolio Overview (from cached balances)
+ *   3. Chain Balances Table
+ *   4. Cached Pubkeys / XPUBs (from cached_pubkeys DB)
+ *   5. Token Details (per-chain)
+ *   6. BTC Detailed Report (from Pioneer server)
+ *   7. Address Flow Analysis (computed from BTC TX data)
+ */
+
+import type { ReportData, ReportSection, ChainBalance } from '../shared/types'
+import { getLatestDeviceSnapshot, getCachedPubkeys } from './db'
+import { getPioneerApiBase } from './pioneer'
+
+const REPORT_TIMEOUT_MS = 60_000
+
+/** Section title prefixes — shared with tax-export.ts for reliable extraction. */
+export const SECTION_TITLES = {
+	TX_DETAILS: 'Transaction Details',
+	TX_HISTORY: 'Transaction History',
+} as const
+
+/** Safely round a satoshi string/number to integer, guarding against values beyond Number.MAX_SAFE_INTEGER. */
+function safeRoundSats(value: unknown): number {
+	if (value === undefined || value === null) return 0
+	const n = Number(value)
+	if (!Number.isFinite(n)) return 0
+	if (Math.abs(n) > Number.MAX_SAFE_INTEGER) {
+		console.warn(`[Report] safeRoundSats: value ${value} exceeds MAX_SAFE_INTEGER, clamping`)
+		return n > 0 ? Number.MAX_SAFE_INTEGER : -Number.MAX_SAFE_INTEGER
+	}
+	return Math.round(n)
+}
+
+function getPioneerQueryKey(): string {
+	return process.env.PIONEER_API_KEY || `key:public-${Date.now()}`
+}
+
+function getPioneerBase(): string {
+	return getPioneerApiBase()
+}
+
+// ── Pioneer API Helpers ──────────────────────────────────────────────
+
+async function fetchWithTimeout(url: string, init: RequestInit, timeoutMs: number): Promise<Response> {
+	const controller = new AbortController()
+	const timer = setTimeout(() => controller.abort(), timeoutMs)
+	try {
+		return await fetch(url, { ...init, signal: controller.signal })
+	} finally {
+		clearTimeout(timer)
+	}
+}
+
+async function fetchPubkeyInfo(baseUrl: string, xpub: string): Promise<any> {
+	const resp = await fetchWithTimeout(
+		`${baseUrl}/api/v1/utxo/pubkey-info/BTC/${xpub}`,
+		{ method: 'GET', headers: { 'Authorization': getPioneerQueryKey() } },
+		REPORT_TIMEOUT_MS,
+	)
+	if (!resp.ok) throw new Error(`PubkeyInfo ${resp.status}`)
+	const json = await resp.json()
+	const result = json.data || json
+	if (typeof result !== 'object' || result === null) {
+		console.warn('[Report] fetchPubkeyInfo: unexpected response shape, returning empty object')
+		return {}
+	}
+	return result
+}
+
+async function fetchTxHistory(baseUrl: string, xpub: string, caip: string): Promise<any[]> {
+	const resp = await fetchWithTimeout(
+		`${baseUrl}/api/v1/tx/history`,
+		{
+			method: 'POST',
+			headers: { 'Content-Type': 'application/json', 'Authorization': getPioneerQueryKey() },
+			body: JSON.stringify({ queries: [{ pubkey: xpub, caip }] }),
+		},
+		REPORT_TIMEOUT_MS,
+	)
+	if (!resp.ok) throw new Error(`TxHistory ${resp.status}`)
+	const json = await resp.json()
+	if (typeof json !== 'object' || json === null) {
+		console.warn('[Report] fetchTxHistory: unexpected response shape, returning empty array')
+		return []
+	}
+	const histories = json.histories || json.data?.histories || []
+	return histories[0]?.transactions || []
+}
+
+// ── Section Builders ─────────────────────────────────────────────────
+
+function buildDeviceFeaturesSection(): ReportSection {
+	const snapshot = getLatestDeviceSnapshot()
+	if (!snapshot) {
+		return { title: '1. Device Information', type: 'text', data: 'No device snapshot available.' }
+	}
+
+	let features: any = {}
+	try { features = JSON.parse(snapshot.featuresJson) } catch {}
+
+	const items: string[] = [
+		`Label: ${snapshot.label || 'KeepKey'}`,
+		`Firmware Version: ${snapshot.firmwareVer || 'Unknown'}`,
+		`Device ID: ${snapshot.deviceId}`,
+	]
+
+	if (features.bootloaderHash) items.push(`Bootloader Hash: ${features.bootloaderHash}`)
+	if (features.initialized !== undefined) items.push(`Initialized: ${features.initialized ? 'Yes' : 'No'}`)
+	if (features.pinProtection !== undefined) items.push(`PIN Protection: ${features.pinProtection ? 'Enabled' : 'Disabled'}`)
+	if (features.passphraseProtection !== undefined) items.push(`Passphrase Protection: ${features.passphraseProtection ? 'Enabled' : 'Disabled'}`)
+	if (features.model) items.push(`Model: ${features.model}`)
+	if (features.deviceId) items.push(`Hardware ID: ${features.deviceId}`)
+	items.push(`Snapshot Date: ${new Date(snapshot.updatedAt).toISOString()}`)
+
+	return { title: '1. Device Information', type: 'summary', data: items }
+}
+
+function buildPortfolioOverviewSection(balances: ChainBalance[]): ReportSection {
+	const totalUsd = balances.reduce((s, b) => s + (b.balanceUsd || 0), 0)
+	const totalTokens = balances.reduce((s, b) => s + (b.tokens?.length || 0), 0)
+	return {
+		title: '2. Portfolio Overview',
+		type: 'summary',
+		data: [
+			`Total Chains: ${balances.length}`,
+			`Total USD Value: $${totalUsd.toFixed(2)}`,
+			`Total Tokens: ${totalTokens}`,
+			`Generated: ${new Date().toISOString()}`,
+		],
+	}
+}
+
+function buildChainBalancesSection(balances: ChainBalance[]): ReportSection {
+	const sorted = [...balances].sort((a, b) => (b.balanceUsd || 0) - (a.balanceUsd || 0))
+	return {
+		title: '3. Chain Balances',
+		type: 'table',
+		data: {
+			headers: ['Chain', 'Symbol', 'Balance', 'USD Value', 'Address', 'Tokens'],
+			widths: ['15%', '10%', '20%', '15%', '30%', '10%'],
+			rows: sorted.map(b => [
+				b.chainId, b.symbol, b.balance,
+				`$${(b.balanceUsd || 0).toFixed(2)}`,
+				b.address, (b.tokens?.length || 0).toString(),
+			]),
+		},
+	}
+}
+
+function buildCachedPubkeysSection(
+	deviceId: string,
+	btcXpubs?: Array<{ xpub: string; scriptType: string; path: number[] }>,
+): ReportSection[] {
+	const sections: ReportSection[] = []
+
+	// BTC xpubs from BtcAccountManager (always have full xpub + scriptType)
+	if (btcXpubs && btcXpubs.length > 0) {
+		const scriptTypeMap: Record<string, string> = {
+			'p2pkh': 'Legacy (P2PKH)', 'p2sh-p2wpkh': 'SegWit (P2SH-P2WPKH)', 'p2wpkh': 'Native SegWit (P2WPKH)',
+		}
+		sections.push({
+			title: `4. BTC XPUBs (${btcXpubs.length})`,
+			type: 'table',
+			data: {
+				headers: ['Script Type', 'Path', 'XPUB'],
+				widths: ['20%', '20%', '60%'],
+				rows: btcXpubs.map(x => [
+					scriptTypeMap[x.scriptType] || x.scriptType,
+					`m/${x.path.map((p, j) => j < 3 ? `${p & 0x7FFFFFFF}'` : String(p)).join('/')}`,
+					x.xpub,
+				]),
+			},
+		})
+	}
+
+	// Cached addresses from DB (all chains)
+	const pubkeys = getCachedPubkeys(deviceId)
+	if (pubkeys.length > 0) {
+		// Group by chain
+		const byChain = new Map<string, typeof pubkeys>()
+		for (const pk of pubkeys) {
+			const list = byChain.get(pk.chainId) || []
+			list.push(pk)
+			byChain.set(pk.chainId, list)
+		}
+
+		for (const [chainId, pks] of byChain) {
+			sections.push({
+				title: `Cached Addresses — ${chainId} (${pks.length})`,
+				type: 'table',
+				data: {
+					headers: ['Path', 'Address'],
+					widths: ['30%', '70%'],
+					rows: pks.map(pk => [
+						pk.path || 'N/A',
+						pk.address || 'N/A',
+					]),
+				},
+			})
+		}
+	}
+
+	if (sections.length === 0) {
+		return [{ title: '4. Cached Pubkeys / Addresses', type: 'text', data: 'No cached pubkeys or addresses found.' }]
+	}
+
+	return sections
+}
+
+function buildTokenDetailsSections(balances: ChainBalance[]): ReportSection[] {
+	const sections: ReportSection[] = []
+	let first = true
+	for (const b of balances) {
+		if (!b.tokens || b.tokens.length === 0) continue
+		const sorted = [...b.tokens].sort((a, c) => (c.balanceUsd || 0) - (a.balanceUsd || 0))
+		sections.push({
+			title: first ? `5. Token Details — ${b.symbol} (${sorted.length})` : `Token Details — ${b.symbol} (${sorted.length})`,
+			type: 'table',
+			data: {
+				headers: ['Symbol', 'Name', 'Balance', 'USD Value', 'Price', 'Contract'],
+				widths: ['10%', '20%', '20%', '15%', '15%', '20%'],
+				rows: sorted.map(t => [
+					t.symbol, t.name, t.balance,
+					`$${(t.balanceUsd || 0).toFixed(2)}`,
+					`$${(t.priceUsd || 0).toFixed(4)}`,
+					t.contractAddress || 'N/A',
+				]),
+			},
+		})
+		first = false
+	}
+	return sections
+}
+
+// ── BTC Report Builder (uses /utxo/pubkey-info + /tx/history) ────────
+
+const BTC_CAIP = 'bip122:000000000019d6689c085ae165831e93/slip44:0'
+
+interface BtcReportXpub {
+	xpub: string
+	scriptType: string
+	label: string
+	balance: number       // satoshis
+	totalReceived: number // satoshis
+	totalSent: number     // satoshis
+	txCount: number
+	usedAddresses: Array<{ name: string; path: string; transfers: number }>
+}
+
+interface BtcTx {
+	txid: string
+	direction: string  // 'sent' | 'received'
+	blockHeight: number
+	timestamp: number
+	confirmations: number
+	from: string[]
+	to: string[]
+	value: number      // satoshis
+	fee: number        // satoshis
+	status: string
+}
+
+async function buildBtcSections(
+	baseUrl: string,
+	btcXpubs: Array<{ xpub: string; scriptType: string; path: number[] }>,
+	onProgress?: (msg: string, pct: number) => void,
+): Promise<ReportSection[]> {
+	const sections: ReportSection[] = []
+
+	// 1. Fetch pubkey info for each xpub
+	onProgress?.('Fetching BTC xpub info...', 20)
+	const xpubInfos: BtcReportXpub[] = []
+	for (const x of btcXpubs) {
+		if (!x.xpub) continue
+		try {
+			const info = await fetchPubkeyInfo(baseUrl, x.xpub)
+			const tokens = info.tokens || []
+			const used = tokens.filter((t: any) => (t.transfers || 0) > 0)
+			xpubInfos.push({
+				xpub: x.xpub,
+				scriptType: x.scriptType,
+				label: `${x.scriptType}`,
+				balance: safeRoundSats(info.balance),
+				totalReceived: safeRoundSats(info.totalReceived),
+				totalSent: safeRoundSats(info.totalSent),
+				txCount: info.txs || 0,
+				usedAddresses: used.map((t: any) => ({
+					name: t.name, path: t.path, transfers: t.transfers,
+				})),
+			})
+			console.log(`[Report] PubkeyInfo ${x.scriptType}: balance=${info.balance} sats, txs=${info.txs}, used addrs=${used.length}`)
+		} catch (e: any) {
+			console.warn(`[Report] PubkeyInfo failed for ${x.scriptType}:`, e.message)
+		}
+	}
+
+	// BTC Overview section
+	const totalBalSats = xpubInfos.reduce((s, x) => s + x.balance, 0)
+	const totalRecvSats = xpubInfos.reduce((s, x) => s + x.totalReceived, 0)
+	const totalSentSats = xpubInfos.reduce((s, x) => s + x.totalSent, 0)
+	const totalTxCount = xpubInfos.reduce((s, x) => s + x.txCount, 0)
+
+	sections.push({
+		title: '6. BTC Overview',
+		type: 'summary',
+		data: [
+			`Total Balance: ${(totalBalSats / 1e8).toFixed(8)} BTC`,
+			`Total Received: ${(totalRecvSats / 1e8).toFixed(8)} BTC`,
+			`Total Sent: ${(totalSentSats / 1e8).toFixed(8)} BTC`,
+			`Total Transactions: ${totalTxCount}`,
+			`XPUBs Queried: ${xpubInfos.length}`,
+		],
+	})
+
+	// XPUB summaries table
+	if (xpubInfos.length > 0) {
+		sections.push({
+			title: 'XPUB Summaries',
+			type: 'table',
+			data: {
+				headers: ['Script Type', 'XPUB', 'Balance (BTC)', 'Received (BTC)', 'Sent (BTC)', 'TXs', 'Used Addrs'],
+				widths: ['10%', '30%', '14%', '14%', '14%', '8%', '10%'],
+				rows: xpubInfos.map(x => [
+					x.scriptType,
+					x.xpub,
+					(x.balance / 1e8).toFixed(8),
+					(x.totalReceived / 1e8).toFixed(8),
+					(x.totalSent / 1e8).toFixed(8),
+					x.txCount.toString(),
+					x.usedAddresses.length.toString(),
+				]),
+			},
+		})
+	}
+
+	// Used addresses per xpub
+	for (const x of xpubInfos) {
+		if (x.usedAddresses.length > 0) {
+			sections.push({
+				title: `${x.label} -- Used Addresses (${x.usedAddresses.length})`,
+				type: 'table',
+				data: {
+					headers: ['Address', 'Path', 'Transfers'],
+					widths: ['50%', '30%', '20%'],
+					rows: x.usedAddresses.map(a => [a.name, a.path, a.transfers.toString()]),
+				},
+			})
+		}
+	}
+
+	// 2. Fetch transaction history
+	onProgress?.('Fetching BTC transaction history...', 40)
+	const allTxs: BtcTx[] = []
+	const seenTxids = new Set<string>()
+
+	for (const x of btcXpubs) {
+		if (!x.xpub) continue
+		try {
+			const txs = await fetchTxHistory(baseUrl, x.xpub, BTC_CAIP)
+			for (const tx of txs) {
+				if (!seenTxids.has(tx.txid)) {
+					seenTxids.add(tx.txid)
+					allTxs.push({
+						txid: tx.txid,
+						direction: tx.direction || 'unknown',
+						blockHeight: tx.blockHeight || 0,
+						timestamp: tx.timestamp || 0,
+						confirmations: tx.confirmations || 0,
+						from: tx.from || [],
+						to: tx.to || [],
+						value: Math.round(Number(tx.value || 0)),
+						fee: Math.round(Number(tx.fee || 0)),
+						status: tx.status || 'confirmed',
+					})
+				}
+			}
+			console.log(`[Report] TxHistory ${x.scriptType}: ${txs.length} txs (${allTxs.length} unique total)`)
+		} catch (e: any) {
+			console.warn(`[Report] TxHistory failed for ${x.scriptType}:`, e.message)
+		}
+	}
+
+	// Sort newest first
+	allTxs.sort((a, b) => b.blockHeight - a.blockHeight)
+
+	onProgress?.('Building transaction sections...', 60)
+
+	// Transaction History table
+	if (allTxs.length > 0) {
+		const rows = allTxs.map((tx, idx) => {
+			const date = tx.timestamp
+				? new Date(tx.timestamp * 1000).toISOString().replace('T', ' ').substring(0, 19)
+				: 'Pending'
+			return [
+				(idx + 1).toString(),
+				tx.direction.toUpperCase(),
+				tx.txid,
+				tx.blockHeight.toString(),
+				date,
+				(tx.value / 1e8).toFixed(8),
+				(tx.fee / 1e8).toFixed(8),
+			]
+		})
+
+		sections.push({
+			title: `${SECTION_TITLES.TX_HISTORY} (${allTxs.length})`,
+			type: 'table',
+			data: {
+				headers: ['#', 'Dir', 'TXID', 'Block', 'Date', 'Value (BTC)', 'Fee (BTC)'],
+				widths: ['5%', '8%', '17%', '10%', '20%', '20%', '20%'],
+				rows,
+			},
+		})
+
+		// Transaction Statistics
+		const blocks = allTxs.map(t => t.blockHeight).filter(b => b > 0)
+		const totalValueIn = allTxs.filter(t => t.direction === 'received').reduce((s, t) => s + t.value, 0)
+		const totalValueOut = allTxs.filter(t => t.direction === 'sent').reduce((s, t) => s + t.value, 0)
+		const totalFees = allTxs.reduce((s, t) => s + t.fee, 0)
+
+		sections.push({
+			title: 'Transaction Statistics',
+			type: 'summary',
+			data: [
+				`Total Transactions: ${allTxs.length}`,
+				`Received: ${allTxs.filter(t => t.direction === 'received').length} txs (${(totalValueIn / 1e8).toFixed(8)} BTC)`,
+				`Sent: ${allTxs.filter(t => t.direction === 'sent').length} txs (${(totalValueOut / 1e8).toFixed(8)} BTC)`,
+				`Total Fees Paid: ${(totalFees / 1e8).toFixed(8)} BTC`,
+				blocks.length > 0 ? `Block Range: ${Math.min(...blocks)} - ${Math.max(...blocks)}` : '',
+			].filter(Boolean),
+		})
+
+		// Per-transaction details as a single table (capped at 50 rows)
+		const MAX_TX_DETAILS = 50
+		const detailTxs = allTxs.slice(0, MAX_TX_DETAILS)
+		if (detailTxs.length > 0) {
+			sections.push({
+				title: `${SECTION_TITLES.TX_DETAILS} (${Math.min(allTxs.length, MAX_TX_DETAILS)}${allTxs.length > MAX_TX_DETAILS ? ` of ${allTxs.length}` : ''})`,
+				type: 'table',
+				data: {
+					headers: ['TXID', 'Dir', 'Block', 'Date', 'Value (BTC)', 'Fee (BTC)', 'From', 'To'],
+					widths: ['14%', '6%', '8%', '14%', '12%', '10%', '18%', '18%'],
+					rows: detailTxs.map(tx => {
+						const date = tx.timestamp
+							? new Date(tx.timestamp * 1000).toISOString().replace('T', ' ').substring(0, 19)
+							: 'Pending'
+						return [
+							tx.txid,
+							tx.direction.toUpperCase(),
+							tx.blockHeight.toString(),
+							date,
+							(tx.value / 1e8).toFixed(8),
+							(tx.fee / 1e8).toFixed(8),
+							tx.from.slice(0, 3).join(', ') || 'N/A',
+							tx.to.slice(0, 3).join(', ') || 'N/A',
+						]
+					}),
+				},
+			})
+		}
+
+		if (allTxs.length > MAX_TX_DETAILS) {
+			sections.push({ title: 'Note', type: 'text', data: `Showing ${MAX_TX_DETAILS} of ${allTxs.length} transactions.` })
+		}
+	} else {
+		sections.push({ title: SECTION_TITLES.TX_HISTORY, type: 'text', data: 'No transactions found' })
+	}
+
+	// 3. Address flow analysis from tx data
+	onProgress?.('Computing address flow...', 70)
+	sections.push(...buildAddressFlowFromTxs(allTxs))
+
+	return sections
+}
+
+// ── Address Flow Analysis ────────────────────────────────────────────
+
+function buildAddressFlowFromTxs(txs: BtcTx[]): ReportSection[] {
+	const sections: ReportSection[] = []
+
+	// Collect unique external addresses we sent to / received from
+	const sentToMap = new Map<string, { amount: number; count: number }>()
+	const recvFromMap = new Map<string, { amount: number; count: number }>()
+
+	for (const tx of txs) {
+		if (tx.direction === 'sent') {
+			for (const addr of tx.to) {
+				const e = sentToMap.get(addr) || { amount: 0, count: 0 }
+				e.amount += tx.value
+				e.count += 1
+				sentToMap.set(addr, e)
+			}
+		} else if (tx.direction === 'received') {
+			for (const addr of tx.from) {
+				const e = recvFromMap.get(addr) || { amount: 0, count: 0 }
+				e.amount += tx.value
+				e.count += 1
+				recvFromMap.set(addr, e)
+			}
+		}
+	}
+
+	const sentTo = Array.from(sentToMap.entries())
+		.map(([addr, d]) => ({ address: addr, amount: d.amount, count: d.count }))
+		.sort((a, b) => b.amount - a.amount)
+
+	const recvFrom = Array.from(recvFromMap.entries())
+		.map(([addr, d]) => ({ address: addr, amount: d.amount, count: d.count }))
+		.sort((a, b) => b.amount - a.amount)
+
+	const totalSent = sentTo.reduce((s, a) => s + a.amount, 0)
+	const totalRecv = recvFrom.reduce((s, a) => s + a.amount, 0)
+
+	sections.push({
+		title: '7. Address Flow Analysis',
+		type: 'summary',
+		data: [
+			`BTC Sent to: ${(totalSent / 1e8).toFixed(8)} BTC (${sentTo.length} unique addresses)`,
+			`BTC Received from: ${(totalRecv / 1e8).toFixed(8)} BTC (${recvFrom.length} unique addresses)`,
+		],
+	})
+
+	if (sentTo.length > 0) {
+		sections.push({
+			title: `Sent To (${sentTo.length})`,
+			type: 'table',
+			data: {
+				headers: ['#', 'Address', 'Amount (BTC)', 'TX Count'],
+				widths: ['6%', '54%', '25%', '15%'],
+				rows: sentTo.slice(0, 100).map((a, i) => [
+					(i + 1).toString(), a.address,
+					(a.amount / 1e8).toFixed(8), a.count.toString(),
+				]),
+			},
+		})
+	}
+
+	if (recvFrom.length > 0) {
+		sections.push({
+			title: `Received From (${recvFrom.length})`,
+			type: 'table',
+			data: {
+				headers: ['#', 'Address', 'Amount (BTC)', 'TX Count'],
+				widths: ['6%', '54%', '25%', '15%'],
+				rows: recvFrom.slice(0, 100).map((a, i) => [
+					(i + 1).toString(), a.address,
+					(a.amount / 1e8).toFixed(8), a.count.toString(),
+				]),
+			},
+		})
+	}
+
+	return sections
+}
+
+// ── Main Report Generator ────────────────────────────────────────────
+
+export interface GenerateReportOptions {
+	balances: ChainBalance[]
+	btcXpubs?: Array<{ xpub: string; scriptType: string; path: number[] }>
+	deviceId?: string
+	deviceLabel?: string
+	onProgress?: (message: string, percent: number) => void
+}
+
+export async function generateReport(opts: GenerateReportOptions): Promise<ReportData> {
+	const { btcXpubs, deviceId, deviceLabel, onProgress } = opts
+	// Clone balances to avoid mutating the caller's data
+	const balances = opts.balances.map(b => ({ ...b }))
+	const baseUrl = getPioneerBase()
+	const sections: ReportSection[] = []
+	const now = new Date()
+
+	onProgress?.('Starting report generation...', 5)
+
+	// ── Pre-flight: Ensure BTC balance is in the balances array ──
+	// The cached balances may have BTC at $0 because GetPortfolio (charts/portfolio)
+	// doesn't return BTC data. Fetch it directly before building overview sections.
+	let btcSectionsResult: ReportSection[] = []
+	if (btcXpubs && btcXpubs.length > 0) {
+		const btcEntry = balances.find(b => b.chainId === 'bitcoin' || b.symbol === 'BTC')
+		const btcHasBalance = btcEntry && parseFloat(btcEntry.balance) > 0
+
+		if (!btcHasBalance) {
+			console.log('[reports] BTC missing/zero in cached balances — fetching from Pioneer directly')
+			try {
+				let totalSats = 0
+				for (const x of btcXpubs) {
+					if (!x.xpub) continue
+					const info = await fetchPubkeyInfo(baseUrl, x.xpub)
+					totalSats += Math.round(Number(info.balance || 0))
+				}
+				if (totalSats > 0) {
+					const btcBalance = totalSats / 1e8
+					// Fetch BTC price from Pioneer market endpoint
+					let btcUsd = 0
+					try {
+						const priceResp = await fetchWithTimeout(
+							`${baseUrl}/api/v1/market/info`,
+							{
+								method: 'POST',
+								headers: { 'Content-Type': 'application/json', 'Authorization': getPioneerQueryKey() },
+								body: JSON.stringify([BTC_CAIP]),
+							},
+							10_000,
+						)
+						if (priceResp.ok) {
+							const priceData = await priceResp.json()
+							const price = priceData?.data?.[0] || priceData?.[0] || 0
+							btcUsd = btcBalance * (typeof price === 'number' ? price : parseFloat(String(price)) || 0)
+						}
+					} catch (e: any) {
+						console.warn('[reports] BTC price fetch failed:', e.message)
+					}
+
+					// Inject or update BTC in balances array
+					if (btcEntry) {
+						btcEntry.balance = btcBalance.toFixed(8)
+						btcEntry.balanceUsd = btcUsd
+						console.log(`[reports] Updated BTC in balances: ${btcBalance.toFixed(8)} BTC, $${btcUsd.toFixed(2)}`)
+					} else {
+						balances.push({
+							chainId: 'bitcoin', symbol: 'BTC',
+							balance: btcBalance.toFixed(8),
+							balanceUsd: btcUsd,
+							address: btcXpubs[0]?.xpub || '',
+						})
+						console.log(`[reports] Injected BTC into balances: ${btcBalance.toFixed(8)} BTC, $${btcUsd.toFixed(2)}`)
+					}
+				}
+			} catch (e: any) {
+				console.warn('[reports] BTC balance pre-fetch failed:', e.message)
+			}
+		}
+	}
+
+	// 1. Device Information
+	sections.push(buildDeviceFeaturesSection())
+
+	// 2. Portfolio Overview (now includes corrected BTC balance)
+	sections.push(buildPortfolioOverviewSection(balances))
+
+	// 3. Chain Balances (now includes corrected BTC balance)
+	sections.push(buildChainBalancesSection(balances))
+
+	// 4. Cached Pubkeys & XPUBs
+	if (deviceId) {
+		sections.push(...buildCachedPubkeysSection(deviceId, btcXpubs))
+	} else if (btcXpubs && btcXpubs.length > 0) {
+		// No deviceId but have xpubs — still include them
+		sections.push(...buildCachedPubkeysSection('unknown', btcXpubs))
+	}
+
+	// 5. Token Details
+	sections.push(...buildTokenDetailsSections(balances))
+
+	// 6 & 7. BTC Detailed Report + Address Flow (via /utxo/pubkey-info + /tx/history)
+	console.log(`[reports] BTC section check: btcXpubs=${btcXpubs?.length ?? 0}`)
+	if (btcXpubs && btcXpubs.length > 0) {
+		try {
+			const btcSections = await buildBtcSections(baseUrl, btcXpubs, onProgress)
+			sections.push(...btcSections)
+			onProgress?.('BTC report complete', 80)
+		} catch (e: any) {
+			console.warn('[reports] BTC report failed:', e.message)
+			sections.push({
+				title: '6. BTC Detailed Report',
+				type: 'text',
+				data: `Failed to fetch BTC data: ${e.message}. Cached balance data is included above.`,
+			})
+			onProgress?.('BTC report failed, using cached data', 80)
+		}
+	}
+
+	onProgress?.('Finalizing report...', 90)
+
+	console.log(`[reports] Report generated: ${sections.length} sections`)
+	for (const s of sections) {
+		const count = s.type === 'table' ? ` (${s.data?.rows?.length || 0} rows)` : ''
+		console.log(`  - [${s.type}] ${s.title}${count}`)
+	}
+
+	return {
+		title: `${deviceLabel || 'KeepKey'} Portfolio Report`,
+		subtitle: `Full Wallet Analysis — ${balances.length} Chains`,
+		generatedDate: now.toLocaleDateString('en-US', { year: 'numeric', month: 'long', day: 'numeric' }),
+		chain: 'all',
+		sections,
+	}
+}
+
+// ── CSV Export ────────────────────────────────────────────────────────
+
+/** Escape a cell value for CSV: quote wrapping + formula injection prevention */
+function csvCell(value: any): string {
+	let s = String(value ?? '').replace(/"/g, '""')
+	// Prevent formula injection: trim leading whitespace then prefix dangerous chars
+	const trimmed = s.trimStart()
+	if (/^[=+\-@\t\r\n]/.test(trimmed)) s = `'${s}`
+	return `"${s}"`
+}
+
+export function reportToCsv(data: ReportData): string {
+	const lines: string[] = []
+
+	lines.push(csvCell(data.title))
+	lines.push(csvCell(data.subtitle))
+	lines.push(csvCell(`Generated: ${data.generatedDate}`))
+	lines.push('')
+
+	for (const section of data.sections) {
+		lines.push(csvCell(section.title))
+
+		switch (section.type) {
+			case 'table': {
+				const headers = section.data.headers || []
+				const rows = section.data.rows || []
+				lines.push(headers.map((h: string) => csvCell(h)).join(','))
+				for (const row of rows) {
+					lines.push(row.map((cell: any) => csvCell(cell)).join(','))
+				}
+				break
+			}
+			case 'summary':
+			case 'list': {
+				const items = Array.isArray(section.data) ? section.data : [section.data]
+				for (const item of items) {
+					lines.push(csvCell(item))
+				}
+				break
+			}
+			case 'text': {
+				lines.push(csvCell(section.data))
+				break
+			}
+		}
+
+		lines.push('')
+	}
+
+	return lines.join('\n')
+}
+
+// ── PDF Export (pdf-lib — Bun-compatible) ────────────────────────────
+
+const MARGIN_LEFT = 40
+const MARGIN_RIGHT = 40
+const MARGIN_TOP = 50
+const MARGIN_BOTTOM = 50
+const ROW_HEIGHT = 14
+const SECTION_GAP = 20
+const GOLD = { r: 1, g: 0.843, b: 0 }
+const ALT_ROW = { r: 0.94, g: 0.94, b: 0.94 }
+const TEXT_COLOR = { r: 0.2, g: 0.2, b: 0.2 }
+const MUTED_COLOR = { r: 0.6, g: 0.6, b: 0.6 }
+
+/**
+ * Sanitize text for pdf-lib StandardFonts (WinAnsi encoding only).
+ * Strips characters outside the printable ASCII + Latin-1 Supplement range.
+ */
+function sanitize(text: string): string {
+	if (!text) return ''
+	// Replace common unicode with ASCII equivalents, then strip anything outside WinAnsi
+	return text
+		.replace(/[\u2018\u2019]/g, "'")
+		.replace(/[\u201C\u201D]/g, '"')
+		.replace(/\u2026/g, '...')
+		.replace(/\u2014/g, '--')
+		.replace(/\u2013/g, '-')
+		.replace(/[^\x20-\x7E\xA0-\xFF]/g, '?')
+}
+
+export async function reportToPdfBuffer(data: ReportData): Promise<Buffer> {
+	const { PDFDocument, StandardFonts, rgb, degrees } = await import('pdf-lib')
+
+	console.log('[reports] Starting PDF generation...')
+
+	const doc = await PDFDocument.create()
+	const font = await doc.embedFont(StandardFonts.Helvetica)
+	const bold = await doc.embedFont(StandardFonts.HelveticaBold)
+
+	// Landscape Letter: 792 x 612
+	const pageW = 792
+	const pageH = 612
+	const contentW = pageW - MARGIN_LEFT - MARGIN_RIGHT
+
+	let page = doc.addPage([pageW, pageH])
+	let pageNum = 1
+	let y = pageH - MARGIN_TOP
+
+	function newPage() {
+		page.drawText(`Page ${pageNum}`, {
+			x: pageW / 2 - 20, y: 25,
+			font, size: 9, color: rgb(MUTED_COLOR.r, MUTED_COLOR.g, MUTED_COLOR.b),
+		})
+		page = doc.addPage([pageW, pageH])
+		pageNum++
+		y = pageH - MARGIN_TOP
+	}
+
+	function needSpace(needed: number) {
+		if (y - needed < MARGIN_BOTTOM) newPage()
+	}
+
+	function safeDrawText(text: string, x: number, yPos: number, f: any, s: number, c: { r: number; g: number; b: number }, maxW?: number) {
+		let t = sanitize(text)
+		if (maxW && maxW > 0 && t.length > 0 && f.widthOfTextAtSize(t, s) > maxW) {
+			// Binary search for the longest string that fits
+			let lo = 0, hi = t.length
+			while (lo < hi) {
+				const mid = (lo + hi + 1) >> 1
+				if (f.widthOfTextAtSize(t.slice(0, mid), s) <= maxW) lo = mid
+				else hi = mid - 1
+			}
+			if (lo < t.length && lo > 2) {
+				t = t.slice(0, lo - 2) + '..'
+			} else if (lo < t.length) {
+				t = t.slice(0, lo)
+			}
+		}
+		if (!t) return
+		try {
+			page.drawText(t, { x, y: yPos, font: f, size: s, color: rgb(c.r, c.g, c.b) })
+		} catch (e: any) {
+			console.warn('[reports] PDF drawText failed for:', JSON.stringify(t.slice(0, 40)), e.message)
+		}
+	}
+
+	// ── Page 1: Dashboard + Pie Chart ────────────────────────────
+
+	// Extract chain balance data for pie chart
+	const balancesSection = data.sections.find(s => s.title?.includes('Chain Balances') && s.type === 'table')
+	const overviewSection = data.sections.find(s => s.title?.includes('Portfolio Overview') && s.type === 'summary')
+
+	// Parse chain balances for pie chart
+	interface ChainSlice { symbol: string; usd: number; color: { r: number; g: number; b: number } }
+	const slices: ChainSlice[] = []
+	let totalPortfolioUsd = 0
+
+	if (balancesSection?.data?.rows) {
+		const PIE_COLORS = [
+			{ r: 1.0, g: 0.843, b: 0.0 },   // Gold (BTC)
+			{ r: 0.29, g: 0.33, b: 0.91 },   // Blue (ETH)
+			{ r: 0.15, g: 0.78, b: 0.47 },   // Green
+			{ r: 0.91, g: 0.30, b: 0.24 },   // Red
+			{ r: 0.58, g: 0.29, b: 0.91 },   // Purple
+			{ r: 0.95, g: 0.61, b: 0.07 },   // Orange
+			{ r: 0.20, g: 0.71, b: 0.83 },   // Cyan
+			{ r: 0.83, g: 0.21, b: 0.51 },   // Pink
+			{ r: 0.44, g: 0.73, b: 0.27 },   // Lime
+			{ r: 0.60, g: 0.60, b: 0.60 },   // Gray (Other)
+		]
+		// balancesSection rows: [Chain, Symbol, Balance, USD, Address, Tokens]
+		for (const row of balancesSection.data.rows) {
+			const usdStr = String(row[3] || '0').replace(/[$,]/g, '')
+			const usd = parseFloat(usdStr) || 0
+			if (usd > 0) {
+				slices.push({ symbol: String(row[1] || '?'), usd, color: PIE_COLORS[Math.min(slices.length, PIE_COLORS.length - 1)] })
+				totalPortfolioUsd += usd
+			}
+		}
+	}
+
+	// Title
+	const title = sanitize(data.title)
+	const titleW = bold.widthOfTextAtSize(title, 22)
+	safeDrawText(title, (pageW - titleW) / 2, y, bold, 22, { r: 0.15, g: 0.15, b: 0.15 })
+	y -= 26
+
+	const subtitle = sanitize(data.subtitle)
+	const subW = font.widthOfTextAtSize(subtitle, 13)
+	safeDrawText(subtitle, (pageW - subW) / 2, y, font, 13, { r: 0.4, g: 0.4, b: 0.4 })
+	y -= 18
+
+	const dateStr = sanitize(`Generated on ${data.generatedDate}`)
+	const dateW = font.widthOfTextAtSize(dateStr, 10)
+	safeDrawText(dateStr, (pageW - dateW) / 2, y, font, 10, MUTED_COLOR)
+	y -= 30
+
+	// Gold divider line
+	page.drawRectangle({
+		x: MARGIN_LEFT, y: y,
+		width: contentW, height: 2,
+		color: rgb(GOLD.r, GOLD.g, GOLD.b),
+	})
+	y -= 30
+
+	// ── Total Portfolio Value (big number) ──
+	const totalStr = `$${totalPortfolioUsd.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`
+	const totalLabel = 'Total Portfolio Value'
+	const totalLabelW = font.widthOfTextAtSize(totalLabel, 11)
+	const totalValW = bold.widthOfTextAtSize(totalStr, 28)
+	safeDrawText(totalLabel, (pageW - totalLabelW) / 2, y, font, 11, MUTED_COLOR)
+	y -= 34
+	safeDrawText(totalStr, (pageW - totalValW) / 2, y, bold, 28, { r: 0.15, g: 0.15, b: 0.15 })
+	y -= 40
+
+	// ── Layout: Pie chart (left), Legend (right) ──
+	if (slices.length > 0) {
+		const pieRadius = 110
+		const pieCenterX = MARGIN_LEFT + pieRadius + 40
+		const pieCenterY = y - pieRadius - 10
+		const legendX = pieCenterX + pieRadius + 60
+
+		// Draw pie chart using thick radial lines (optimized: ~4x fewer draw ops)
+		let startAngle = -Math.PI / 2 // start from top
+		for (const slice of slices) {
+			const fraction = slice.usd / totalPortfolioUsd
+			const sweepAngle = fraction * 2 * Math.PI
+			// Use thicker lines with wider steps to reduce draw operations
+			const fillSteps = Math.max(8, Math.ceil(sweepAngle / 0.04))
+			const fillStep = sweepAngle / fillSteps
+			for (let i = 0; i <= fillSteps; i++) {
+				const a = startAngle + i * fillStep
+				const ex = pieCenterX + pieRadius * Math.cos(a)
+				const ey = pieCenterY + pieRadius * Math.sin(a)
+				page.drawLine({
+					start: { x: pieCenterX, y: pieCenterY },
+					end: { x: ex, y: ey },
+					thickness: 4,
+					color: rgb(slice.color.r, slice.color.g, slice.color.b),
+				})
+			}
+			startAngle += sweepAngle
+		}
+
+		// Draw white circle in center for donut effect (optimized: wider step)
+		const innerR = pieRadius * 0.45
+		for (let a = 0; a < Math.PI * 2; a += 0.03) {
+			page.drawLine({
+				start: { x: pieCenterX, y: pieCenterY },
+				end: { x: pieCenterX + innerR * Math.cos(a), y: pieCenterY + innerR * Math.sin(a) },
+				thickness: 4,
+				color: rgb(1, 1, 1),
+			})
+		}
+
+		// Center text in donut hole
+		const chainCountStr = `${slices.length} Chains`
+		const ccW = bold.widthOfTextAtSize(chainCountStr, 12)
+		safeDrawText(chainCountStr, pieCenterX - ccW / 2, pieCenterY - 4, bold, 12, { r: 0.3, g: 0.3, b: 0.3 })
+
+		// ── Legend (right side) ──
+		let legendY = y - 10
+		safeDrawText('Asset Allocation', legendX, legendY, bold, 13, { r: 0.2, g: 0.2, b: 0.2 })
+		legendY -= 24
+
+		for (const slice of slices.slice(0, 12)) {
+			const pct = ((slice.usd / totalPortfolioUsd) * 100).toFixed(1)
+			const usdStr = `$${slice.usd.toLocaleString('en-US', { minimumFractionDigits: 2, maximumFractionDigits: 2 })}`
+
+			// Color swatch
+			page.drawRectangle({
+				x: legendX, y: legendY - 2,
+				width: 12, height: 12,
+				color: rgb(slice.color.r, slice.color.g, slice.color.b),
+			})
+
+			safeDrawText(slice.symbol, legendX + 18, legendY, bold, 10, { r: 0.2, g: 0.2, b: 0.2 })
+			safeDrawText(`${pct}%`, legendX + 70, legendY, font, 10, MUTED_COLOR)
+			safeDrawText(usdStr, legendX + 110, legendY, font, 10, TEXT_COLOR)
+			legendY -= 18
+		}
+
+		if (slices.length > 12) {
+			safeDrawText(`... and ${slices.length - 12} more`, legendX + 18, legendY, font, 9, MUTED_COLOR)
+		}
+
+		y = pieCenterY - pieRadius - 30
+	}
+
+	// ── Dashboard Summary Stats ──
+	if (overviewSection && Array.isArray(overviewSection.data)) {
+		needSpace(100)
+		y -= 10
+		page.drawRectangle({
+			x: MARGIN_LEFT, y: y - 70,
+			width: contentW, height: 70,
+			color: rgb(0.96, 0.96, 0.96),
+		})
+		// Render overview items in a row
+		const items = overviewSection.data.filter((s: string) => typeof s === 'string')
+		const colW = contentW / Math.min(items.length, 4)
+		let statX = MARGIN_LEFT + 15
+		for (let i = 0; i < Math.min(items.length, 4); i++) {
+			const parts = String(items[i]).split(':')
+			const label = sanitize(parts[0]?.trim() || '')
+			const value = sanitize(parts.slice(1).join(':').trim() || '')
+			safeDrawText(label, statX, y - 22, font, 9, MUTED_COLOR)
+			safeDrawText(value, statX, y - 40, bold, 13, { r: 0.15, g: 0.15, b: 0.15 })
+			statX += colW
+		}
+		y -= 90
+	}
+
+	// Page 1 footer
+	page.drawText(`Page ${pageNum}`, {
+		x: pageW / 2 - 20, y: 25,
+		font, size: 9, color: rgb(MUTED_COLOR.r, MUTED_COLOR.g, MUTED_COLOR.b),
+	})
+
+	// ── Page 2+: Detail Sections ─────────────────────────────────
+	newPage()
+
+	// ── Sections ─────────────────────────────────────────────────
+	for (const section of data.sections) {
+		needSpace(ROW_HEIGHT * 3)
+		safeDrawText(sanitize(section.title), MARGIN_LEFT, y, bold, 13, { r: 0.2, g: 0.2, b: 0.2 })
+		y -= ROW_HEIGHT + 4
+
+		switch (section.type) {
+			case 'table': {
+				const headers: string[] = section.data.headers || []
+				const rows: string[][] = section.data.rows || []
+				const widthPcts: string[] = section.data.widths || []
+				if (headers.length === 0 || rows.length === 0) break
+
+				const colWidths = widthPcts.map((w: string) => {
+					const pct = parseFloat(w)
+					return isNaN(pct) ? contentW / headers.length : (pct / 100) * contentW
+				})
+				while (colWidths.length < headers.length) colWidths.push(contentW / headers.length)
+
+				// Gold header row
+				needSpace(ROW_HEIGHT + 4)
+				page.drawRectangle({
+					x: MARGIN_LEFT - 2, y: y - 4,
+					width: contentW + 4, height: ROW_HEIGHT + 2,
+					color: rgb(GOLD.r, GOLD.g, GOLD.b),
+				})
+				let colX = MARGIN_LEFT
+				for (let i = 0; i < headers.length; i++) {
+					safeDrawText(headers[i], colX + 2, y, bold, 8, { r: 0, g: 0, b: 0 }, colWidths[i] - 4)
+					colX += colWidths[i]
+				}
+				y -= ROW_HEIGHT + 2
+
+				// Data rows
+				for (let rowIdx = 0; rowIdx < rows.length; rowIdx++) {
+					needSpace(ROW_HEIGHT)
+					if (rowIdx % 2 === 0) {
+						page.drawRectangle({
+							x: MARGIN_LEFT - 2, y: y - 4,
+							width: contentW + 4, height: ROW_HEIGHT,
+							color: rgb(ALT_ROW.r, ALT_ROW.g, ALT_ROW.b),
+						})
+					}
+					colX = MARGIN_LEFT
+					const row = rows[rowIdx]
+					for (let i = 0; i < row.length && i < headers.length; i++) {
+						safeDrawText(String(row[i] ?? ''), colX + 2, y, font, 7, TEXT_COLOR, colWidths[i] - 4)
+						colX += colWidths[i]
+					}
+					y -= ROW_HEIGHT
+				}
+				y -= 6
+				break
+			}
+
+			case 'summary':
+			case 'list': {
+				const items: string[] = Array.isArray(section.data) ? section.data : [section.data]
+				for (const item of items) {
+					needSpace(ROW_HEIGHT)
+					safeDrawText('- ' + sanitize(String(item)), MARGIN_LEFT + 10, y, font, 9, TEXT_COLOR)
+					y -= ROW_HEIGHT
+				}
+				y -= 4
+				break
+			}
+
+			case 'text': {
+				const fullText = sanitize(String(section.data))
+				const words = fullText.split(' ')
+				let line = ''
+				for (const word of words) {
+					const test = line ? `${line} ${word}` : word
+					if (font.widthOfTextAtSize(test, 9) > contentW - 20) {
+						needSpace(ROW_HEIGHT)
+						safeDrawText(line, MARGIN_LEFT + 10, y, font, 9, TEXT_COLOR)
+						y -= ROW_HEIGHT
+						line = word
+					} else {
+						line = test
+					}
+				}
+				if (line) {
+					needSpace(ROW_HEIGHT)
+					safeDrawText(line, MARGIN_LEFT + 10, y, font, 9, TEXT_COLOR)
+					y -= ROW_HEIGHT
+				}
+				y -= 4
+				break
+			}
+		}
+
+		y -= SECTION_GAP / 2
+	}
+
+	// Footer on last page
+	page.drawText(`Page ${pageNum}`, {
+		x: pageW / 2 - 20, y: 25,
+		font, size: 9, color: rgb(MUTED_COLOR.r, MUTED_COLOR.g, MUTED_COLOR.b),
+	})
+
+	const bytes = await doc.save()
+	console.log(`[reports] PDF generated: ${bytes.length} bytes, ${pageNum} pages`)
+	return Buffer.from(bytes)
+}
diff --git a/projects/keepkey-vault/src/bun/rest-api.ts b/projects/keepkey-vault/src/bun/rest-api.ts
index cbee53f9..3762eb50 100644
--- a/projects/keepkey-vault/src/bun/rest-api.ts
+++ b/projects/keepkey-vault/src/bun/rest-api.ts
@@ -1249,6 +1249,11 @@ export function startRestApi(engine: EngineController, auth: AuthStore, port = 1
                 } else if (coinType === 118 || coinType === 931) {
                   const r = await wallet.cosmosGetAddress({ addressNList: addrNList, showDisplay: false })
                   address = typeof r === 'string' ? r : r?.address || ''
+                } else if (coinType === 501) {
+                  // Solana uses ed25519 with 4-element path (m/44'/501'/0'/0') — don't extend to 5
+                  const solNList = p.address_n
+                  const r = await wallet.solanaGetAddress({ addressNList: solNList, showDisplay: false })
+                  address = typeof r === 'string' ? r : (r as any)?.address || ''
                 }
 
                 if (address) {
diff --git a/projects/keepkey-vault/src/bun/tax-export.ts b/projects/keepkey-vault/src/bun/tax-export.ts
new file mode 100644
index 00000000..0f29b8cf
--- /dev/null
+++ b/projects/keepkey-vault/src/bun/tax-export.ts
@@ -0,0 +1,260 @@
+/**
+ * Tax export formatters for KeepKey Vault v11.
+ *
+ * Converts ReportData (generated by reports.ts) into:
+ *   - CoinTracker CSV
+ *   - ZenLedger CSV
+ *
+ * Transaction data is extracted from the "Transaction Details" or
+ * "Transaction History" sections stored in the report.
+ */
+
+import type { ReportData, ReportSection } from '../shared/types'
+import { SECTION_TITLES } from './reports'
+
+// ── Internal canonical transaction model ────────────────────────────
+
+export type TaxTxType =
+	| 'transfer'
+	| 'swap'
+	| 'buy'
+	| 'sell'
+	| 'staking_reward'
+	| 'mining_reward'
+	| 'airdrop'
+	| 'fee'
+
+export interface TaxTransaction {
+	id: string
+	timestamp: string   // ISO-8601 UTC  e.g. "2024-01-01 14:33:10"
+	txHash: string
+	type: TaxTxType
+	assetSent: string
+	amountSent: number
+	assetReceived: string
+	amountReceived: number
+	feeAsset: string
+	feeAmount: number
+	fromAddress: string
+	toAddress: string
+	notes: string
+}
+
+// ── Extract transactions from ReportData ────────────────────────────
+
+/**
+ * Parse BTC transaction data from report sections.
+ *
+ * Prefers "Transaction Details" table (has From/To columns) over
+ * "Transaction History" table (lacks address columns).
+ */
+export function extractTransactionsFromReport(data: ReportData): TaxTransaction[] {
+	const txs: TaxTransaction[] = []
+
+	// Find the detailed transaction table first (has From/To)
+	let txSection = data.sections.find(
+		s => s.type === 'table' && s.title.startsWith(SECTION_TITLES.TX_DETAILS),
+	)
+	let useDetailed = true
+
+	// Fallback to Transaction History (less detail)
+	if (!txSection) {
+		txSection = data.sections.find(
+			s => s.type === 'table' && s.title.startsWith(SECTION_TITLES.TX_HISTORY),
+		)
+		useDetailed = false
+	}
+
+	if (!txSection || txSection.type !== 'table') return txs
+
+	const rows = txSection.data.rows || []
+	const headers = txSection.data.headers || []
+
+	for (const row of rows) {
+		if (useDetailed) {
+			// Transaction Details: [TXID, Dir, Block, Date, Value (BTC), Fee (BTC), From, To]
+			if (row.length < 8) { console.warn(`[TaxExport] Skipping row with ${row.length} cols, expected 8`); continue }
+			const txid = String(row[0] || '')
+			const dir = String(row[1] || '').toLowerCase()
+			const date = String(row[3] || '')
+			const value = parseNum(row[4])
+			const fee = parseNum(row[5])
+			const from = String(row[6] || '')
+			const to = String(row[7] || '')
+
+			txs.push(buildBtcTx(txid, dir, date, value, fee, from, to))
+		} else {
+			// Transaction History: [#, Dir, TXID, Block, Date, Value (BTC), Fee (BTC)]
+			if (row.length < 7) { console.warn(`[TaxExport] Skipping row with ${row.length} cols, expected 7`); continue }
+			const txid = String(row[2] || '')
+			const dir = String(row[1] || '').toLowerCase()
+			const date = String(row[4] || '')
+			const value = parseNum(row[5])
+			const fee = parseNum(row[6])
+
+			txs.push(buildBtcTx(txid, dir, date, value, fee, '', ''))
+		}
+	}
+
+	return txs
+}
+
+
+
+function parseNum(val: any): number {
+	const n = parseFloat(String(val ?? '0'))
+	return isNaN(n) ? 0 : n
+}
+
+function buildBtcTx(
+	txid: string, dir: string, date: string,
+	value: number, fee: number,
+	from: string, to: string,
+): TaxTransaction {
+	const isReceived = dir === 'received'
+	return {
+		id: txid,
+		timestamp: normalizeTimestamp(date),
+		txHash: txid,
+		type: 'transfer',
+		assetSent: isReceived ? '' : 'BTC',
+		amountSent: isReceived ? 0 : value,
+		assetReceived: isReceived ? 'BTC' : '',
+		amountReceived: isReceived ? value : 0,
+		feeAsset: fee > 0 ? 'BTC' : '',
+		feeAmount: fee,
+		fromAddress: from,
+		toAddress: to,
+		notes: '',
+	}
+}
+
+/** Normalize date strings to "YYYY-MM-DD HH:MM:SS" format accepted by tax software */
+function normalizeTimestamp(date: string): string {
+	if (!date || date === 'Pending') return ''
+	// Already in "2024-01-01 14:33:10" format from report
+	if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(date)) return date
+	// ISO format "2024-01-01T14:33:10Z" → "2024-01-01 14:33:10"
+	if (/^\d{4}-\d{2}-\d{2}T/.test(date)) return date.replace('T', ' ').replace('Z', '').substring(0, 19)
+	return date
+}
+
+// ── CSV safety ──────────────────────────────────────────────────────
+
+/** Escape a cell value for CSV: quote wrapping + formula injection prevention */
+function csvCell(value: any): string {
+	let s = String(value ?? '').replace(/"/g, '""')
+	const trimmed = s.trimStart()
+	if (/^[=+\-@\t\r\n]/.test(trimmed)) s = `'${s}`
+	return `"${s}"`
+}
+
+// ── CoinTracker CSV ─────────────────────────────────────────────────
+
+const COINTRACKER_HEADERS = [
+	'Date',
+	'Received Quantity',
+	'Received Currency',
+	'Sent Quantity',
+	'Sent Currency',
+	'Fee Amount',
+	'Fee Currency',
+	'Tag',
+]
+
+function coinTrackerTag(tx: TaxTransaction): string {
+	switch (tx.type) {
+		case 'swap': return 'trade'
+		case 'buy': return 'trade'
+		case 'sell': return 'trade'
+		case 'staking_reward': return 'staking'
+		case 'mining_reward': return 'mining'
+		case 'airdrop': return 'airdrop'
+		case 'fee': return 'withdrawal'
+		case 'transfer':
+		default: {
+			if (tx.amountReceived > 0 && tx.amountSent === 0) return 'deposit'
+			if (tx.amountSent > 0 && tx.amountReceived === 0) return 'withdrawal'
+			if (tx.amountSent > 0 && tx.amountReceived > 0) return 'trade'
+			return 'transfer'
+		}
+	}
+}
+
+export function toCoinTrackerCsv(txs: TaxTransaction[]): string {
+	const lines: string[] = []
+	lines.push(COINTRACKER_HEADERS.join(','))
+
+	for (const tx of txs) {
+		if (!tx.timestamp) continue  // skip pending
+		lines.push([
+			csvCell(tx.timestamp),
+			tx.amountReceived > 0 ? csvCell(tx.amountReceived) : csvCell(''),
+			tx.assetReceived ? csvCell(tx.assetReceived) : csvCell(''),
+			tx.amountSent > 0 ? csvCell(tx.amountSent) : csvCell(''),
+			tx.assetSent ? csvCell(tx.assetSent) : csvCell(''),
+			tx.feeAmount > 0 ? csvCell(tx.feeAmount) : csvCell(''),
+			tx.feeAsset ? csvCell(tx.feeAsset) : csvCell(''),
+			csvCell(coinTrackerTag(tx)),
+		].join(','))
+	}
+
+	return lines.join('\n')
+}
+
+// ── ZenLedger CSV ───────────────────────────────────────────────────
+
+const ZENLEDGER_HEADERS = [
+	'Timestamp',
+	'Transaction Type',
+	'Base Currency',
+	'Base Amount',
+	'Quote Currency',
+	'Quote Amount',
+	'Fee Currency',
+	'Fee Amount',
+	'Exchange',
+	'Transaction ID',
+]
+
+function zenLedgerType(tx: TaxTransaction): string {
+	switch (tx.type) {
+		case 'swap': return 'trade'
+		case 'buy': return 'trade'
+		case 'sell': return 'trade'
+		case 'staking_reward': return 'income'
+		case 'mining_reward': return 'mining'
+		case 'airdrop': return 'airdrop'
+		case 'fee': return 'spend'
+		case 'transfer':
+		default: {
+			if (tx.amountReceived > 0 && tx.amountSent === 0) return 'deposit'
+			if (tx.amountSent > 0 && tx.amountReceived === 0) return 'withdrawal'
+			if (tx.amountSent > 0 && tx.amountReceived > 0) return 'trade'
+			return 'transfer'
+		}
+	}
+}
+
+export function toZenLedgerCsv(txs: TaxTransaction[]): string {
+	const lines: string[] = []
+	lines.push(ZENLEDGER_HEADERS.join(','))
+
+	for (const tx of txs) {
+		if (!tx.timestamp) continue  // skip pending
+		lines.push([
+			csvCell(tx.timestamp),
+			csvCell(zenLedgerType(tx)),
+			tx.assetReceived ? csvCell(tx.assetReceived) : csvCell(''),
+			tx.amountReceived > 0 ? csvCell(tx.amountReceived) : csvCell(''),
+			tx.assetSent ? csvCell(tx.assetSent) : csvCell(''),
+			tx.amountSent > 0 ? csvCell(tx.amountSent) : csvCell(''),
+			tx.feeAsset ? csvCell(tx.feeAsset) : csvCell(''),
+			tx.feeAmount > 0 ? csvCell(tx.feeAmount) : csvCell(''),
+			csvCell('KeepKey'),
+			csvCell(tx.txHash),
+		].join(','))
+	}
+
+	return lines.join('\n')
+}
diff --git a/projects/keepkey-vault/src/mainview/App.tsx b/projects/keepkey-vault/src/mainview/App.tsx
index 14708f55..bc39deb2 100644
--- a/projects/keepkey-vault/src/mainview/App.tsx
+++ b/projects/keepkey-vault/src/mainview/App.tsx
@@ -113,16 +113,21 @@ function App() {
 
 	const handlePassphraseSubmit = useCallback(async (passphrase: string) => {
 		try { await rpcRequest("sendPassphrase", { passphrase }) } catch (e) { console.error("sendPassphrase:", e) }
-		setPinRequestType(null) // ensure PIN overlay stays cleared
-		setPassphraseRequested(false)
+		setPinRequestType(null)
+		// Don't dismiss overlay here — sendPassphrase returns instantly (omitLock/noWait)
+		// but the device still needs physical confirmation. The overlay stays visible
+		// showing "Confirm on your KeepKey" until state transitions to 'ready'.
 	}, [])
 
 	const handlePassphraseCancel = useCallback(() => { setPinRequestType(null); setPassphraseRequested(false) }, [])
 
-	// Auto-show passphrase overlay when device needs passphrase
+	// Auto-show passphrase overlay when device needs passphrase;
+	// auto-dismiss when device leaves needs_passphrase (e.g. → ready).
 	useEffect(() => {
 		if (deviceState.state === "needs_passphrase" && !passphraseRequested) {
 			setPassphraseRequested(true)
+		} else if (deviceState.state !== "needs_passphrase" && passphraseRequested) {
+			setPassphraseRequested(false)
 		}
 	}, [deviceState.state, passphraseRequested])
 
@@ -154,15 +159,13 @@ function App() {
 	const [signingRequest, setSigningRequest] = useState<SigningRequestInfo | null>(null)
 
 	useEffect(() => {
-		return onRpcMessage("signing-request", (payload) => {
+		const unsub1 = onRpcMessage("signing-request", (payload) => {
 			setSigningRequest(payload as SigningRequestInfo)
 		})
-	}, [])
-
-	useEffect(() => {
-		return onRpcMessage("signing-dismissed", () => {
+		const unsub2 = onRpcMessage("signing-dismissed", () => {
 			setSigningRequest(null)
 		})
+		return () => { unsub1(); unsub2() }
 	}, [])
 
 	const handleApproveSign = useCallback(async () => {
@@ -183,8 +186,6 @@ function App() {
 	// ── API Audit Log ───────────────────────────────────────────────
 	const [auditLogOpen, setAuditLogOpen] = useState(false)
 	const [auditLogEntries, setAuditLogEntries] = useState<ApiLogEntry[]>([])
-	const auditAutoOpened = useCallback(() => {}, []) // placeholder ref
-
 	// Load persisted API logs from SQLite on mount
 	useEffect(() => {
 		rpcRequest<ApiLogEntry[]>("getApiLogs", { limit: 200 })
@@ -257,9 +258,12 @@ function App() {
 	}, [])
 
 	// Auto-show PIN for locked device (only once — respect user dismiss)
+	// Skip auto-show during any firmware operation phase — backend promptPin handles it with a delay
 	useEffect(() => {
-		if (deviceState.state === "needs_pin" && !pinRequestType && !pinDismissed) setPinRequestType("current")
-	}, [deviceState.state, pinRequestType, pinDismissed])
+		if (deviceState.state === "needs_pin" && !pinRequestType && !pinDismissed && (!deviceState.updatePhase || deviceState.updatePhase === "idle")) {
+			setPinRequestType("current")
+		}
+	}, [deviceState.state, deviceState.updatePhase, pinRequestType, pinDismissed])
 
 	// Clear overlays on ready or disconnect
 	useEffect(() => {
@@ -399,11 +403,14 @@ function App() {
 	const isClaimed = deviceState.state === "connected_unpaired" && !!deviceState.error
 
 	const phase: AppPhase =
-		isClaimed ? "claimed"
-		: !wizardComplete && setupInProgress ? "setup"
+		// Setup lock takes top priority — during OOB, transient states like
+		// isClaimed (LIBUSB_ERROR_ACCESS race) must not unmount the wizard.
+		!wizardComplete && setupInProgress ? "setup"
+		: isClaimed ? "claimed"
 		: ["disconnected", "connected_unpaired", "error"].includes(deviceState.state) ? "splash"
 		: !wizardComplete && ["bootloader", "needs_firmware", "needs_init"].includes(deviceState.state) ? "setup"
 		: deviceState.state === "ready" ? "ready"
+		: ["needs_pin", "needs_passphrase"].includes(deviceState.state) ? "splash"
 		: "splash"
 
 	// ── Overlays (render above everything, only one at a time) ──────
@@ -479,7 +486,8 @@ function App() {
 						connected={false}
 						firmwareVersion={undefined}
 						firmwareVerified={undefined}
-						onSettingsToggle={() => {}}
+						onSettingsToggle={() => setSettingsOpen((o) => !o)}
+						settingsOpen={settingsOpen}
 						activeTab="vault"
 						onTabChange={() => {}}
 						watchOnly
@@ -488,6 +496,14 @@ function App() {
 						<Dashboard watchOnly onLoaded={() => {}} />
 					</Flex>
 				</Flex>
+				<DeviceSettingsDrawer
+					open={settingsOpen}
+					onClose={() => setSettingsOpen(false)}
+					deviceState={deviceState}
+					appVersion={appVersion}
+					onCheckForUpdate={update.checkForUpdate}
+					updatePhase={update.phase}
+				/>
 			</>
 		)
 	}
@@ -536,7 +552,7 @@ function App() {
 	if (phase === "setup") {
 		return (
 			<>{splashNav}{resizeHandles}{updateBanner}{firmwareDropZone}{signingOverlay}{pairingOverlay}{passphraseOverlay}{charOverlay}{pinOverlay}
-				<OobSetupWizard onComplete={() => { setWizardComplete(true); setSetupInProgress(false) }} onSetupInProgress={setSetupInProgress} />
+				<OobSetupWizard onComplete={() => { setWizardComplete(true); setSetupInProgress(false) }} onSetupInProgress={setSetupInProgress} onWordCountChange={setRecoveryWordCount} />
 			</>
 		)
 	}
@@ -555,9 +571,11 @@ function App() {
 			>
 				<TopNav
 					label={deviceState.label}
-					connected={deviceState.state === "ready" || deviceState.state === "needs_pin" || deviceState.state === "needs_passphrase"}
+					connected={deviceState.state === "ready"}
 					firmwareVersion={deviceState.firmwareVersion}
 					firmwareVerified={deviceState.firmwareVerified}
+					needsFirmwareUpdate={deviceState.needsFirmwareUpdate}
+					latestFirmware={deviceState.latestFirmware}
 					onSettingsToggle={() => setSettingsOpen((o) => !o)}
 					settingsOpen={settingsOpen}
 					activeTab={activeTab}
@@ -579,6 +597,7 @@ function App() {
 				onOpenAuditLog={() => setAuditLogOpen(true)}
 				onOpenPairedApps={() => setPairedAppsOpen(true)}
 				onRestApiChanged={setRestApiEnabled}
+				onWordCountChange={setRecoveryWordCount}
 			/>
 			<ApiAuditLog
 				open={auditLogOpen}
diff --git a/projects/keepkey-vault/src/mainview/assets/logo/cointracker.png b/projects/keepkey-vault/src/mainview/assets/logo/cointracker.png
new file mode 100644
index 00000000..039c3a22
Binary files /dev/null and b/projects/keepkey-vault/src/mainview/assets/logo/cointracker.png differ
diff --git a/projects/keepkey-vault/src/mainview/assets/logo/zenledger.png b/projects/keepkey-vault/src/mainview/assets/logo/zenledger.png
new file mode 100644
index 00000000..e42b8ac9
Binary files /dev/null and b/projects/keepkey-vault/src/mainview/assets/logo/zenledger.png differ
diff --git a/projects/keepkey-vault/src/mainview/components/AssetPage.tsx b/projects/keepkey-vault/src/mainview/components/AssetPage.tsx
index f3b90c6c..89cd20a7 100644
--- a/projects/keepkey-vault/src/mainview/components/AssetPage.tsx
+++ b/projects/keepkey-vault/src/mainview/components/AssetPage.tsx
@@ -190,6 +190,8 @@ export function AssetPage({ chain, balance, onBack }: AssetPageProps) {
 
 	const hiddenCount = spamTokens.length + zeroValueTokens.length
 	const tokenTotalUsd = useMemo(() => cleanTokens.reduce((sum, t) => sum + (t.balanceUsd || 0), 0), [cleanTokens])
+	const spamTotalUsd = useMemo(() => spamTokens.reduce((sum, t) => sum + (t.balanceUsd || 0), 0), [spamTokens])
+	const cleanBalanceUsd = (balance?.balanceUsd || 0) - spamTotalUsd
 
 	const [showAddToken, setShowAddToken] = useState(false)
 	const isEvmChain = chain.chainFamily === 'evm'
@@ -390,8 +392,8 @@ export function AssetPage({ chain, balance, onBack }: AssetPageProps) {
 							<Text fontSize={{ base: "xs", md: "sm" }} fontFamily="mono" color="kk.textPrimary">
 								{balance.balance} {chain.symbol}
 							</Text>
-							{balance.balanceUsd > 0 && (
-								<AnimatedUsd value={balance.balanceUsd} prefix="($" suffix=")" fontSize="xs" color="white" fontWeight="500" display={{ base: "none", sm: "block" }} />
+							{cleanBalanceUsd > 0 && (
+								<AnimatedUsd value={cleanBalanceUsd} prefix="($" suffix=")" fontSize="xs" color="white" fontWeight="500" display={{ base: "none", sm: "block" }} />
 							)}
 						</Flex>
 					)}
diff --git a/projects/keepkey-vault/src/mainview/components/Dashboard.tsx b/projects/keepkey-vault/src/mainview/components/Dashboard.tsx
index f3f088c9..3ad183ed 100644
--- a/projects/keepkey-vault/src/mainview/components/Dashboard.tsx
+++ b/projects/keepkey-vault/src/mainview/components/Dashboard.tsx
@@ -8,8 +8,10 @@ import { getAssetIcon, registerCustomAsset } from "../../shared/assetLookup"
 import { AssetPage } from "./AssetPage"
 import { DonutChart, ChartLegend, type DonutChartItem } from "./DonutChart"
 import { AddChainDialog } from "./AddChainDialog"
+import { ReportDialog } from "./ReportDialog"
 import { rpcRequest, onRpcMessage } from "../lib/rpc"
-import type { ChainBalance, CustomChain } from "../../shared/types"
+import { categorizeTokens } from "../../shared/spamFilter"
+import type { ChainBalance, CustomChain, TokenVisibilityStatus } from "../../shared/types"
 
 const DASHBOARD_ANIMATIONS = `
 	@keyframes pulseGold {
@@ -29,16 +31,16 @@ interface DashboardProps {
 	onOpenSettings?: () => void
 }
 
-/** Format a timestamp as a relative "time ago" string */
-function formatTimeAgo(ts: number): string {
+/** Format a timestamp as a relative "time ago" string (i18n-aware) */
+function formatTimeAgo(ts: number, t: (key: string, opts?: Record<string, unknown>) => string): string {
 	const diff = Date.now() - ts
 	const mins = Math.floor(diff / 60_000)
-	if (mins < 1) return 'just now'
-	if (mins < 60) return `${mins}m ago`
+	if (mins < 1) return t('timeJustNow')
+	if (mins < 60) return t('timeMinutesAgo', { count: mins })
 	const hours = Math.floor(mins / 60)
-	if (hours < 24) return `${hours}h ago`
+	if (hours < 24) return t('timeHoursAgo', { count: hours })
 	const days = Math.floor(hours / 24)
-	return `${days}d ago`
+	return t('timeDaysAgo', { count: days })
 }
 
 export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProps) {
@@ -50,10 +52,19 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 	const [activeSliceIndex, setActiveSliceIndex] = useState<number | null>(0)
 	const [customChainDefs, setCustomChainDefs] = useState<ChainDef[]>([])
 	const [showAddChain, setShowAddChain] = useState(false)
+	const [showReports, setShowReports] = useState(false)
 	const [pioneerError, setPioneerError] = useState<PioneerError | null>(null)
 	const [cacheUpdatedAt, setCacheUpdatedAt] = useState<number | null>(null)
 	const [tokenWarning, setTokenWarning] = useState(false)
 	const [hasEverRefreshed, setHasEverRefreshed] = useState(false)
+	const [visibilityMap, setVisibilityMap] = useState<Record<string, TokenVisibilityStatus>>({})
+
+	// Load token visibility overrides (for spam filtering)
+	useEffect(() => {
+		rpcRequest<Record<string, TokenVisibilityStatus>>('getTokenVisibilityMap', undefined, 5000)
+			.then(setVisibilityMap)
+			.catch(() => {})
+	}, [])
 
 	// Listen for Pioneer connection errors from backend
 	useEffect(() => {
@@ -110,7 +121,7 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 					for (const b of cached.balances) map.set(b.chainId, b)
 					setBalances(map)
 					setCacheUpdatedAt(cached.updatedAt)
-					console.log(`[Dashboard] Cache hit: ${cached.balances.length} chains, $${cached.balances.reduce((s, b) => s + (b.balanceUsd || 0), 0).toFixed(2)}, age: ${formatTimeAgo(cached.updatedAt)}`)
+					console.log(`[Dashboard] Cache hit: ${cached.balances.length} chains, $${cached.balances.reduce((s, b) => s + (b.balanceUsd || 0), 0).toFixed(2)}, age: ${formatTimeAgo(cached.updatedAt, t)}`)
 				}
 			} catch { /* cache unavailable */ }
 
@@ -155,7 +166,24 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 		setLoadingBalances(false)
 	}, [loadingBalances, watchOnly])
 
-	const totalUsd = useMemo(() => Array.from(balances.values()).reduce((sum, b) => sum + (b.balanceUsd || 0), 0), [balances])
+	// Compute spam-filtered USD per chain: subtract spam token values from chain totals
+	const cleanBalanceUsd = useMemo(() => {
+		const overrides = new Map(Object.entries(visibilityMap).map(([k, v]) => [k.toLowerCase(), v]))
+		const result = new Map<string, { usd: number; cleanTokenCount: number }>()
+		for (const [chainId, bal] of balances) {
+			if (!bal.tokens || bal.tokens.length === 0) {
+				result.set(chainId, { usd: bal.balanceUsd || 0, cleanTokenCount: 0 })
+				continue
+			}
+			const { spam } = categorizeTokens(bal.tokens, overrides)
+			const spamUsd = spam.reduce((s, t) => s + (t.balanceUsd || 0), 0)
+			const cleanTokens = (bal.tokens?.length || 0) - spam.length
+			result.set(chainId, { usd: (bal.balanceUsd || 0) - spamUsd, cleanTokenCount: cleanTokens })
+		}
+		return result
+	}, [balances, visibilityMap])
+
+	const totalUsd = useMemo(() => Array.from(cleanBalanceUsd.values()).reduce((sum, b) => sum + b.usd, 0), [cleanBalanceUsd])
 
 	const allChains = useMemo(() => [...CHAINS, ...customChainDefs], [customChainDefs])
 
@@ -166,24 +194,24 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 
 	const chartData = useMemo<DonutChartItem[]>(() => allChains
 		.map((chain) => {
-			const bal = balances.get(chain.id)
-			return { name: chain.coin, value: bal?.balanceUsd || 0, color: chain.color, chainId: chain.id }
+			const clean = cleanBalanceUsd.get(chain.id)
+			return { name: chain.coin, value: clean?.usd || 0, color: chain.color, chainId: chain.id }
 		})
 		.filter((d) => d.value > 0)
-		.sort((a, b) => b.value - a.value), [allChains, balances])
+		.sort((a, b) => b.value - a.value), [allChains, cleanBalanceUsd])
 
 	const hasAnyBalance = chartData.length > 0
 
 	const sortedChains = useMemo(() => [...allChains].sort((a, b) => {
-		const aUsd = balances.get(a.id)?.balanceUsd || 0
-		const bUsd = balances.get(b.id)?.balanceUsd || 0
+		const aUsd = cleanBalanceUsd.get(a.id)?.usd || 0
+		const bUsd = cleanBalanceUsd.get(b.id)?.usd || 0
 		const aHas = aUsd > 0 || parseFloat(balances.get(a.id)?.balance || '0') > 0
 		const bHas = bUsd > 0 || parseFloat(balances.get(b.id)?.balance || '0') > 0
 		if (aHas && !bHas) return -1
 		if (!aHas && bHas) return 1
 		if (aHas && bHas) return bUsd - aUsd
 		return 0
-	}), [allChains, balances])
+	}), [allChains, balances, cleanBalanceUsd])
 
 	// Is data stale? (loaded from cache but haven't refreshed yet this session)
 	const isStale = !hasEverRefreshed && !loadingBalances
@@ -240,11 +268,11 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 								<line x1="12" y1="16" x2="12.01" y2="16" />
 							</svg>
 							<Text fontSize="sm" fontWeight="600" color="#DC3545">
-								{t("pioneerOfflineTitle", { defaultValue: "Balance server offline" })}
+								{t("pioneerOfflineTitle")}
 							</Text>
 						</Flex>
 						<Text fontSize="xs" color="kk.textSecondary" lineHeight="1.4">
-							{t("pioneerOfflineDesc", { defaultValue: "Unable to connect to {{url}}. Balances may be unavailable.", url: pioneerError.url })}
+							{t("pioneerOfflineDesc", { url: pioneerError.url })}
 						</Text>
 						<Flex gap="2" mt="1">
 							{onOpenSettings && (
@@ -266,7 +294,7 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 										onOpenSettings()
 									}}
 								>
-									{t("changeServer", { defaultValue: "Change Server" })}
+									{t("changeServer")}
 								</Box>
 							)}
 							<Box
@@ -284,7 +312,7 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 								_hover={{ borderColor: "kk.textMuted", color: "white" }}
 								onClick={() => window.open("https://support.keepkey.com", "_blank")}
 							>
-								{t("getSupport", { defaultValue: "Get Support" })}
+								{t("getSupport")}
 							</Box>
 							<Box
 								as="button"
@@ -301,7 +329,7 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 									refreshBalances()
 								}}
 							>
-								{t("retry", { defaultValue: "Retry" })}
+								{t("retry")}
 							</Box>
 						</Flex>
 					</Flex>
@@ -392,10 +420,10 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 
 						<Box>
 							<Text fontSize="md" fontWeight="600" color="white" mb="1">
-								{t("welcomeTitle", { defaultValue: "Welcome to KeepKey Vault" })}
+								{t("welcomeTitle")}
 							</Text>
 							<Text fontSize="sm" color="kk.textSecondary" lineHeight="1.5">
-								{t("welcomeSubtitle", { defaultValue: "Your wallet is ready. Here's how to get started:" })}
+								{t("welcomeSubtitle")}
 							</Text>
 						</Box>
 
@@ -403,19 +431,19 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 							<Flex align="flex-start" gap="2.5" textAlign="left">
 								<Text fontSize="sm" mt="0.5">1.</Text>
 								<Text fontSize="sm" color="kk.textSecondary" lineHeight="1.4">
-									{t("welcomeTip1", { defaultValue: "Tap any chain below, then hit Receive to get your deposit address" })}
+									{t("welcomeTip1")}
 								</Text>
 							</Flex>
 							<Flex align="flex-start" gap="2.5" textAlign="left">
 								<Text fontSize="sm" mt="0.5">2.</Text>
 								<Text fontSize="sm" color="kk.textSecondary" lineHeight="1.4">
-									{t("welcomeTip2", { defaultValue: "Send crypto to your address — your balance will appear here automatically" })}
+									{t("welcomeTip2")}
 								</Text>
 							</Flex>
 							<Flex align="flex-start" gap="2.5" textAlign="left">
 								<Text fontSize="sm" mt="0.5">3.</Text>
 								<Text fontSize="sm" color="kk.textSecondary" lineHeight="1.4">
-									{t("welcomeTip3", { defaultValue: "Add custom EVM chains with the + card to track any network" })}
+									{t("welcomeTip3")}
 								</Text>
 							</Flex>
 						</Flex>
@@ -423,9 +451,34 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 				</Box>
 			)}
 
-			{/* Refresh button — small, highlighted, below chart */}
+			{/* Refresh + Reports buttons — below chart */}
 			{!watchOnly && (
-				<Flex justify="center" mb="4">
+				<Flex justify="center" gap="3" mb="4">
+					<Box
+						as="button"
+						px="3"
+						py="1"
+						fontSize="11px"
+						fontWeight="600"
+						color="kk.gold"
+						bg="transparent"
+						borderRadius="full"
+						cursor="pointer"
+						transition="all 0.2s"
+						_hover={{ color: "white", bg: "rgba(192,168,96,0.12)" }}
+						onClick={() => setShowReports(true)}
+					>
+						<Flex align="center" gap="1.5">
+							<svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">
+								<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z" />
+								<polyline points="14 2 14 8 20 8" />
+								<line x1="16" y1="13" x2="8" y2="13" />
+								<line x1="16" y1="17" x2="8" y2="17" />
+								<polyline points="10 9 9 9 8 9" />
+							</svg>
+							{t("reports")}
+						</Flex>
+					</Box>
 					<Box
 						as="button"
 						px="3"
@@ -463,11 +516,11 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 											if (age < 86_400_000) return "#FBBF24"
 											return "#F87171"
 										})()}>
-											{formatTimeAgo(cacheUpdatedAt)}
+											{formatTimeAgo(cacheUpdatedAt, t)}
 										</Text>
 										{" · "}{t("refreshBalances")}
 									</>
-									: t("refreshPrompt", { defaultValue: "Press to update balances" })}
+									: t("refreshPrompt")}
 						</Flex>
 					</Box>
 				</Flex>
@@ -476,10 +529,11 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 			<SimpleGrid columns={{ base: 2, sm: 3 }} gap="2.5">
 				{sortedChains.map((chain) => {
 					const bal = balances.get(chain.id)
+					const clean = cleanBalanceUsd.get(chain.id)
 					const balNum = parseFloat(bal?.balance || '0')
-					const usdNum = bal?.balanceUsd || 0
+					const usdNum = clean?.usd || 0
 					const hasBalance = balNum > 0 || usdNum > 0
-					const tokenCount = bal?.tokens?.length || 0
+					const tokenCount = clean?.cleanTokenCount || 0
 
 					return (
 						<Box
@@ -606,6 +660,10 @@ export function Dashboard({ onLoaded, watchOnly, onOpenSettings }: DashboardProp
 					existingChainIds={existingChainIds}
 				/>
 			)}
+
+			{showReports && (
+				<ReportDialog onClose={() => setShowReports(false)} />
+			)}
 		</Box>
 	)
 }
diff --git a/projects/keepkey-vault/src/mainview/components/DeviceSettingsDrawer.tsx b/projects/keepkey-vault/src/mainview/components/DeviceSettingsDrawer.tsx
index 8caa9259..be6cb421 100644
--- a/projects/keepkey-vault/src/mainview/components/DeviceSettingsDrawer.tsx
+++ b/projects/keepkey-vault/src/mainview/components/DeviceSettingsDrawer.tsx
@@ -23,6 +23,7 @@ interface DeviceSettingsDrawerProps {
 	onOpenAuditLog?: () => void
 	onOpenPairedApps?: () => void
 	onRestApiChanged?: (enabled: boolean) => void
+	onWordCountChange?: (count: 12 | 18 | 24) => void
 }
 
 // ── Collapsible Section ─────────────────────────────────────────────
@@ -125,7 +126,7 @@ function VerificationBadge({ verified, t }: { verified?: boolean; t: (key: strin
 
 // ── Main Component ──────────────────────────────────────────────────
 
-export function DeviceSettingsDrawer({ open, onClose, deviceState, onCheckForUpdate, updatePhase, appVersion, onOpenAuditLog, onOpenPairedApps, onRestApiChanged }: DeviceSettingsDrawerProps) {
+export function DeviceSettingsDrawer({ open, onClose, deviceState, onCheckForUpdate, updatePhase, appVersion, onOpenAuditLog, onOpenPairedApps, onRestApiChanged, onWordCountChange }: DeviceSettingsDrawerProps) {
 	const { t } = useTranslation("settings")
 	const [features, setFeatures] = useState<DeviceFeatures | null>(null)
 	const [featuresError, setFeaturesError] = useState(false)
@@ -208,6 +209,7 @@ export function DeviceSettingsDrawer({ open, onClose, deviceState, onCheckForUpd
 	const verifySeed = useCallback(async () => {
 		setVerifying(true)
 		setVerifyResult(null)
+		onWordCountChange?.(verifyWordCount)
 		try {
 			const result = await rpcRequest("verifySeed", { wordCount: verifyWordCount }, 0) as { success: boolean; message: string }
 			setVerifyResult(result)
@@ -391,6 +393,11 @@ export function DeviceSettingsDrawer({ open, onClose, deviceState, onCheckForUpd
 				{/* Content */}
 				<VStack gap="3" align="stretch" p="4">
 
+					{/* ── Language ────────────────────────────────────── */}
+					<Section title={t("language")}>
+						<LanguageSelector />
+					</Section>
+
 					{/* ── Device Identity ─────────────────────────────── */}
 					<Section title={t("device")}>
 						<VStack gap="2" align="stretch">
@@ -802,11 +809,6 @@ export function DeviceSettingsDrawer({ open, onClose, deviceState, onCheckForUpd
 								)}
 							</Box>
 
-							{/* ── Language ────────────────────── */}
-							<Box pt="3" borderTop="1px solid" borderColor="rgba(255,255,255,0.06)">
-								<Text fontSize="sm" color="kk.textPrimary" fontWeight="500" mb="3">{t("language")}</Text>
-								<LanguageSelector />
-							</Box>
 						</VStack>
 					</Section>
 
diff --git a/projects/keepkey-vault/src/mainview/components/FirmwareDropZone.tsx b/projects/keepkey-vault/src/mainview/components/FirmwareDropZone.tsx
index e3794120..6bb30b2b 100644
--- a/projects/keepkey-vault/src/mainview/components/FirmwareDropZone.tsx
+++ b/projects/keepkey-vault/src/mainview/components/FirmwareDropZone.tsx
@@ -30,10 +30,13 @@ export function FirmwareDropZone() {
 	const [warningAcknowledged, setWarningAcknowledged] = useState(false)
 	const [wipeAcknowledged, setWipeAcknowledged] = useState(false)
 	const dragCounter = useRef(0)
+	const phaseRef = useRef(phase)
+	phaseRef.current = phase
 
-	// Listen for firmware progress
+	// Listen for firmware progress — only react when THIS component initiated the flash (C1 fix)
 	useEffect(() => {
 		return onRpcMessage("firmware-progress", (payload: FirmwareProgress) => {
+			if (phaseRef.current !== "flashing") return
 			setProgress(payload)
 			if (payload.percent >= 100) {
 				setPhase("complete")
@@ -104,9 +107,13 @@ export function FirmwareDropZone() {
 
 		try {
 			const arrayBuf = await file.arrayBuffer()
-			const b64 = btoa(
-				new Uint8Array(arrayBuf).reduce((s, b) => s + String.fromCharCode(b), "")
-			)
+			const bytes = new Uint8Array(arrayBuf)
+			const CHUNK = 8192
+			let binary = ''
+			for (let i = 0; i < bytes.length; i += CHUNK) {
+				binary += String.fromCharCode(...bytes.subarray(i, i + CHUNK))
+			}
+			const b64 = btoa(binary)
 			setFileDataB64(b64)
 
 			const result = await rpcRequest<FirmwareAnalysis>("analyzeFirmware", { data: b64 })
diff --git a/projects/keepkey-vault/src/mainview/components/FirmwareUpgradePreview.tsx b/projects/keepkey-vault/src/mainview/components/FirmwareUpgradePreview.tsx
new file mode 100644
index 00000000..7fc5e55f
--- /dev/null
+++ b/projects/keepkey-vault/src/mainview/components/FirmwareUpgradePreview.tsx
@@ -0,0 +1,371 @@
+/**
+ * FirmwareUpgradePreview — shows users what new features they'll unlock
+ * by upgrading firmware. Animated chain logos, feature cards, and a
+ * glowing highlight for the primary new chain.
+ */
+import { useState, useEffect, useMemo } from 'react'
+import { Box, Text, VStack, HStack, Flex } from '@chakra-ui/react'
+import { CHAINS } from '../../shared/chains'
+import { getUpgradeFeatures, getVersionInfo, type FirmwareFeature } from '../../shared/firmware-versions'
+
+// ── Icon URL helper (same convention as assetLookup.ts) ──────────────
+function chainIconUrl(caip: string): string {
+  return `https://api.keepkey.info/coins/${btoa(caip).replace(/=+$/, '')}.png`
+}
+
+// ── CSS keyframe animations (injected once) ──────────────────────────
+const ANIM_ID = '__fw-upgrade-anims'
+function ensureAnimations() {
+  if (typeof document === 'undefined') return
+  if (document.getElementById(ANIM_ID)) return
+  const style = document.createElement('style')
+  style.id = ANIM_ID
+  style.textContent = `
+    @keyframes fw-glow-pulse {
+      0%, 100% { box-shadow: 0 0 20px 4px var(--glow-color, rgba(20,241,149,0.3)); }
+      50% { box-shadow: 0 0 40px 12px var(--glow-color, rgba(20,241,149,0.5)); }
+    }
+    @keyframes fw-float {
+      0%, 100% { transform: translateY(0px); }
+      50% { transform: translateY(-6px); }
+    }
+    @keyframes fw-fade-up {
+      from { opacity: 0; transform: translateY(16px); }
+      to { opacity: 1; transform: translateY(0); }
+    }
+    @keyframes fw-shine {
+      0% { background-position: -200% center; }
+      100% { background-position: 200% center; }
+    }
+    @keyframes fw-orbit {
+      0% { transform: rotate(0deg) translateX(48px) rotate(0deg); }
+      100% { transform: rotate(360deg) translateX(48px) rotate(-360deg); }
+    }
+    @keyframes fw-scale-in {
+      from { opacity: 0; transform: scale(0.7); }
+      to { opacity: 1; transform: scale(1); }
+    }
+  `
+  document.head.appendChild(style)
+}
+
+interface Props {
+  /** Current device firmware version (null if OOB / not installed) */
+  currentVersion: string | null
+  /** Target firmware version being installed */
+  targetVersion: string
+}
+
+export function FirmwareUpgradePreview({ currentVersion, targetVersion }: Props) {
+  const [visible, setVisible] = useState(false)
+
+  useEffect(() => {
+    ensureAnimations()
+    const timer = setTimeout(() => setVisible(true), 100)
+    return () => clearTimeout(timer)
+  }, [])
+
+  const features = useMemo(
+    () => getUpgradeFeatures(currentVersion, targetVersion),
+    [currentVersion, targetVersion],
+  )
+
+  const versionInfo = useMemo(() => getVersionInfo(targetVersion), [targetVersion])
+
+  if (features.length === 0) return null
+
+  // Resolve chain data for logo display
+  const chainFeatures = features.filter(f => f.chains?.length)
+  const resolvedChains = chainFeatures.flatMap(f =>
+    (f.chains || []).map(chainId => {
+      const chain = CHAINS.find(c => c.id === chainId)
+      return chain ? { ...chain, featureColor: f.color || chain.color } : null
+    }).filter(Boolean)
+  ) as Array<(typeof CHAINS)[0] & { featureColor: string }>
+
+  // Primary feature (first chain feature for hero display)
+  const hero = resolvedChains[0]
+  const heroColor = hero?.featureColor || '#14F195'
+
+  return (
+    <Box
+      w="100%"
+      opacity={visible ? 1 : 0}
+      transform={visible ? 'translateY(0)' : 'translateY(12px)'}
+      transition="all 0.5s cubic-bezier(0.16, 1, 0.3, 1)"
+    >
+      <Box
+        w="100%"
+        borderRadius="xl"
+        overflow="hidden"
+        position="relative"
+        bg="linear-gradient(135deg, rgba(15,15,20,0.95) 0%, rgba(20,25,35,0.95) 100%)"
+        border="1px solid"
+        borderColor="whiteAlpha.100"
+      >
+        {/* Ambient glow behind the card */}
+        <Box
+          position="absolute"
+          top="-30%"
+          left="50%"
+          transform="translateX(-50%)"
+          w="80%"
+          h="60%"
+          borderRadius="full"
+          bg={`radial-gradient(ellipse, ${heroColor}15 0%, transparent 70%)`}
+          pointerEvents="none"
+        />
+
+        <VStack gap={0} w="100%" position="relative">
+          {/* ── Hero section ──────────────────────────────────── */}
+          <Box w="100%" pt={5} pb={4} px={4} textAlign="center">
+            {/* Version badge */}
+            <Flex justify="center" mb={3}>
+              <Box
+                px={3}
+                py={1}
+                borderRadius="full"
+                fontSize="2xs"
+                fontWeight="bold"
+                textTransform="uppercase"
+                letterSpacing="0.1em"
+                bg={`${heroColor}18`}
+                color={heroColor}
+                border="1px solid"
+                borderColor={`${heroColor}30`}
+                style={{
+                  animation: visible ? 'fw-scale-in 0.4s cubic-bezier(0.16, 1, 0.3, 1) forwards' : undefined,
+                }}
+              >
+                v{targetVersion}
+              </Box>
+            </Flex>
+
+            {/* "What's New" label */}
+            <Text
+              fontSize="2xs"
+              fontWeight="600"
+              textTransform="uppercase"
+              letterSpacing="0.15em"
+              color="whiteAlpha.500"
+              mb={1}
+            >
+              What's New
+            </Text>
+
+            {/* Headline */}
+            <Text
+              fontSize="md"
+              fontWeight="bold"
+              color="white"
+              lineHeight="1.3"
+              style={{
+                animation: visible ? 'fw-fade-up 0.6s cubic-bezier(0.16, 1, 0.3, 1) 0.15s both' : undefined,
+              }}
+            >
+              {versionInfo?.headline || `Firmware v${targetVersion}`}
+            </Text>
+          </Box>
+
+          {/* ── Chain hero logo ─────────────────────────────── */}
+          {hero && (
+            <Box
+              position="relative"
+              w="100%"
+              py={4}
+              display="flex"
+              justifyContent="center"
+              alignItems="center"
+            >
+              {/* Orbiting particles */}
+              {[0, 1, 2].map(i => (
+                <Box
+                  key={i}
+                  position="absolute"
+                  top="50%"
+                  left="50%"
+                  w="6px"
+                  h="6px"
+                  borderRadius="full"
+                  bg={heroColor}
+                  opacity={0.4}
+                  style={{
+                    animation: `fw-orbit ${3 + i * 0.8}s linear infinite`,
+                    animationDelay: `${i * -1}s`,
+                    marginTop: '-3px',
+                    marginLeft: '-3px',
+                  }}
+                />
+              ))}
+
+              {/* Glow ring */}
+              <Box
+                position="absolute"
+                w="88px"
+                h="88px"
+                borderRadius="full"
+                style={{
+                  '--glow-color': `${heroColor}40`,
+                  animation: 'fw-glow-pulse 2.5s ease-in-out infinite',
+                } as React.CSSProperties}
+              />
+
+              {/* Logo container */}
+              <Box
+                w="72px"
+                h="72px"
+                borderRadius="full"
+                bg={`${heroColor}12`}
+                border="2px solid"
+                borderColor={`${heroColor}40`}
+                display="flex"
+                alignItems="center"
+                justifyContent="center"
+                position="relative"
+                zIndex={1}
+                style={{
+                  animation: visible ? 'fw-float 3s ease-in-out infinite, fw-scale-in 0.5s cubic-bezier(0.16, 1, 0.3, 1) 0.2s both' : undefined,
+                }}
+              >
+                <img
+                  src={chainIconUrl(hero.caip)}
+                  alt={hero.coin}
+                  width={44}
+                  height={44}
+                  style={{
+                    borderRadius: '50%',
+                    objectFit: 'cover',
+                  }}
+                  onError={(e) => {
+                    // Fallback: show the chain symbol text
+                    const target = e.currentTarget
+                    target.style.display = 'none'
+                    const parent = target.parentElement
+                    if (parent && !parent.querySelector('[data-fallback]')) {
+                      const span = document.createElement('span')
+                      span.setAttribute('data-fallback', '1')
+                      span.style.cssText = `font-size:20px;font-weight:700;color:${heroColor}`
+                      span.textContent = hero.symbol
+                      parent.appendChild(span)
+                    }
+                  }}
+                />
+              </Box>
+            </Box>
+          )}
+
+          {/* ── Feature cards ──────────────────────────────── */}
+          <VStack gap={2} w="100%" px={4} pb={4}>
+            {features.map((feature, i) => (
+              <FeatureCard
+                key={i}
+                feature={feature}
+                index={i}
+                visible={visible}
+              />
+            ))}
+          </VStack>
+        </VStack>
+      </Box>
+    </Box>
+  )
+}
+
+// ── Feature card ────────────────────────────────────────────────────
+
+function FeatureCard({ feature, index, visible }: { feature: FirmwareFeature; index: number; visible: boolean }) {
+  const color = feature.color || '#C0A860'
+
+  // Resolve chain logos for this feature
+  const featureChains = (feature.chains || [])
+    .map(id => CHAINS.find(c => c.id === id))
+    .filter(Boolean) as (typeof CHAINS)[number][]
+
+  return (
+    <Box
+      w="100%"
+      p={3}
+      borderRadius="lg"
+      bg="whiteAlpha.50"
+      border="1px solid"
+      borderColor="whiteAlpha.100"
+      position="relative"
+      overflow="hidden"
+      style={{
+        animation: visible
+          ? `fw-fade-up 0.5s cubic-bezier(0.16, 1, 0.3, 1) ${0.3 + index * 0.1}s both`
+          : undefined,
+      }}
+    >
+      {/* Accent stripe */}
+      <Box
+        position="absolute"
+        left={0}
+        top={0}
+        bottom={0}
+        w="3px"
+        bg={color}
+        borderRadius="full"
+      />
+
+      <HStack gap={3} pl={2}>
+        {/* Icon */}
+        <Box flexShrink={0}>
+          {feature.icon === 'chain' && featureChains.length > 0 ? (
+            <Box
+              w="36px"
+              h="36px"
+              borderRadius="lg"
+              bg={`${color}15`}
+              display="flex"
+              alignItems="center"
+              justifyContent="center"
+            >
+              <img
+                src={chainIconUrl(featureChains[0].caip)}
+                alt={featureChains[0].coin}
+                width={24}
+                height={24}
+                style={{ borderRadius: '6px', objectFit: 'cover' }}
+                onError={(e) => {
+                  const t = e.currentTarget
+                  t.style.display = 'none'
+                }}
+              />
+            </Box>
+          ) : feature.icon === 'security' ? (
+            <Box w="36px" h="36px" borderRadius="lg" bg="green.900" display="flex" alignItems="center" justifyContent="center">
+              <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#48BB78" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
+              </svg>
+            </Box>
+          ) : feature.icon === 'performance' ? (
+            <Box w="36px" h="36px" borderRadius="lg" bg="yellow.900" display="flex" alignItems="center" justifyContent="center">
+              <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#ECC94B" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                <polygon points="13 2 3 14 12 14 11 22 21 10 12 10 13 2" />
+              </svg>
+            </Box>
+          ) : (
+            <Box w="36px" h="36px" borderRadius="lg" bg={`${color}15`} display="flex" alignItems="center" justifyContent="center">
+              <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke={color} strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+                <circle cx="12" cy="12" r="10" />
+                <line x1="12" y1="8" x2="12" y2="12" />
+                <line x1="12" y1="16" x2="12.01" y2="16" />
+              </svg>
+            </Box>
+          )}
+        </Box>
+
+        {/* Text */}
+        <VStack gap={0.5} align="start" flex={1}>
+          <Text fontSize="sm" fontWeight="600" color="white" lineHeight="1.2">
+            {feature.title}
+          </Text>
+          <Text fontSize="xs" color="whiteAlpha.600" lineHeight="1.4">
+            {feature.description}
+          </Text>
+        </VStack>
+      </HStack>
+    </Box>
+  )
+}
diff --git a/projects/keepkey-vault/src/mainview/components/OobSetupWizard.tsx b/projects/keepkey-vault/src/mainview/components/OobSetupWizard.tsx
index 62199ecc..4a85959b 100644
--- a/projects/keepkey-vault/src/mainview/components/OobSetupWizard.tsx
+++ b/projects/keepkey-vault/src/mainview/components/OobSetupWizard.tsx
@@ -10,14 +10,18 @@ import {
   FaPlus,
   FaChevronDown,
   FaChevronUp,
+  FaFolderOpen,
 } from 'react-icons/fa'
 import holdAndConnectRaw from '../assets/svg/hold-and-connect.svg?raw'
 import { useFirmwareUpdate } from '../hooks/useFirmwareUpdate'
 import { useDeviceState } from '../hooks/useDeviceState'
-import { rpcRequest } from '../lib/rpc'
+import { rpcRequest, onRpcMessage } from '../lib/rpc'
+import type { FirmwareAnalysis, FirmwareProgress } from '../../shared/types'
+import { FirmwareUpgradePreview } from './FirmwareUpgradePreview'
+import { LanguagePicker } from '../i18n/LanguageSelector'
 
-// ── Design tokens matching keepkey-bitcoin-only ─────────────────────────────
-const HIGHLIGHT = 'orange.500'
+// ── Design tokens ───────────────────────────────────────────────────────────
+const HIGHLIGHT = 'green.500'
 
 // ── Animations ──────────────────────────────────────────────────────────────
 const ANIMATIONS_CSS = `
@@ -35,9 +39,9 @@ const ANIMATIONS_CSS = `
     100% { background-position: 40px 0; }
   }
   @keyframes kkGlow {
-    0%   { box-shadow: 0 0 8px rgba(251, 146, 60, 0.4); }
-    50%  { box-shadow: 0 0 20px rgba(251, 146, 60, 0.7); }
-    100% { box-shadow: 0 0 8px rgba(251, 146, 60, 0.4); }
+    0%   { box-shadow: 0 0 8px rgba(72, 187, 120, 0.4); }
+    50%  { box-shadow: 0 0 20px rgba(72, 187, 120, 0.7); }
+    100% { box-shadow: 0 0 8px rgba(72, 187, 120, 0.4); }
   }
 `
 
@@ -80,6 +84,7 @@ const stepToVisibleId: Record<WizardStep, string | null> = {
 interface OobSetupWizardProps {
   onComplete: () => void
   onSetupInProgress?: (inProgress: boolean) => void
+  onWordCountChange?: (count: 12 | 18 | 24) => void
 }
 
 // ── Confetti pieces ─────────────────────────────────────────────────────────
@@ -94,13 +99,13 @@ const confettiPieces = Array.from({ length: 50 }, (_, i) => ({
 
 // ── Main Wizard ─────────────────────────────────────────────────────────────
 
-export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizardProps) {
+export function OobSetupWizard({ onComplete, onSetupInProgress, onWordCountChange }: OobSetupWizardProps) {
   const [step, setStep] = useState<WizardStep>('welcome')
   const [setupType, setSetupType] = useState<'create' | 'recover' | null>(null)
   const [wordCount, setWordCount] = useState<12 | 18 | 24>(12)
   const [deviceLabel, setDeviceLabel] = useState('')
   const [setupError, setSetupError] = useState<string | null>(null)
-  const [, setSetupLoading] = useState(false)
+  // L1 fix: removed unused setupLoading state (value was never read)
   const { t } = useTranslation('setup')
   const STEP_DESCRIPTIONS: Record<WizardStep, string> = {
     'welcome': t('stepDescriptions.welcome'),
@@ -118,6 +123,8 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
     { id: 'init-choose', label: t('visibleSteps.setup'), number: 3 },
   ]
 
+  // Read-more toggle on welcome/bootloader
+  const [showReadMore, setShowReadMore] = useState(false)
   // Advanced seed length toggle for create wallet
   const [showCreateAdvanced, setShowCreateAdvanced] = useState(false)
 
@@ -131,8 +138,31 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
   const [waitingForBootloaderFw, setWaitingForBootloaderFw] = useState(false)
   const bootloaderPollRef = useRef<ReturnType<typeof setInterval> | null>(null)
 
+  // Custom firmware state (inline file picker in firmware step)
+  const fileInputRef = useRef<HTMLInputElement>(null)
+  const [customFwPhase, setCustomFwPhase] = useState<'idle' | 'analyzing' | 'confirm' | 'flashing' | 'error'>('idle')
+  const [customFwAnalysis, setCustomFwAnalysis] = useState<FirmwareAnalysis | null>(null)
+  const [customFwDataB64, setCustomFwDataB64] = useState('')
+  const [customFwFileName, setCustomFwFileName] = useState('')
+  const [customFwError, setCustomFwError] = useState<string | null>(null)
+  const [customFwProgress, setCustomFwProgress] = useState<FirmwareProgress | null>(null)
+
   // Reboot phase: after BL/FW flash, wait for device to reconnect with fresh features
   const [rebootPhase, setRebootPhase] = useState<'idle' | 'rebooting'>('idle')
+  // Tracks elapsed time during reboot for progressive user messaging
+  const [rebootElapsedMs, setRebootElapsedMs] = useState(0)
+
+  // Tick reboot elapsed timer while waiting for device reconnection
+  useEffect(() => {
+    if (rebootPhase !== 'rebooting') {
+      setRebootElapsedMs(0)
+      return
+    }
+    const timer = setInterval(() => {
+      setRebootElapsedMs(prev => prev + 1000)
+    }, 1000)
+    return () => clearInterval(timer)
+  }, [rebootPhase])
 
   // Hooks — use Electrobun RPC-based hooks
   const deviceStatus = useDeviceState()
@@ -152,6 +182,19 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
   const inBootloader = deviceStatus.bootloaderMode
   const isOobDevice = deviceStatus.isOob
 
+  // Bootloader skip is only safe on firmware >= 6.1.1.
+  // In bootloader mode we don't know the FW version — never allow skip.
+  const canSkipBootloader = (() => {
+    if (inBootloader) return false
+    const fv = deviceStatus.firmwareVersion
+    if (!fv) return false
+    const [maj, min, pat] = fv.split('.').map(Number)
+    if (maj > 6) return true
+    if (maj === 6 && min > 1) return true
+    if (maj === 6 && min === 1 && pat >= 1) return true
+    return false
+  })()
+
   // ── Progress calculation ────────────────────────────────────────────────
 
   const visibleId = stepToVisibleId[step]
@@ -174,24 +217,23 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
   const isVisibleStepCurrent = (vsId: string) => visibleId === vsId
 
   // ── Signal setupInProgress for entire wizard lifecycle ─────────────────
-  // Keeps wizard visible during device reboots (firmware → init-choose transition)
+  // M5 fix: Split into two effects — step changes signal the current value
+  // (no cleanup that would briefly flash false between transitions), and a
+  // separate unmount-only effect signals false when the wizard is removed.
   useEffect(() => {
     onSetupInProgress?.(step !== 'complete')
-    return () => onSetupInProgress?.(false)
   }, [step, onSetupInProgress])
 
-  // ── Welcome → first real step ──────────────────────────────────────────
-
   useEffect(() => {
-    if (step !== 'welcome') return
-    if (deviceStatus.state === 'disconnected') return // Wait for device
-    const timer = setTimeout(() => {
-      handleGetStarted()
-    }, 1500)
-    return () => clearTimeout(timer)
-  }, [step, deviceStatus.state, needsBootloader, needsFirmware, needsInit])
+    // onSetupInProgress is setSetupInProgress (stable React setter) — safe to capture
+    return () => onSetupInProgress?.(false)
+  }, [onSetupInProgress])
 
-  const handleGetStarted = () => {
+  // ── Welcome → user clicks to advance ───────────────────────────────────
+  // Device state determines the target step; the button only shows once state is known.
+  const welcomeReady = step === 'welcome' && deviceStatus.state !== 'disconnected'
+
+  const handleWelcomeNext = useCallback(() => {
     if (needsBootloader) {
       setStep('bootloader')
     } else if (needsFirmware) {
@@ -201,20 +243,20 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
     } else {
       onComplete()
     }
-  }
+  }, [needsBootloader, needsFirmware, needsInit, onComplete])
 
   // ── Bootloader step ────────────────────────────────────────────────────
 
   const handleEnterBootloaderMode = () => {
+    if (bootloaderPollRef.current) clearInterval(bootloaderPollRef.current) // H1 fix
     setWaitingForBootloader(true)
-    // Poll device state for bootloader mode detection
+    // Poll device state for bootloader mode detection (does NOT auto-start update)
     bootloaderPollRef.current = setInterval(async () => {
       try {
         const state = await rpcRequest('getDeviceState')
         if (state.bootloaderMode) {
           setWaitingForBootloader(false)
           if (bootloaderPollRef.current) clearInterval(bootloaderPollRef.current)
-          await startBootloaderUpdate()
         }
       } catch {
         // Device may be disconnecting/reconnecting
@@ -222,7 +264,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
     }, 2000)
   }
 
-  // Event-driven bootloader detection via device state pushes
+  // Event-driven bootloader detection via device state pushes (does NOT auto-start)
   useEffect(() => {
     if (!waitingForBootloader) return
     if (updateState === 'updating') return
@@ -230,18 +272,18 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
     if (deviceStatus.bootloaderMode) {
       setWaitingForBootloader(false)
       if (bootloaderPollRef.current) clearInterval(bootloaderPollRef.current)
-      startBootloaderUpdate()
     }
-  }, [waitingForBootloader, deviceStatus.bootloaderMode, updateState, startBootloaderUpdate])
+  }, [waitingForBootloader, deviceStatus.bootloaderMode, updateState])
 
-  // Auto-start: if device is already in bootloader mode when we reach this step
+  // Auto-start bootloader detection polling when entering bootloader step
   useEffect(() => {
     if (step !== 'bootloader') return
+    if (inBootloader) return // Already detected
+    if (waitingForBootloader) return // Already polling
     if (updateState !== 'idle') return
-    if (rebootPhase === 'rebooting') return // Don't re-trigger during reboot wait
-    if (!inBootloader) return
-    startBootloaderUpdate()
-  }, [step, updateState, rebootPhase, inBootloader, startBootloaderUpdate])
+    if (rebootPhase === 'rebooting') return
+    handleEnterBootloaderMode()
+  }, [step, inBootloader, waitingForBootloader, updateState, rebootPhase])
 
   // Enter reboot phase when bootloader update completes
   useEffect(() => {
@@ -264,7 +306,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
     setRebootPhase('idle')
 
     // Device is back — route based on fresh state
-    if (s === 'bootloader' && needsBootloader) return // stay, auto-start will retry
+    if (s === 'bootloader' && needsBootloader) return // stay, user can retry
     if (needsFirmware) {
       setStep('firmware')
     } else if (needsInit) {
@@ -283,6 +325,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
   // ── Firmware step ──────────────────────────────────────────────────────
 
   const handleEnterBootloaderForFirmware = () => {
+    if (bootloaderPollRef.current) clearInterval(bootloaderPollRef.current) // H1 fix
     setWaitingForBootloaderFw(true)
     bootloaderPollRef.current = setInterval(async () => {
       try {
@@ -290,7 +333,6 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
         if (state.bootloaderMode) {
           setWaitingForBootloaderFw(false)
           if (bootloaderPollRef.current) clearInterval(bootloaderPollRef.current)
-          await startFirmwareUpdate(deviceStatus.latestFirmware || undefined)
         }
       } catch {
         // Device may be disconnecting/reconnecting
@@ -298,7 +340,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
     }, 2000)
   }
 
-  // Event-driven: detect bootloader mode for firmware step
+  // Event-driven: detect bootloader mode for firmware step (does NOT auto-start)
   useEffect(() => {
     if (step !== 'firmware') return
     if (!waitingForBootloaderFw) return
@@ -307,22 +349,19 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
     if (deviceStatus.bootloaderMode) {
       setWaitingForBootloaderFw(false)
       if (bootloaderPollRef.current) clearInterval(bootloaderPollRef.current)
-      startFirmwareUpdate(deviceStatus.latestFirmware || undefined)
     }
-  }, [step, waitingForBootloaderFw, deviceStatus.bootloaderMode, updateState, startFirmwareUpdate, deviceStatus.latestFirmware])
+  }, [step, waitingForBootloaderFw, deviceStatus.bootloaderMode, updateState])
 
-  // Auto-start firmware update if already in bootloader mode,
-  // otherwise auto-start polling for bootloader entry
+  // Auto-start polling for bootloader entry (not the update itself)
   useEffect(() => {
     if (step !== 'firmware') return
     if (updateState !== 'idle') return
-    if (rebootPhase === 'rebooting') return // Don't re-trigger during reboot wait
-    if (inBootloader) {
-      startFirmwareUpdate(deviceStatus.latestFirmware || undefined)
-    } else if (!waitingForBootloaderFw) {
+    if (rebootPhase === 'rebooting') return
+    if (inBootloader) return // Already in BL — user will click to start
+    if (!waitingForBootloaderFw) {
       handleEnterBootloaderForFirmware()
     }
-  }, [step, updateState, rebootPhase, inBootloader])
+  }, [step, updateState, rebootPhase, inBootloader, waitingForBootloaderFw]) // H4 fix: added waitingForBootloaderFw
 
   // Enter reboot phase when firmware update completes
   useEffect(() => {
@@ -342,7 +381,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
 
     setRebootPhase('idle')
 
-    if (s === 'bootloader') return // auto-start will retry firmware flash
+    if (s === 'bootloader') return // user can retry firmware flash
     if (needsInit) {
       setStep('init-choose')
     } else {
@@ -358,6 +397,97 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
     }
   }
 
+  // ── Custom firmware file handling ──────────────────────────────────────
+
+  // Listen for firmware progress during custom flash
+  useEffect(() => {
+    return onRpcMessage('firmware-progress', (payload: FirmwareProgress) => {
+      if (customFwPhase === 'flashing') {
+        setCustomFwProgress(payload)
+        if (payload.percent >= 100) {
+          setCustomFwPhase('idle')
+          resetUpdate()
+          setRebootPhase('rebooting')
+        }
+      }
+    })
+  }, [customFwPhase, resetUpdate])
+
+  const handleFileSelected = useCallback(async (file: File) => {
+    if (!file.name.endsWith('.bin')) {
+      setCustomFwError('Only .bin firmware files are supported')
+      setCustomFwPhase('error')
+      return
+    }
+    setCustomFwPhase('analyzing')
+    setCustomFwFileName(file.name)
+    setCustomFwError(null)
+    try {
+      const arrayBuf = await file.arrayBuffer()
+      // M4 fix: chunked conversion avoids O(n^2) string concatenation
+      const bytes = new Uint8Array(arrayBuf)
+      const CHUNK = 8192
+      let binary = ''
+      for (let i = 0; i < bytes.length; i += CHUNK) {
+        binary += String.fromCharCode(...bytes.subarray(i, i + CHUNK))
+      }
+      const b64 = btoa(binary)
+      setCustomFwDataB64(b64)
+      const result = await rpcRequest<FirmwareAnalysis>('analyzeFirmware', { data: b64 })
+      setCustomFwAnalysis(result)
+      setCustomFwPhase('confirm')
+    } catch (err: any) {
+      setCustomFwError(err?.message || 'Failed to analyze firmware')
+      setCustomFwPhase('error')
+    }
+  }, [])
+
+  const handleCustomFlash = useCallback(async () => {
+    if (!customFwDataB64) return
+    setCustomFwPhase('flashing')
+    setCustomFwProgress({ percent: 0, message: 'Starting firmware flash...' })
+    try {
+      await rpcRequest('flashCustomFirmware', { data: customFwDataB64 }, 0)
+    } catch (err: any) {
+      setCustomFwError(err?.message || 'Firmware flash failed')
+      setCustomFwPhase('error')
+    }
+  }, [customFwDataB64])
+
+  const handleCustomFwReset = useCallback(() => {
+    setCustomFwPhase('idle')
+    setCustomFwAnalysis(null)
+    setCustomFwDataB64('')
+    setCustomFwFileName('')
+    setCustomFwError(null)
+    setCustomFwProgress(null)
+    if (fileInputRef.current) fileInputRef.current.value = ''
+  }, [])
+
+  // Inline drop zone handlers for firmware step
+  const [showCustomFw, setShowCustomFw] = useState(false)
+  const [fwDragOver, setFwDragOver] = useState(false)
+
+  const handleFwDragOver = useCallback((e: React.DragEvent) => {
+    e.preventDefault()
+    e.stopPropagation()
+    setFwDragOver(true)
+  }, [])
+
+  const handleFwDragLeave = useCallback((e: React.DragEvent) => {
+    e.preventDefault()
+    e.stopPropagation()
+    setFwDragOver(false)
+  }, [])
+
+  const handleFwDrop = useCallback((e: React.DragEvent) => {
+    e.preventDefault()
+    e.stopPropagation()
+    setFwDragOver(false)
+    const files = e.dataTransfer?.files
+    if (files?.length) handleFileSelected(files[0])
+  }, [handleFileSelected])
+
   // ── Init: Create / Recover ─────────────────────────────────────────────
 
   // No timeout for device-interactive ops — user can take as long as needed
@@ -366,7 +496,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
   const handleCreateWallet = async () => {
     setSetupType('create')
     setStep('init-progress')
-    setSetupLoading(true)
+
     setSetupError(null)
     try {
       await rpcRequest('resetDevice', {
@@ -379,7 +509,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
       setSetupError(err instanceof Error ? err.message : t('initProgress.failedToCreate'))
       setStep('init-choose')
     } finally {
-      setSetupLoading(false)
+
     }
   }
 
@@ -389,7 +519,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
     setDevLoadOpen(false)
     setSetupType('create')
     setStep('init-progress')
-    setSetupLoading(true)
+
     setSetupError(null)
     try {
       await rpcRequest('loadDevice', { mnemonic: words }, DEVICE_INTERACTION_TIMEOUT)
@@ -400,7 +530,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
       setSetupError(err instanceof Error ? err.message : 'Failed to load device')
       setStep('init-choose')
     } finally {
-      setSetupLoading(false)
+
     }
   }
 
@@ -413,7 +543,8 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
   const handleRecoverWallet = async () => {
     setSetupType('recover')
     setStep('init-progress')
-    setSetupLoading(true)
+    onWordCountChange?.(wordCount)
+
     setSetupError(null)
     try {
       await rpcRequest('recoverDevice', {
@@ -426,7 +557,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
       setSetupError(err instanceof Error ? err.message : t('initProgress.failedToRecover'))
       setStep('init-choose')
     } finally {
-      setSetupLoading(false)
+
     }
   }
 
@@ -465,10 +596,13 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
     }
   }, [step, onComplete])
 
-  const showPrevious = !['welcome', 'complete'].includes(step)
+  // L7 fix: prevent navigating back to already-completed steps
+  const showPrevious = !['welcome', 'complete', 'init-progress'].includes(step)
+  // L4 fix: hide Next on firmware step for OOB devices (firmware is required)
   const showNext =
     !['bootloader', 'init-choose', 'init-progress', 'init-label', 'complete'].includes(step) &&
-    !(step === 'firmware' && (updateState === 'updating' || updateState === 'complete'))
+    !(step === 'firmware' && (updateState === 'updating' || updateState === 'complete')) &&
+    !(step === 'firmware' && isOobDevice)
 
   // ── Render ─────────────────────────────────────────────────────────────
 
@@ -503,14 +637,20 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
       >
         {/* ── Header ─────────────────────────────────────────────────── */}
         <Box px={4} py={2} borderBottomWidth="1px" borderColor="gray.700">
-          <VStack gap={0.5}>
-            <Text fontSize="md" fontWeight="bold" color={HIGHLIGHT}>
-              {t('title')}
-            </Text>
-            <Text fontSize="xs" color="gray.400">
-              {STEP_DESCRIPTIONS[step]}
-            </Text>
-          </VStack>
+          <Flex align="center" justify="space-between">
+            <Box flex={1} />
+            <VStack gap={0.5} flex={2} textAlign="center">
+              <Text fontSize="md" fontWeight="bold" color={HIGHLIGHT}>
+                {t('title')}
+              </Text>
+              <Text fontSize="xs" color="gray.400">
+                {STEP_DESCRIPTIONS[step]}
+              </Text>
+            </VStack>
+            <Flex flex={1} justify="flex-end">
+              <LanguagePicker />
+            </Flex>
+          </Flex>
         </Box>
 
         {/* ── Progress bar ───────────────────────────────────────────── */}
@@ -546,7 +686,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                     transition="all 0.3s"
                     flexShrink={0}
                     transform={current ? 'scale(1.1)' : 'scale(1)'}
-                    boxShadow={current ? '0 0 0 3px rgba(251, 146, 60, 0.25)' : 'none'}
+                    boxShadow={current ? '0 0 0 3px rgba(72, 187, 120, 0.25)' : 'none'}
                   >
                     {completed ? (
                       <FaCheckCircle color="white" size={12} />
@@ -592,45 +732,103 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
             {/* ═══════════════ WELCOME ═══════════════════════════════ */}
             {step === 'welcome' && (
               <VStack gap={4} textAlign="center" w="100%">
-                <FaWallet
-                  color="#F59E0B"
-                  size={48}
-                  style={{ animation: 'kkPulse 2s ease-in-out infinite' }}
-                />
-                <VStack gap={1}>
-                  <Text fontSize="xl" fontWeight="bold" color="white">
-                    {t('welcome.title')}
-                  </Text>
-                  <Text fontSize="sm" color={HIGHLIGHT}>
-                    {t('subtitle')}
-                  </Text>
-                  <Text fontSize="sm" color="gray.400" maxW="360px">
-                    {isOobDevice
-                      ? t('welcome.oobIntro')
-                      : t('welcome.intro')}
-                  </Text>
-                </VStack>
-                <HStack gap={2}>
-                  <Spinner size="sm" color="gray.500" />
-                  <Text fontSize="xs" color="gray.500">
-                    {deviceStatus.state !== 'disconnected' ? t('welcome.startingSetup') : t('welcome.detectingDevice')}
-                  </Text>
-                </HStack>
+                {isOobDevice ? (
+                  <>
+                    <Box
+                      p={3}
+                      borderRadius="full"
+                      bg="rgba(72, 187, 120, 0.15)"
+                      border="2px solid"
+                      borderColor="green.500"
+                    >
+                      <FaWallet
+                        color="#48BB78"
+                        size={40}
+                        style={{ animation: 'kkPulse 2s ease-in-out infinite' }}
+                      />
+                    </Box>
+                    <VStack gap={1.5}>
+                      <Text fontSize="lg" fontWeight="bold" color="green.400">
+                        {t('welcome.oobTitle')}
+                      </Text>
+                      <Text fontSize="xl" fontWeight="bold" color="white">
+                        {t('welcome.oobWelcome')}
+                      </Text>
+                      <Text fontSize="sm" color="gray.300" maxW="400px" lineHeight="tall">
+                        {t('welcome.oobWizardDesc')}
+                      </Text>
+                    </VStack>
+
+                    {/* Read More link → opens dialog */}
+                    <Text
+                      as="button"
+                      fontSize="xs"
+                      color="green.400"
+                      fontWeight="500"
+                      cursor="pointer"
+                      textDecoration="underline"
+                      _hover={{ color: 'green.300' }}
+                      onClick={() => setShowReadMore(true)}
+                    >
+                      {t('welcome.readMore')}
+                    </Text>
+                  </>
+                ) : (
+                  <>
+                    <FaWallet
+                      color="#48BB78"
+                      size={48}
+                      style={{ animation: 'kkPulse 2s ease-in-out infinite' }}
+                    />
+                    <VStack gap={1}>
+                      <Text fontSize="xl" fontWeight="bold" color="white">
+                        {t('welcome.title')}
+                      </Text>
+                      <Text fontSize="sm" color={HIGHLIGHT}>
+                        {t('subtitle')}
+                      </Text>
+                      <Text fontSize="sm" color="gray.400" maxW="360px">
+                        {t('welcome.intro')}
+                      </Text>
+                    </VStack>
+                  </>
+                )}
+                {welcomeReady ? (
+                  <Button
+                    size="lg"
+                    bg={HIGHLIGHT}
+                    color="white"
+                    _hover={{ bg: 'green.600', transform: 'scale(1.02)' }}
+                    transition="all 0.2s"
+                    px={10}
+                    onClick={handleWelcomeNext}
+                  >
+                    {t('welcome.getStarted')}
+                  </Button>
+                ) : (
+                  <HStack gap={2}>
+                    <Spinner size="sm" color="green.400" />
+                    <Text fontSize="xs" color="gray.400">
+                      {t('welcome.detectingDevice')}
+                    </Text>
+                  </HStack>
+                )}
               </VStack>
             )}
 
             {/* ═══════════════ BOOTLOADER ════════════════════════════ */}
             {step === 'bootloader' && (
               <VStack gap={3} w="100%" maxW="460px" mx="auto">
-                {!inBootloader && updateState !== 'updating' && updateState !== 'error' && rebootPhase !== 'rebooting' && (
+                {/* Bootloader detected — user must click to start update */}
+                {inBootloader && updateState === 'idle' && rebootPhase !== 'rebooting' && (
                   <>
-                    <Box maxW="100px" mx="auto" opacity={0.85} dangerouslySetInnerHTML={{ __html: holdAndConnectRaw }} sx={{ '& svg': { width: '100%', height: '100%' } }} />
+                    <FaCheckCircle color="#48BB78" size={32} />
                     <VStack gap={1}>
-                      <Text fontSize="lg" fontWeight="bold" color="white" textAlign="center">
-                        {t('bootloader.title')}
+                      <Text fontSize="lg" fontWeight="bold" color="green.400" textAlign="center">
+                        {t('bootloader.bootloaderDetected')}
                       </Text>
                       <Text fontSize="xs" color="gray.400" textAlign="center">
-                        {t('bootloader.description')}
+                        {t('bootloader.deviceReadyForUpdate')}
                       </Text>
                     </VStack>
 
@@ -639,7 +837,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                         <HStack justify="space-between">
                           <VStack gap={0.5} align="start">
                             <Text fontSize="2xs" color="gray.400" textTransform="uppercase">{t('bootloader.current')}</Text>
-                            <Text fontSize="sm" color="orange.400" fontWeight="bold">
+                            <Text fontSize="sm" color="gray.300" fontWeight="bold">
                               {(deviceStatus.bootloaderVersion && !deviceStatus.bootloaderVersion.startsWith('hash:'))
                                 ? `v${deviceStatus.bootloaderVersion}`
                                 : t('bootloader.outdated')}
@@ -656,81 +854,174 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                       </Box>
                     )}
 
-                    <Box w="100%" p={3} bg="gray.700" borderRadius="lg" borderWidth="2px" borderColor="yellow.600">
-                      <VStack align="start" gap={1}>
-                        <HStack gap={2}>
-                          <FaExclamationTriangle color="#ECC94B" size={14} />
-                          <Text fontSize="xs" fontWeight="bold" color="yellow.300">
-                            {t('bootloader.enterFirmwareUpdateMode')}
-                          </Text>
+                    <Button
+                      w="100%"
+                      size="md"
+                      bg={HIGHLIGHT}
+                      color="white"
+                      _hover={{ bg: 'green.600' }}
+                      onClick={() => startBootloaderUpdate()}
+                    >
+                      {t('bootloader.updateBootloaderTo', { version: deviceStatus.latestBootloader || '?' })}
+                    </Button>
+                    {canSkipBootloader && (
+                      <Button
+                        w="100%"
+                        size="sm"
+                        variant="ghost"
+                        color="gray.400"
+                        _hover={{ color: 'white', bg: 'gray.700' }}
+                        onClick={() => {
+                          if (needsFirmware) setStep('firmware')
+                          else setStep('init-choose')
+                        }}
+                      >
+                        {t('bootloader.skipBootloaderUpdate')}
+                      </Button>
+                    )}
+                  </>
+                )}
+
+                {!inBootloader && updateState !== 'updating' && updateState !== 'error' && rebootPhase !== 'rebooting' && (
+                  <>
+                    <VStack gap={1}>
+                      <Text fontSize="lg" fontWeight="bold" color="white" textAlign="center">
+                        {t('bootloader.putDeviceInBootloader')}
+                      </Text>
+                      <Text fontSize="sm" color="gray.400" textAlign="center">
+                        {t('bootloader.followStepsBelow')}
+                      </Text>
+                    </VStack>
+
+                    {deviceStatus.latestBootloader && (
+                      <Box w="100%" p={3} bg="gray.700" borderRadius="lg">
+                        <HStack justify="space-between">
+                          <VStack gap={0.5} align="start">
+                            <Text fontSize="2xs" color="gray.400" textTransform="uppercase">{t('bootloader.current')}</Text>
+                            <Text fontSize="sm" color="gray.300" fontWeight="bold">
+                              {(deviceStatus.bootloaderVersion && !deviceStatus.bootloaderVersion.startsWith('hash:'))
+                                ? `v${deviceStatus.bootloaderVersion}`
+                                : t('bootloader.outdated')}
+                            </Text>
+                          </VStack>
+                          <Text color="gray.500">&rarr;</Text>
+                          <VStack gap={0.5} align="end">
+                            <Text fontSize="2xs" color="gray.400" textTransform="uppercase">{t('bootloader.latest')}</Text>
+                            <Text fontSize="sm" color="green.400" fontWeight="bold">
+                              v{deviceStatus.latestBootloader}
+                            </Text>
+                          </VStack>
                         </HStack>
-                        <VStack align="start" gap={0} pl={5}>
-                          <Text fontSize="xs" color="gray.200">{t('bootloader.step1Unplug')}</Text>
-                          <Text fontSize="xs" color="gray.200">{t('bootloader.step2Hold')}</Text>
-                          <Text fontSize="xs" color="gray.200">{t('bootloader.step3Plugin')}</Text>
-                          <Text fontSize="xs" color="gray.200">{t('bootloader.step4Release')}</Text>
+                      </Box>
+                    )}
+
+                    <Box w="100%" p={4} bg="gray.700" borderRadius="lg" borderWidth="1px" borderColor="gray.600">
+                      <VStack align="start" gap={2}>
+                        <Text fontSize="sm" fontWeight="bold" color="white">
+                          {t('bootloader.stepsTitle')}
+                        </Text>
+                        <VStack align="start" gap={1.5} w="100%">
+                          <HStack gap={3} align="start">
+                            <Box w={6} h={6} borderRadius="full" bg="green.500" flexShrink={0} display="flex" alignItems="center" justifyContent="center">
+                              <Text fontSize="xs" fontWeight="bold" color="white">1</Text>
+                            </Box>
+                            <Text fontSize="sm" color="gray.200" pt="2px">{t('bootloader.step1Unplug')}</Text>
+                          </HStack>
+                          <HStack gap={3} align="start">
+                            <Box w={6} h={6} borderRadius="full" bg="green.500" flexShrink={0} display="flex" alignItems="center" justifyContent="center">
+                              <Text fontSize="xs" fontWeight="bold" color="white">2</Text>
+                            </Box>
+                            <Text fontSize="sm" color="gray.200" pt="2px">{t('bootloader.step2Hold')}</Text>
+                          </HStack>
+                          <HStack gap={3} align="start">
+                            <Box w={6} h={6} borderRadius="full" bg="green.500" flexShrink={0} display="flex" alignItems="center" justifyContent="center">
+                              <Text fontSize="xs" fontWeight="bold" color="white">3</Text>
+                            </Box>
+                            <Text fontSize="sm" color="gray.200" pt="2px">{t('bootloader.step3Plugin')}</Text>
+                          </HStack>
+                          <HStack gap={3} align="start">
+                            <Box w={6} h={6} borderRadius="full" bg="green.500" flexShrink={0} display="flex" alignItems="center" justifyContent="center">
+                              <Text fontSize="xs" fontWeight="bold" color="white">4</Text>
+                            </Box>
+                            <Text fontSize="sm" color="gray.200" pt="2px">{t('bootloader.step4Release')}</Text>
+                          </HStack>
                         </VStack>
                       </VStack>
                     </Box>
 
-                    {waitingForBootloader && (
-                      <HStack gap={2} w="100%" justify="center">
-                        <Spinner size="sm" color="yellow.400" />
-                        <Text fontSize="xs" color="yellow.300">
-                          {t('bootloader.listeningForBootloader')}
+                    <Box w="100%" p={3} bg="green.900" borderRadius="lg" borderWidth="1px" borderColor="green.600">
+                      <HStack gap={2} justify="center">
+                        <Spinner size="sm" color="green.300" />
+                        <Text fontSize="sm" color="green.200" fontWeight="500">
+                          {t('bootloader.waitingForBootloader')}
                         </Text>
                       </HStack>
-                    )}
+                    </Box>
 
-                    {!waitingForBootloader && (
-                      <>
-                        <Button
-                          w="100%"
-                          size="md"
-                          bg={HIGHLIGHT}
-                          color="white"
-                          _hover={{ bg: 'orange.600' }}
-                          onClick={handleEnterBootloaderMode}
-                        >
-                          {t('bootloader.readyDetectBootloader')}
-                        </Button>
-                        <Button
-                          w="100%"
-                          size="sm"
-                          variant="ghost"
-                          color="gray.400"
-                          _hover={{ color: 'white', bg: 'gray.700' }}
-                          onClick={() => {
-                            if (needsFirmware) setStep('firmware')
-                            else setStep('init-choose')
-                          }}
-                        >
-                          {t('bootloader.skipBootloaderUpdate')}
-                        </Button>
-                      </>
+                    {canSkipBootloader && (
+                      <Button
+                        w="100%"
+                        size="sm"
+                        variant="ghost"
+                        color="gray.500"
+                        _hover={{ color: 'gray.300', bg: 'gray.700' }}
+                        onClick={() => {
+                          if (needsFirmware) setStep('firmware')
+                          else setStep('init-choose')
+                        }}
+                      >
+                        {t('bootloader.skipBootloaderUpdate')}
+                      </Button>
                     )}
                   </>
                 )}
 
                 {rebootPhase === 'rebooting' && (
-                  <Box w="100%" p={3} bg="blue.900" borderRadius="md" borderWidth="2px" borderColor="blue.500">
-                    <VStack gap={2} align="start">
-                      <HStack gap={2}>
-                        <Spinner size="sm" color="blue.300" />
-                        <Text fontSize="sm" color="blue.300" fontWeight="bold">
-                          {t('firmware.deviceRebooting', { defaultValue: 'Device rebooting...' })}
+                  <VStack gap={2} w="100%">
+                    <Box w="100%" p={3} bg="blue.900" borderRadius="md" borderWidth="2px" borderColor="blue.500">
+                      <VStack gap={2} align="start">
+                        <HStack gap={2}>
+                          <Spinner size="sm" color="blue.300" />
+                          <Text fontSize="sm" color="blue.300" fontWeight="bold">
+                            {rebootElapsedMs < 20000
+                              ? t('firmware.deviceRebooting', { defaultValue: 'Device rebooting...' })
+                              : t('firmware.rebootTakingLong', { defaultValue: 'Reconnection is taking longer than usual...' })}
+                          </Text>
+                        </HStack>
+                        <Text fontSize="xs" color="blue.200">
+                          {rebootElapsedMs < 20000
+                            ? t('firmware.rebootingMessage', { defaultValue: 'Waiting for device to reconnect after update.' })
+                            : t('firmware.rebootTakingLongSub', { defaultValue: 'The device may need a moment to restart.' })}
                         </Text>
-                      </HStack>
-                      <Text fontSize="xs" color="blue.200">
-                        {t('firmware.rebootingMessage', { defaultValue: 'Waiting for device to reconnect after update.' })}
-                      </Text>
-                    </VStack>
-                  </Box>
+                      </VStack>
+                    </Box>
+
+                    {rebootElapsedMs >= 30000 && (
+                      <Box w="100%" p={3} bg="blue.900" borderRadius="md" borderWidth="2px" borderColor="blue.600">
+                        <VStack gap={1.5} align="start">
+                          <HStack gap={2}>
+                            <FaExclamationTriangle color="#63B3ED" size={14} />
+                            <Text fontSize="sm" fontWeight="bold" color="blue.300">
+                              {t('firmware.manualReconnectTitle', { defaultValue: 'Device not reconnecting?' })}
+                            </Text>
+                          </HStack>
+                          <VStack align="start" gap={0.5} pl={5}>
+                            <Text fontSize="xs" color="blue.200">{t('firmware.manualReconnectStep1', { defaultValue: '1. Unplug your KeepKey' })}</Text>
+                            <Text fontSize="xs" color="blue.200">{t('firmware.manualReconnectStep2', { defaultValue: '2. Wait 5 seconds' })}</Text>
+                            <Text fontSize="xs" color="blue.200">{t('firmware.manualReconnectStep3', { defaultValue: '3. Plug it back in' })}</Text>
+                          </VStack>
+                          <Text fontSize="2xs" color="blue.300" pl={5}>
+                            {t('firmware.manualReconnectNote', { defaultValue: 'Setup will continue automatically when the device is detected.' })}
+                          </Text>
+                        </VStack>
+                      </Box>
+                    )}
+                  </VStack>
                 )}
 
                 {updateState === 'updating' && (
                   <VStack gap={2} w="100%">
-                    <FaDownload color="#F59E0B" size={32} />
+                    <FaDownload color="#48BB78" size={32} />
                     <Text fontSize="lg" fontWeight="bold" color="white" textAlign="center">
                       {t('bootloader.title')}
                     </Text>
@@ -744,7 +1035,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                         <HStack justify="space-between">
                           <VStack gap={0.5} align="start">
                             <Text fontSize="2xs" color="gray.400" textTransform="uppercase">{t('bootloader.current')}</Text>
-                            <Text fontSize="sm" color="orange.400" fontWeight="bold">
+                            <Text fontSize="sm" color="gray.300" fontWeight="bold">
                               v{deviceStatus.firmwareVersion || '?'}
                             </Text>
                           </VStack>
@@ -769,10 +1060,10 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                         </Text>
                       </HStack>
                     </Box>
-                    <Box w="100%" p={2} bg="yellow.900" borderRadius="md" borderWidth="1px" borderColor="yellow.600">
+                    <Box w="100%" p={2} bg="blue.900" borderRadius="md" borderWidth="1px" borderColor="blue.600">
                       <HStack gap={2}>
-                        <FaExclamationTriangle color="#ECC94B" size={12} />
-                        <Text fontSize="2xs" color="yellow.200">
+                        <FaExclamationTriangle color="#63B3ED" size={12} />
+                        <Text fontSize="2xs" color="blue.200">
                           {t('bootloader.doNotUnplugBrick')}
                         </Text>
                       </HStack>
@@ -804,7 +1095,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
             {/* ═══════════════ FIRMWARE ══════════════════════════════ */}
             {step === 'firmware' && (
               <VStack gap={3} w="100%" maxW="460px" mx="auto">
-                <FaDownload color="#F59E0B" size={32} />
+                <FaDownload color="#48BB78" size={32} />
                 <VStack gap={1}>
                   <Text fontSize="lg" fontWeight="bold" color="white" textAlign="center">
                     {t('firmware.title')}
@@ -821,7 +1112,13 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                         {inBootloader ? t('firmware.firmwareLabel') : t('bootloader.current')}
                       </Text>
                       <Text fontSize="sm" color={isOobDevice ? 'red.400' : 'white'} fontWeight="bold">
-                        {inBootloader ? t('firmware.notInstalled') : `v${deviceStatus.firmwareVersion || '?'}`}
+                        {inBootloader
+                          ? deviceStatus.resolvedFwVersion
+                            ? deviceStatus.resolvedFwVersion
+                            : deviceStatus.firmwareHash
+                              ? `${deviceStatus.firmwareHash.slice(0, 10)}… (custom)`
+                              : t('firmware.notInstalled')
+                          : `v${deviceStatus.firmwareVersion || '?'}`}
                       </Text>
                     </VStack>
                     <Text color="gray.500">&rarr;</Text>
@@ -834,31 +1131,266 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                   </HStack>
                 </Box>
 
-                {updateState === 'idle' && !inBootloader && rebootPhase !== 'rebooting' && (
+                {/* In bootloader — show firmware install options (user must click) */}
+                {updateState === 'idle' && inBootloader && rebootPhase !== 'rebooting' && customFwPhase === 'idle' && (
                   <>
-                    <Box maxW="100px" mx="auto" opacity={0.85} dangerouslySetInnerHTML={{ __html: holdAndConnectRaw }} sx={{ '& svg': { width: '100%', height: '100%' } }} />
-                    <Box w="100%" p={2} bg="gray.700" borderRadius="lg" borderWidth="2px" borderColor="yellow.600">
-                      <VStack align="start" gap={0.5}>
+                    <FaCheckCircle color="#48BB78" size={24} />
+                    <Text fontSize="sm" fontWeight="bold" color="green.400" textAlign="center">
+                      {t('firmware.bootloaderReadyForFirmware')}
+                    </Text>
+
+                    {/* Upgrade preview — show new features coming with this firmware */}
+                    {deviceStatus.latestFirmware && (
+                      <FirmwareUpgradePreview
+                        currentVersion={deviceStatus.resolvedFwVersion?.replace(/^v/, '') || deviceStatus.firmwareVersion || null}
+                        targetVersion={deviceStatus.latestFirmware}
+                      />
+                    )}
+
+                    <Button
+                      w="100%"
+                      size="md"
+                      bg={HIGHLIGHT}
+                      color="white"
+                      _hover={{ bg: 'green.600' }}
+                      onClick={() => startFirmwareUpdate(deviceStatus.latestFirmware || undefined)}
+                    >
+                      {t('firmware.installLatestFirmware', { version: deviceStatus.latestFirmware || '?' })}
+                    </Button>
+
+                    {/* Custom firmware section — collapsible caret */}
+                    <Box w="100%" mt={2}>
+                      <Flex
+                        align="center"
+                        justify="center"
+                        gap={1.5}
+                        cursor="pointer"
+                        userSelect="none"
+                        onClick={() => setShowCustomFw((prev) => !prev)}
+                        py={1}
+                      >
+                        <Text fontSize="xs" color="gray.500">
+                          {t('firmware.orCustomFirmware')}
+                        </Text>
+                        {showCustomFw ? (
+                          <FaChevronUp color="#718096" size={10} />
+                        ) : (
+                          <FaChevronDown color="#718096" size={10} />
+                        )}
+                      </Flex>
+                      {showCustomFw && (
+                        <Box
+                          w="100%"
+                          p={4}
+                          mt={2}
+                          borderRadius="lg"
+                          border="2px dashed"
+                          borderColor={fwDragOver ? 'green.400' : 'gray.600'}
+                          bg={fwDragOver ? 'rgba(72, 187, 120, 0.05)' : 'transparent'}
+                          transition="all 0.2s"
+                          textAlign="center"
+                          cursor="pointer"
+                          onClick={() => fileInputRef.current?.click()}
+                          onDragOver={handleFwDragOver}
+                          onDragLeave={handleFwDragLeave}
+                          onDrop={handleFwDrop}
+                        >
+                          <VStack gap={1.5}>
+                            <FaFolderOpen color="#A0AEC0" size={20} />
+                            <Text fontSize="xs" color="gray.400">
+                              {t('firmware.customFirmwareHint')}
+                            </Text>
+                            <Button
+                              size="xs"
+                              variant="outline"
+                              borderColor="gray.600"
+                              color="gray.300"
+                              _hover={{ bg: 'gray.700', borderColor: 'gray.500' }}
+                              onClick={(e: React.MouseEvent) => {
+                                e.stopPropagation()
+                                fileInputRef.current?.click()
+                              }}
+                            >
+                              {t('firmware.browseFiles')}
+                            </Button>
+                          </VStack>
+                        </Box>
+                      )}
+                      <input
+                        ref={fileInputRef}
+                        type="file"
+                        accept=".bin"
+                        style={{ display: 'none' }}
+                        onChange={(e) => {
+                          const file = e.target.files?.[0]
+                          if (file) handleFileSelected(file)
+                        }}
+                      />
+                    </Box>
+                  </>
+                )}
+
+                {/* Custom firmware analyzing */}
+                {customFwPhase === 'analyzing' && (
+                  <VStack gap={2} w="100%">
+                    <Spinner size="md" color={HIGHLIGHT} />
+                    <Text fontSize="sm" fontWeight="bold" color="white">
+                      {t('firmware.analyzingFirmware')}
+                    </Text>
+                    <Text fontSize="xs" color="gray.400">{customFwFileName}</Text>
+                  </VStack>
+                )}
+
+                {/* Custom firmware confirmation */}
+                {customFwPhase === 'confirm' && customFwAnalysis && (
+                  <VStack gap={3} w="100%">
+                    <Text fontSize="sm" fontWeight="bold" color="white">
+                      {t('firmware.customFirmwareReady')}
+                    </Text>
+
+                    <Box w="100%" p={3} bg="gray.700" borderRadius="lg">
+                      <VStack gap={2} align="stretch">
+                        <HStack justify="space-between">
+                          <Text fontSize="xs" color="gray.400">File</Text>
+                          <Text fontSize="xs" color="white" fontFamily="mono">{customFwFileName}</Text>
+                        </HStack>
+                        <HStack justify="space-between">
+                          <Text fontSize="xs" color="gray.400">{t('firmware.version')}</Text>
+                          <Text fontSize="xs" color="white" fontFamily="mono">
+                            {customFwAnalysis.detectedVersion || '?.?.?'}
+                          </Text>
+                        </HStack>
+                        <HStack justify="space-between">
+                          <Text fontSize="xs" color="gray.400">{t('firmware.size')}</Text>
+                          <Text fontSize="xs" color="white" fontFamily="mono">
+                            {(customFwAnalysis.fileSize / 1024).toFixed(1)} KB
+                          </Text>
+                        </HStack>
+                        <HStack>
+                          <Box
+                            px={2} py={0.5} borderRadius="md" fontSize="2xs" fontWeight="bold"
+                            bg={customFwAnalysis.isSigned ? 'rgba(72,187,120,0.15)' : 'rgba(237,137,54,0.15)'}
+                            color={customFwAnalysis.isSigned ? 'green.400' : 'yellow.400'}
+                          >
+                            {customFwAnalysis.isSigned ? t('firmware.signed') : t('firmware.unsigned')}
+                          </Box>
+                        </HStack>
+                      </VStack>
+                    </Box>
+
+                    {customFwAnalysis.willWipeDevice && (
+                      <Box w="100%" p={3} bg="red.900" borderRadius="md" borderWidth="2px" borderColor="red.600">
+                        <HStack gap={2} mb={1}>
+                          <FaExclamationTriangle color="#FC8181" size={14} />
+                          <Text fontSize="xs" fontWeight="bold" color="red.300">
+                            {t('firmware.willWipeWarning')}
+                          </Text>
+                        </HStack>
+                      </Box>
+                    )}
+
+                    {!customFwAnalysis.isSigned && !customFwAnalysis.willWipeDevice && (
+                      <Box w="100%" p={3} bg="red.900" borderRadius="md" borderWidth="1px" borderColor="red.600">
                         <HStack gap={2}>
-                          <FaExclamationTriangle color="#ECC94B" size={12} />
-                          <Text fontSize="xs" fontWeight="bold" color="yellow.300">
-                            {t('bootloader.enterFirmwareUpdateMode')}
+                          <FaExclamationTriangle color="#FC8181" size={12} />
+                          <Text fontSize="xs" color="red.200">
+                            {t('firmware.unsignedWarning')}
                           </Text>
                         </HStack>
-                        <VStack align="start" gap={0} pl={5}>
-                          <Text fontSize="2xs" color="gray.200">{t('bootloader.step1Unplug')}</Text>
-                          <Text fontSize="2xs" color="gray.200">{t('bootloader.step2Hold')}</Text>
-                          <Text fontSize="2xs" color="gray.200">{t('bootloader.step3Plugin')}</Text>
-                          <Text fontSize="2xs" color="gray.200">{t('bootloader.step4Release')}</Text>
+                      </Box>
+                    )}
+
+                    <HStack gap={2} w="100%">
+                      <Button
+                        flex={1}
+                        size="sm"
+                        variant="outline"
+                        borderColor="gray.600"
+                        color="gray.300"
+                        _hover={{ bg: 'gray.700' }}
+                        onClick={handleCustomFwReset}
+                      >
+                        Cancel
+                      </Button>
+                      <Button
+                        flex={1}
+                        size="sm"
+                        bg={customFwAnalysis.willWipeDevice ? 'red.600' : HIGHLIGHT}
+                        color="white"
+                        _hover={{ bg: customFwAnalysis.willWipeDevice ? 'red.500' : 'green.600' }}
+                        onClick={handleCustomFlash}
+                      >
+                        {t('firmware.flashFirmware')}
+                      </Button>
+                    </HStack>
+                  </VStack>
+                )}
+
+                {/* Custom firmware flashing */}
+                {customFwPhase === 'flashing' && (
+                  <VStack gap={2} w="100%">
+                    <Spinner size="md" color={HIGHLIGHT} />
+                    <Text fontSize="sm" fontWeight="bold" color="white">
+                      {customFwProgress?.message || t('firmware.uploadingFirmware')}
+                    </Text>
+                    <Box w="100%" h="8px" bg="gray.700" borderRadius="full" overflow="hidden">
+                      <Box
+                        h="100%"
+                        borderRadius="full"
+                        w={`${customFwProgress?.percent || 0}%`}
+                        transition="width 0.3s"
+                        bg={HIGHLIGHT}
+                      />
+                    </Box>
+                    <Text fontSize="2xs" color="red.300">{t('firmware.doNotUnplug')}</Text>
+                  </VStack>
+                )}
+
+                {/* Custom firmware error */}
+                {customFwPhase === 'error' && (
+                  <Box w="100%" p={3} bg="red.900" borderRadius="md" borderWidth="1px" borderColor="red.600">
+                    <VStack gap={1} align="start">
+                      <Text fontSize="sm" color="red.300" fontWeight="bold">{t('firmware.customFlashFailed')}</Text>
+                      <Text fontSize="xs" color="red.200">{customFwError}</Text>
+                    </VStack>
+                    <Button
+                      mt={2}
+                      size="sm"
+                      variant="outline"
+                      borderColor="red.400"
+                      color="red.300"
+                      onClick={handleCustomFwReset}
+                    >
+                      {t('bootloader.tryAgain')}
+                    </Button>
+                  </Box>
+                )}
+
+                {/* Not in bootloader — show instructions to enter bootloader */}
+                {updateState === 'idle' && !inBootloader && rebootPhase !== 'rebooting' && customFwPhase === 'idle' && (
+                  <>
+                    <Box maxW="100px" mx="auto" opacity={0.85} dangerouslySetInnerHTML={{ __html: holdAndConnectRaw }} sx={{ '& svg': { width: '100%', height: '100%' } }} />
+                    <Box w="100%" p={3} bg="gray.700" borderRadius="lg" borderWidth="1px" borderColor="gray.600">
+                      <VStack align="start" gap={1}>
+                        <Text fontSize="xs" fontWeight="bold" color="white">
+                          {t('bootloader.stepsTitle')}
+                        </Text>
+                        <VStack align="start" gap={0} pl={1}>
+                          <Text fontSize="2xs" color="gray.200">1. {t('bootloader.step1Unplug')}</Text>
+                          <Text fontSize="2xs" color="gray.200">2. {t('bootloader.step2Hold')}</Text>
+                          <Text fontSize="2xs" color="gray.200">3. {t('bootloader.step3Plugin')}</Text>
+                          <Text fontSize="2xs" color="gray.200">4. {t('bootloader.step4Release')}</Text>
                         </VStack>
                       </VStack>
                     </Box>
-                    <HStack gap={2} w="100%" justify="center">
-                      <Spinner size="sm" color="yellow.400" />
-                      <Text fontSize="xs" color="yellow.300">
-                        {t('bootloader.listeningForBootloader')}
-                      </Text>
-                    </HStack>
+                    <Box w="100%" p={2} bg="green.900" borderRadius="md" borderWidth="1px" borderColor="green.600">
+                      <HStack gap={2} justify="center">
+                        <Spinner size="sm" color="green.300" />
+                        <Text fontSize="xs" color="green.200">
+                          {t('bootloader.waitingForBootloader')}
+                        </Text>
+                      </HStack>
+                    </Box>
                   </>
                 )}
 
@@ -867,20 +1399,20 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                     <Box
                       w="100%"
                       p={3}
-                      bg="orange.900"
+                      bg="green.900"
                       borderRadius="lg"
                       borderWidth="2px"
                       borderColor={HIGHLIGHT}
                       style={{ animation: 'kkGlow 2s ease-in-out infinite' }}
                     >
                       <VStack gap={1}>
-                        <Text fontSize="sm" fontWeight="bold" color="orange.200">
+                        <Text fontSize="sm" fontWeight="bold" color="green.200">
                           {t('firmware.confirmOnDevice')}
                         </Text>
-                        <Text fontSize="xs" color="orange.100">
+                        <Text fontSize="xs" color="green.100">
                           {t('firmware.lookAtDeviceAndPress')}
                         </Text>
-                        <Text fontSize="2xs" color="orange.200" opacity={0.7}>
+                        <Text fontSize="2xs" color="green.200" opacity={0.7}>
                           {t('firmware.verifyBackupNote')}
                         </Text>
                       </VStack>
@@ -910,19 +1442,46 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                 )}
 
                 {rebootPhase === 'rebooting' && (
-                  <Box w="100%" p={3} bg="blue.900" borderRadius="md" borderWidth="2px" borderColor="blue.500">
-                    <VStack gap={2} align="start">
-                      <HStack gap={2}>
-                        <Spinner size="sm" color="blue.300" />
-                        <Text fontSize="sm" color="blue.300" fontWeight="bold">
-                          {t('firmware.deviceRebooting', { defaultValue: 'Device rebooting...' })}
+                  <VStack gap={2} w="100%">
+                    <Box w="100%" p={3} bg="blue.900" borderRadius="md" borderWidth="2px" borderColor="blue.500">
+                      <VStack gap={2} align="start">
+                        <HStack gap={2}>
+                          <Spinner size="sm" color="blue.300" />
+                          <Text fontSize="sm" color="blue.300" fontWeight="bold">
+                            {rebootElapsedMs < 20000
+                              ? t('firmware.deviceRebooting', { defaultValue: 'Device rebooting...' })
+                              : t('firmware.rebootTakingLong', { defaultValue: 'Reconnection is taking longer than usual...' })}
+                          </Text>
+                        </HStack>
+                        <Text fontSize="xs" color="blue.200">
+                          {rebootElapsedMs < 20000
+                            ? t('firmware.rebootingMessage', { defaultValue: 'Waiting for device to reconnect after update.' })
+                            : t('firmware.rebootTakingLongSub', { defaultValue: 'The device may need a moment to restart.' })}
                         </Text>
-                      </HStack>
-                      <Text fontSize="xs" color="blue.200">
-                        {t('firmware.rebootingMessage', { defaultValue: 'Waiting for device to reconnect after update.' })}
-                      </Text>
-                    </VStack>
-                  </Box>
+                      </VStack>
+                    </Box>
+
+                    {rebootElapsedMs >= 30000 && (
+                      <Box w="100%" p={3} bg="blue.900" borderRadius="md" borderWidth="2px" borderColor="blue.600">
+                        <VStack gap={1.5} align="start">
+                          <HStack gap={2}>
+                            <FaExclamationTriangle color="#63B3ED" size={14} />
+                            <Text fontSize="sm" fontWeight="bold" color="blue.300">
+                              {t('firmware.manualReconnectTitle', { defaultValue: 'Device not reconnecting?' })}
+                            </Text>
+                          </HStack>
+                          <VStack align="start" gap={0.5} pl={5}>
+                            <Text fontSize="xs" color="blue.200">{t('firmware.manualReconnectStep1', { defaultValue: '1. Unplug your KeepKey' })}</Text>
+                            <Text fontSize="xs" color="blue.200">{t('firmware.manualReconnectStep2', { defaultValue: '2. Wait 5 seconds' })}</Text>
+                            <Text fontSize="xs" color="blue.200">{t('firmware.manualReconnectStep3', { defaultValue: '3. Plug it back in' })}</Text>
+                          </VStack>
+                          <Text fontSize="2xs" color="blue.300" pl={5}>
+                            {t('firmware.manualReconnectNote', { defaultValue: 'Setup will continue automatically when the device is detected.' })}
+                          </Text>
+                        </VStack>
+                      </Box>
+                    )}
+                  </VStack>
                 )}
 
                 {updateState === 'error' && (
@@ -937,7 +1496,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                   </Box>
                 )}
 
-                {updateState === 'idle' && !isOobDevice && rebootPhase !== 'rebooting' && (
+                {updateState === 'idle' && !isOobDevice && !inBootloader && rebootPhase !== 'rebooting' && (
                   <Button
                     w="100%"
                     variant="ghost"
@@ -987,12 +1546,12 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                     bg="gray.700"
                     transition="all 0.2s"
                     _hover={{
-                      borderColor: 'orange.500',
+                      borderColor: 'green.500',
                       transform: 'translateY(-1px)',
                     }}
                   >
                     <VStack gap={3}>
-                      <Box p={2} borderRadius="full" bg="orange.500" color="white">
+                      <Box p={2} borderRadius="full" bg="green.500" color="white">
                         <FaPlus size={20} />
                       </Box>
                       <VStack gap={1}>
@@ -1043,7 +1602,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                                   color={wordCount === wc ? 'white' : 'gray.400'}
                                   borderWidth="1px"
                                   borderColor={wordCount === wc ? HIGHLIGHT : 'transparent'}
-                                  _hover={{ bg: wordCount === wc ? 'orange.600' : 'gray.500' }}
+                                  _hover={{ bg: wordCount === wc ? 'green.600' : 'gray.500' }}
                                   transition="all 0.15s"
                                   onClick={(e: React.MouseEvent) => {
                                     e.stopPropagation()
@@ -1063,7 +1622,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                                 rel="noopener noreferrer"
                                 color={HIGHLIGHT}
                                 textDecoration="underline"
-                                _hover={{ color: 'orange.300' }}
+                                _hover={{ color: 'green.300' }}
                                 onClick={(e: React.MouseEvent) => e.stopPropagation()}
                               >
                                 {t('initChoose.learnMore', { defaultValue: 'Learn more' })}
@@ -1078,7 +1637,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                         size="md"
                         bg={HIGHLIGHT}
                         color="white"
-                        _hover={{ bg: 'orange.600' }}
+                        _hover={{ bg: 'green.600' }}
                         onClick={(e: React.MouseEvent) => {
                           e.stopPropagation()
                           handleCreateWallet()
@@ -1200,10 +1759,10 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                   </Text>
                 </VStack>
 
-                <Box w="100%" p={3} bg="orange.900" borderRadius="lg" borderWidth="2px" borderColor={HIGHLIGHT}>
+                <Box w="100%" p={3} bg="green.900" borderRadius="lg" borderWidth="2px" borderColor={HIGHLIGHT}>
                   <HStack gap={2} justify="center">
-                    <FaExclamationTriangle color="#F59E0B" size={14} />
-                    <Text fontSize="xs" color="orange.200" fontWeight="bold">
+                    <FaExclamationTriangle color="#48BB78" size={14} />
+                    <Text fontSize="xs" color="green.200" fontWeight="bold">
                       {t('initProgress.lookAtDevice')}
                     </Text>
                   </HStack>
@@ -1233,7 +1792,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                   color="white"
                   size="md"
                   _hover={{ borderColor: 'gray.500' }}
-                  _focus={{ borderColor: 'orange.500', boxShadow: '0 0 0 1px orange.500' }}
+                  _focus={{ borderColor: 'green.500', boxShadow: '0 0 0 1px green.500' }}
                   onKeyDown={(e: React.KeyboardEvent) => {
                     if (e.key === 'Enter' && deviceLabel.trim()) {
                       handleApplyLabel()
@@ -1247,7 +1806,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                     size="md"
                     bg={HIGHLIGHT}
                     color="white"
-                    _hover={{ bg: 'orange.600' }}
+                    _hover={{ bg: 'green.600' }}
                     onClick={handleApplyLabel}
                     disabled={!deviceLabel.trim()}
                   >
@@ -1350,7 +1909,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
                   size="sm"
                   bg={HIGHLIGHT}
                   color="white"
-                  _hover={{ bg: 'orange.600' }}
+                  _hover={{ bg: 'green.600' }}
                   onClick={handleNext}
                 >
                   {t('footer.next')}
@@ -1373,6 +1932,7 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
           align="center"
           justify="center"
           zIndex={2000}
+          pointerEvents="auto"
           onClick={handleDevLoadCancel}
         >
           <Box
@@ -1498,6 +2058,99 @@ export function OobSetupWizard({ onComplete, onSetupInProgress }: OobSetupWizard
           </Box>
         </Flex>
       )}
+
+      {/* ── "How does this work?" dialog ───────────────────────────── */}
+      {showReadMore && (
+        <Flex
+          position="fixed"
+          top={0}
+          left={0}
+          w="100vw"
+          h="100vh"
+          bg="blackAlpha.700"
+          align="center"
+          justify="center"
+          zIndex={2000}
+          pointerEvents="auto"
+          onClick={() => setShowReadMore(false)}
+        >
+          <Box
+            w="100%"
+            maxW="480px"
+            mx={4}
+            bg="gray.800"
+            borderRadius="xl"
+            borderWidth="1px"
+            borderColor="gray.600"
+            boxShadow="0 12px 40px rgba(0,0,0,0.6)"
+            onClick={(e: React.MouseEvent) => e.stopPropagation()}
+          >
+            {/* Dialog header */}
+            <Flex px={5} py={3} borderBottomWidth="1px" borderColor="gray.700" align="center" justify="space-between">
+              <Text fontSize="md" fontWeight="bold" color="green.400">
+                {t('welcome.readMoreTitle')}
+              </Text>
+              <Box
+                as="button"
+                p={1}
+                borderRadius="md"
+                cursor="pointer"
+                _hover={{ bg: 'whiteAlpha.100' }}
+                onClick={() => setShowReadMore(false)}
+              >
+                <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" style={{ color: '#A0AEC0' }}>
+                  <line x1="18" y1="6" x2="6" y2="18" />
+                  <line x1="6" y1="6" x2="18" y2="18" />
+                </svg>
+              </Box>
+            </Flex>
+
+            {/* Dialog body */}
+            <VStack gap={4} px={5} py={4} align="start">
+              <VStack gap={1} align="start">
+                <Text fontSize="sm" fontWeight="600" color="white">
+                  {t('welcome.readMoreBootloaderTitle')}
+                </Text>
+                <Text fontSize="sm" color="gray.300" lineHeight="tall">
+                  {t('welcome.readMoreBootloaderBody')}
+                </Text>
+              </VStack>
+
+              <VStack gap={1} align="start">
+                <Text fontSize="sm" fontWeight="600" color="white">
+                  {t('welcome.readMoreFirmwareTitle')}
+                </Text>
+                <Text fontSize="sm" color="gray.300" lineHeight="tall">
+                  {t('welcome.readMoreFirmwareBody')}
+                </Text>
+              </VStack>
+
+              <VStack gap={1} align="start">
+                <Text fontSize="sm" fontWeight="600" color="white">
+                  {t('welcome.readMoreWhyTitle')}
+                </Text>
+                <Text fontSize="sm" color="gray.300" lineHeight="tall">
+                  {t('welcome.readMoreWhyBody')}
+                </Text>
+              </VStack>
+            </VStack>
+
+            {/* Dialog footer */}
+            <Box px={5} py={3} borderTopWidth="1px" borderColor="gray.700">
+              <Button
+                w="100%"
+                size="sm"
+                bg={HIGHLIGHT}
+                color="white"
+                _hover={{ bg: 'green.600' }}
+                onClick={() => setShowReadMore(false)}
+              >
+                {t('welcome.gotIt')}
+              </Button>
+            </Box>
+          </Box>
+        </Flex>
+      )}
     </Flex>
   )
 }
diff --git a/projects/keepkey-vault/src/mainview/components/ReportDialog.tsx b/projects/keepkey-vault/src/mainview/components/ReportDialog.tsx
new file mode 100644
index 00000000..289d6112
--- /dev/null
+++ b/projects/keepkey-vault/src/mainview/components/ReportDialog.tsx
@@ -0,0 +1,375 @@
+import { useState, useEffect, useCallback, useRef } from "react"
+import { Box, Flex, Text, Spinner, Image } from "@chakra-ui/react"
+import { rpcRequest, onRpcMessage } from "../lib/rpc"
+import { Z } from "../lib/z-index"
+import type { ReportMeta } from "../../shared/types"
+
+import keepkeyLogo from "../assets/icon.png"
+import coinTrackerLogo from "../assets/logo/cointracker.png"
+import zenLedgerLogo from "../assets/logo/zenledger.png"
+
+type ExportFormat = "pdf" | "cointracker" | "zenledger"
+
+const EXPORT_OPTIONS: { key: ExportFormat; label: string; sub: string; logo: string; bg: string }[] = [
+	{ key: "pdf", label: "KeepKey PDF", sub: "Full portfolio report", logo: keepkeyLogo, bg: "rgba(192,168,96,0.10)" },
+	{ key: "cointracker", label: "CoinTracker", sub: "Tax CSV export", logo: coinTrackerLogo, bg: "rgba(255,255,255,0.05)" },
+	{ key: "zenledger", label: "ZenLedger", sub: "Tax CSV export", logo: zenLedgerLogo, bg: "rgba(255,255,255,0.05)" },
+]
+
+interface ReportDialogProps {
+	onClose: () => void
+}
+
+export function ReportDialog({ onClose }: ReportDialogProps) {
+	const [generating, setGenerating] = useState(false)
+	const [progress, setProgress] = useState<{ message: string; percent: number } | null>(null)
+	const [reports, setReports] = useState<ReportMeta[]>([])
+	const [error, setError] = useState<string | null>(null)
+	const [loadingReports, setLoadingReports] = useState(true)
+	const activeReportId = useRef<string | null>(null)
+	const [confirmDeleteId, setConfirmDeleteId] = useState<string | null>(null)
+
+	// Load report list on mount
+	useEffect(() => {
+		rpcRequest<ReportMeta[]>("listReports", undefined, 5000)
+			.then(setReports)
+			.catch(() => {})
+			.finally(() => setLoadingReports(false))
+	}, [])
+
+	// Listen for progress messages — accept any progress while generating
+	useEffect(() => {
+		return onRpcMessage("report-progress", (payload: { id: string; message: string; percent: number }) => {
+			// Capture report ID from first progress message (set before await resolves)
+			if (!activeReportId.current && payload.id) {
+				activeReportId.current = payload.id
+			}
+			if (payload.id === activeReportId.current) {
+				setProgress({ message: payload.message, percent: payload.percent })
+			}
+		})
+	}, [])
+
+	const handleGenerate = useCallback(async () => {
+		setGenerating(true)
+		setError(null)
+		setProgress({ message: "Starting...", percent: 0 })
+
+		try {
+			const meta = await rpcRequest<ReportMeta>("generateReport", undefined, 300_000)
+			activeReportId.current = meta.id
+			setReports(prev => [meta, ...prev])
+		} catch (e: any) {
+			setError(e.message || "Report generation failed")
+		} finally {
+			setGenerating(false)
+			setProgress(null)
+			activeReportId.current = null
+		}
+	}, [])
+
+	const handleDelete = useCallback(async (id: string) => {
+		try {
+			await rpcRequest("deleteReport", { id }, 5000)
+			setReports(prev => prev.filter(r => r.id !== id))
+		} catch {}
+		setConfirmDeleteId(null)
+	}, [])
+
+	const [saving, setSaving] = useState<string | null>(null)
+
+	const handleDownload = useCallback(async (id: string, format: ExportFormat) => {
+		try {
+			setSaving(`${id}-${format}`)
+			await rpcRequest<{ filePath: string }>("saveReportFile", { id, format }, 30000)
+		} catch {} finally {
+			setSaving(null)
+		}
+	}, [])
+
+	return (
+		<>
+			{/* Backdrop */}
+			<Box
+				position="fixed"
+				inset="0"
+				bg="blackAlpha.700"
+				zIndex={Z.dialog}
+				onClick={generating ? undefined : onClose}
+			/>
+
+			{/* Dialog */}
+			<Box
+				position="fixed"
+				top="50%"
+				left="50%"
+				transform="translate(-50%, -50%)"
+				w="95%"
+				maxW="520px"
+				maxH="85vh"
+				bg="kk.bg"
+				border="1px solid"
+				borderColor="kk.gold"
+				borderRadius="xl"
+				zIndex={Z.dialog + 1}
+				overflow="hidden"
+				display="flex"
+				flexDirection="column"
+			>
+				{/* Header */}
+				<Flex
+					align="center"
+					justify="space-between"
+					px="5"
+					py="4"
+					borderBottom="1px solid"
+					borderColor="kk.border"
+					flexShrink={0}
+				>
+					<Text fontSize="lg" fontWeight="700" color="kk.gold">
+						Reports &amp; Tax Export
+					</Text>
+					{!generating && (
+						<Box
+							as="button"
+							color="kk.textMuted"
+							fontSize="lg"
+							cursor="pointer"
+							_hover={{ color: "white" }}
+							onClick={onClose}
+						>
+							&times;
+						</Box>
+					)}
+				</Flex>
+
+				{/* Scrollable body */}
+				<Box flex="1" overflowY="auto" px="5" py="4">
+					{/* Security notice */}
+					<Box
+						p="3"
+						mb="4"
+						bg="rgba(192,168,96,0.06)"
+						border="1px solid"
+						borderColor="rgba(192,168,96,0.15)"
+						borderRadius="lg"
+					>
+						<Text fontSize="10px" color="kk.gold" lineHeight="1.5">
+							Generate a report then export as KeepKey branded PDF, CoinTracker CSV,
+							or ZenLedger CSV for tax filing. Reports include device info, chain balances,
+							BTC transaction history, and address flow analysis.
+							Store securely and never share with untrusted parties.
+						</Text>
+					</Box>
+
+					{/* Generate button */}
+					<Box
+						as="button"
+						w="100%"
+						py="2.5"
+						mb="4"
+						bg={generating ? "kk.border" : "kk.gold"}
+						color={generating ? "kk.textMuted" : "black"}
+						fontSize="sm"
+						fontWeight="700"
+						borderRadius="lg"
+						cursor={generating ? "default" : "pointer"}
+						_hover={generating ? {} : { bg: "#e6c840" }}
+						_active={generating ? {} : { transform: "scale(0.98)" }}
+						onClick={generating ? undefined : handleGenerate}
+						transition="all 0.15s"
+					>
+						{generating ? (
+							<Flex align="center" justify="center" gap="2">
+								<Spinner size="xs" />
+								<Text>{progress?.message || "Generating..."}</Text>
+							</Flex>
+						) : (
+							"Generate Report"
+						)}
+					</Box>
+
+					{/* Progress bar */}
+					{generating && progress && (
+						<Box mb="4">
+							<Box w="100%" h="4px" bg="kk.border" borderRadius="full" overflow="hidden">
+								<Box
+									h="100%"
+									w={`${progress.percent}%`}
+									bg="kk.gold"
+									borderRadius="full"
+									transition="width 0.3s"
+								/>
+							</Box>
+							<Text fontSize="10px" color="kk.textMuted" mt="1" textAlign="center">
+								{progress.percent}%
+							</Text>
+						</Box>
+					)}
+
+					{/* Error */}
+					{error && (
+						<Box
+							p="3"
+							mb="4"
+							bg="rgba(220,53,69,0.08)"
+							border="1px solid"
+							borderColor="rgba(220,53,69,0.3)"
+							borderRadius="lg"
+						>
+							<Text fontSize="xs" color="#DC3545">{error}</Text>
+						</Box>
+					)}
+
+					{/* Previous reports */}
+					{loadingReports ? (
+						<Flex justify="center" py="4">
+							<Spinner size="sm" color="kk.gold" />
+						</Flex>
+					) : reports.length > 0 ? (
+						<Box>
+							<Text fontSize="xs" color="kk.textSecondary" mb="2" fontWeight="600">
+								Previous Reports
+							</Text>
+							<Flex direction="column" gap="3">
+								{reports.map(r => (
+									<Box
+										key={r.id}
+										p="3"
+										bg="kk.cardBg"
+										border="1px solid"
+										borderColor="kk.border"
+										borderRadius="lg"
+									>
+										<Flex justify="space-between" align="center" mb="1">
+											<Text fontSize="xs" fontWeight="600" color="white">
+												Full Detail Report
+											</Text>
+											<Text fontSize="10px" color={r.status === "error" ? "#DC3545" : "kk.textMuted"}>
+												{r.status === "error" ? "Failed" : `$${r.totalUsd.toFixed(2)}`}
+											</Text>
+										</Flex>
+										<Text fontSize="10px" color="kk.textMuted" mb="3">
+											{new Date(r.createdAt).toLocaleString()}
+										</Text>
+										{r.error && (
+											<Text fontSize="10px" color="#DC3545" mb="3">{r.error}</Text>
+										)}
+
+										{/* Export buttons with logos */}
+										{r.status === "complete" && (
+											<Flex gap="2" mb="2" wrap="wrap">
+												{EXPORT_OPTIONS.map(({ key, label, sub, logo, bg }) => {
+													const savingKey = `${r.id}-${key}`
+													const isSavingThis = saving === savingKey
+													return (
+														<Box
+															key={key}
+															as="button"
+															flex="1"
+															minW="130px"
+															p="2"
+															bg={bg}
+															border="1px solid"
+															borderColor="rgba(192,168,96,0.2)"
+															borderRadius="lg"
+															cursor={isSavingThis ? "default" : "pointer"}
+															opacity={isSavingThis ? 0.5 : 1}
+															_hover={isSavingThis ? {} : { borderColor: "kk.gold", bg: "rgba(192,168,96,0.15)" }}
+															transition="all 0.15s"
+															onClick={() => !isSavingThis && handleDownload(r.id, key)}
+														>
+															<Flex align="center" gap="2">
+																<Image
+																	src={logo}
+																	alt={label}
+																	h="20px"
+																	w="auto"
+																	maxW="20px"
+																	objectFit="contain"
+																	borderRadius="3px"
+																/>
+																<Box textAlign="left">
+																	<Text fontSize="10px" fontWeight="700" color="white" lineHeight="1.2">
+																		{isSavingThis ? "Saving..." : label}
+																	</Text>
+																	<Text fontSize="8px" color="kk.textMuted" lineHeight="1.2">
+																		{sub}
+																	</Text>
+																</Box>
+															</Flex>
+														</Box>
+													)
+												})}
+											</Flex>
+										)}
+
+										{/* Delete with confirmation */}
+										<Flex>
+											{confirmDeleteId === r.id ? (
+												<Flex gap="1" align="center">
+													<Box
+														as="button"
+														px="2"
+														py="1"
+														fontSize="10px"
+														fontWeight="600"
+														color="white"
+														bg="#DC3545"
+														borderRadius="md"
+														cursor="pointer"
+														onClick={() => handleDelete(r.id)}
+													>
+														Confirm
+													</Box>
+													<Box
+														as="button"
+														px="2"
+														py="1"
+														fontSize="10px"
+														fontWeight="600"
+														color="kk.textMuted"
+														bg="transparent"
+														border="1px solid"
+														borderColor="kk.border"
+														borderRadius="md"
+														cursor="pointer"
+														onClick={() => setConfirmDeleteId(null)}
+													>
+														Cancel
+													</Box>
+												</Flex>
+											) : (
+												<Box
+													as="button"
+													px="2.5"
+													py="1"
+													fontSize="10px"
+													fontWeight="600"
+													color="kk.textMuted"
+													bg="transparent"
+													border="1px solid"
+													borderColor="kk.border"
+													borderRadius="md"
+													cursor="pointer"
+													_hover={{ borderColor: "#DC3545", color: "#DC3545" }}
+													onClick={() => setConfirmDeleteId(r.id)}
+												>
+													Delete
+												</Box>
+											)}
+										</Flex>
+									</Box>
+								))}
+							</Flex>
+						</Box>
+					) : (
+						<Text fontSize="xs" color="kk.textMuted" textAlign="center" py="4">
+							No reports generated yet.
+						</Text>
+					)}
+				</Box>
+			</Box>
+		</>
+	)
+}
diff --git a/projects/keepkey-vault/src/mainview/components/TopNav.tsx b/projects/keepkey-vault/src/mainview/components/TopNav.tsx
index ef002df5..7313db24 100644
--- a/projects/keepkey-vault/src/mainview/components/TopNav.tsx
+++ b/projects/keepkey-vault/src/mainview/components/TopNav.tsx
@@ -1,6 +1,9 @@
 import { Flex, Text, Box, Image, IconButton, HStack } from "@chakra-ui/react"
 import { useTranslation } from "react-i18next"
 import { Z } from "../lib/z-index"
+import { IS_WINDOWS } from "../lib/platform"
+import { useWindowDrag } from "../hooks/useWindowDrag"
+import { rpcRequest } from "../lib/rpc"
 import kkIcon from "../assets/icon.png"
 
 export type NavTab = "vault" | "shapeshift" | "apps"
@@ -10,6 +13,8 @@ interface TopNavProps {
 	connected: boolean
 	firmwareVersion?: string
 	firmwareVerified?: boolean
+	needsFirmwareUpdate?: boolean
+	latestFirmware?: string
 	onSettingsToggle: () => void
 	settingsOpen?: boolean
 	activeTab: NavTab
@@ -17,6 +22,23 @@ interface TopNavProps {
 	watchOnly?: boolean
 }
 
+/** Construction/hard-hat icon for dev firmware */
+const ConstructionIcon = () => (
+	<svg width="12" height="12" viewBox="0 0 24 24" fill="none">
+		<path d="M2 20h20v2H2zM4 18h16v-2H4z" fill="#A78BFA" />
+		<path d="M12 2C8.69 2 6 4.69 6 8v2h12V8c0-3.31-2.69-6-6-6z" fill="#A78BFA" />
+		<rect x="5" y="10" width="14" height="3" rx="1" fill="#C4B5FD" />
+	</svg>
+)
+
+/** Shield icon for verified/signed firmware */
+const ShieldCheckIcon = ({ color }: { color: string }) => (
+	<svg width="12" height="12" viewBox="0 0 24 24" fill="none">
+		<path d="M12 2L3 7v5c0 5.25 3.75 10.14 9 11.25C17.25 22.14 21 17.25 21 12V7l-9-5z" fill={color} fillOpacity="0.2" stroke={color} strokeWidth="2" />
+		<path d="M9 12l2 2 4-4" stroke={color} strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
+	</svg>
+)
+
 /** Grid icon (11px) for Apps tab */
 const GridIcon = () => (
 	<svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">
@@ -29,6 +51,7 @@ const GridIcon = () => (
 
 /** Minimal nav bar for splash / setup phases. */
 export function SplashNav() {
+	const windowDrag = useWindowDrag()
 	return (
 		<Flex
 			position="fixed"
@@ -43,6 +66,9 @@ export function SplashNav() {
 			align="center"
 			px="4"
 			zIndex={Z.nav}
+			{...(!IS_WINDOWS ? { className: "electrobun-webkit-app-region-drag" } : {})}
+			{...(windowDrag ? { onMouseDown: windowDrag.onMouseDown } : {})}
+			onDoubleClick={IS_WINDOWS ? () => rpcRequest("windowMaximize") : undefined}
 		>
 			<Flex align="center" gap="2">
 				<Image
@@ -60,8 +86,9 @@ export function SplashNav() {
 	)
 }
 
-export function TopNav({ label, connected, firmwareVersion, firmwareVerified, onSettingsToggle, settingsOpen, activeTab, onTabChange, watchOnly }: TopNavProps) {
+export function TopNav({ label, connected, firmwareVersion, firmwareVerified, needsFirmwareUpdate, latestFirmware, onSettingsToggle, settingsOpen, activeTab, onTabChange, watchOnly }: TopNavProps) {
 	const { t } = useTranslation("nav")
+	const windowDrag = useWindowDrag()
 
 	const TAB_DEFS: { id: NavTab; label: string; icon: JSX.Element }[] = [
 		{
@@ -94,6 +121,9 @@ export function TopNav({ label, connected, firmwareVersion, firmwareVerified, on
 			align="center"
 			px="4"
 			zIndex={Z.nav}
+			{...(!IS_WINDOWS ? { className: "electrobun-webkit-app-region-drag" } : {})}
+			{...(windowDrag ? { onMouseDown: windowDrag.onMouseDown } : {})}
+			onDoubleClick={IS_WINDOWS ? () => rpcRequest("windowMaximize") : undefined}
 		>
 			{/* Left: device icon + label */}
 			<Flex align="center" gap="2" flex="1">
@@ -126,15 +156,33 @@ export function TopNav({ label, connected, firmwareVersion, firmwareVerified, on
 					</Text>
 				) : firmwareVersion ? (
 					<Flex align="center" gap="1">
-						{firmwareVerified === false && (
-							<svg width="12" height="12" viewBox="0 0 24 24" fill="none">
-								<path d="M12 2L1 21h22L12 2z" fill="#FB923C" />
-								<path d="M12 9v4M12 17h.01" stroke="white" strokeWidth="2" strokeLinecap="round" />
-							</svg>
+						{firmwareVerified === false ? (
+							<>
+								<ConstructionIcon />
+								<Text fontSize="xs" color="#A78BFA" fontWeight="400">
+									v{firmwareVersion} (dev)
+								</Text>
+							</>
+						) : needsFirmwareUpdate ? (
+							<>
+								<ShieldCheckIcon color="#FB923C" />
+								<Text fontSize="xs" color="#FB923C" fontWeight="400">
+									v{firmwareVersion}
+								</Text>
+								{latestFirmware && (
+									<Text fontSize="9px" color="#FB923C" fontWeight="400" opacity={0.7}>
+										→ v{latestFirmware}
+									</Text>
+								)}
+							</>
+						) : (
+							<>
+								<ShieldCheckIcon color="#4ADE80" />
+								<Text fontSize="xs" color="#4ADE80" fontWeight="400">
+									v{firmwareVersion}
+								</Text>
+							</>
 						)}
-						<Text fontSize="xs" color={firmwareVerified === false ? "#FB923C" : "#4ADE80"} fontWeight="400">
-							v{firmwareVersion}
-						</Text>
 					</Flex>
 				) : null}
 			</Flex>
@@ -175,13 +223,11 @@ export function TopNav({ label, connected, firmwareVersion, firmwareVerified, on
 			<Flex flex="1" justify="flex-end" align="center">
 				<IconButton
 					aria-label={t("deviceSettings")}
-					onClick={watchOnly ? undefined : onSettingsToggle}
+					onClick={onSettingsToggle}
 					size="sm"
 					variant="ghost"
 					color={settingsOpen ? "kk.gold" : "kk.textSecondary"}
-					_hover={watchOnly ? {} : { color: "kk.gold", bg: "rgba(255,255,255,0.06)" }}
-					disabled={watchOnly}
-					opacity={watchOnly ? 0.4 : 1}
+					_hover={{ color: "kk.gold", bg: "rgba(255,255,255,0.06)" }}
 				>
 					<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
 						<circle cx="12" cy="12" r="3" />
diff --git a/projects/keepkey-vault/src/mainview/components/device/PassphraseEntry.tsx b/projects/keepkey-vault/src/mainview/components/device/PassphraseEntry.tsx
index a01a1592..b137f690 100644
--- a/projects/keepkey-vault/src/mainview/components/device/PassphraseEntry.tsx
+++ b/projects/keepkey-vault/src/mainview/components/device/PassphraseEntry.tsx
@@ -1,9 +1,9 @@
 import { useState, useEffect, useCallback, useRef } from "react"
-import { Box, Text, Flex, Button, Input } from "@chakra-ui/react"
+import { Box, Text, Flex, Button, Input, Spinner } from "@chakra-ui/react"
 import { useTranslation } from "react-i18next"
 
 interface PassphraseEntryProps {
-	onSubmit: (passphrase: string) => void
+	onSubmit: (passphrase: string) => Promise<void>
 	onCancel: () => void
 }
 
@@ -16,17 +16,26 @@ export function PassphraseEntry({ onSubmit, onCancel }: PassphraseEntryProps) {
 	const { t } = useTranslation("device")
 	const [passphrase, setPassphrase] = useState("")
 	const [showPassphrase, setShowPassphrase] = useState(false)
+	const [submitting, setSubmitting] = useState(false)
 	const inputRef = useRef<HTMLInputElement>(null)
 
 	// Auto-focus the input on mount
 	useEffect(() => {
-		setTimeout(() => inputRef.current?.focus(), 100)
-	}, [])
+		if (!submitting) setTimeout(() => inputRef.current?.focus(), 100)
+	}, [submitting])
 
-	const handleSubmit = useCallback(() => {
-		onSubmit(passphrase)
-		setPassphrase("")
-	}, [passphrase, onSubmit])
+	const handleSubmit = useCallback(async () => {
+		if (submitting) return
+		setSubmitting(true)
+		try {
+			await onSubmit(passphrase)
+		} catch {
+			// If sendPassphrase fails (e.g. device disconnected), reset so user can retry or cancel
+			setSubmitting(false)
+		}
+		// Stay in "Confirm on device" state — the parent will unmount us
+		// when the device state transitions away from needs_passphrase.
+	}, [passphrase, onSubmit, submitting])
 
 	// Keyboard: Enter on input submits; Escape anywhere dismisses
 	const handleInputKeyDown = useCallback((e: React.KeyboardEvent) => {
@@ -38,11 +47,11 @@ export function PassphraseEntry({ onSubmit, onCancel }: PassphraseEntryProps) {
 
 	useEffect(() => {
 		const onKeyDown = (e: KeyboardEvent) => {
-			if (e.key === "Escape") onCancel()
+			if (e.key === "Escape" && !submitting) onCancel()
 		}
 		window.addEventListener("keydown", onKeyDown)
 		return () => window.removeEventListener("keydown", onKeyDown)
-	}, [onCancel])
+	}, [onCancel, submitting])
 
 	return (
 		<Flex
@@ -66,93 +75,116 @@ export function PassphraseEntry({ onSubmit, onCancel }: PassphraseEntryProps) {
 				w="90%"
 				boxShadow="0 8px 32px rgba(0,0,0,0.6)"
 			>
-				<Text fontSize="xl" fontWeight="bold" mb="2" textAlign="center" color="kk.textPrimary">
-					{t("passphrase.title")}
-				</Text>
-				<Text color="kk.textSecondary" fontSize="sm" mb="6" textAlign="center">
-					{t("passphrase.description")}
-				</Text>
-
-				{/* Passphrase input */}
-				<Box position="relative" mb="5">
-					<Input
-						ref={inputRef}
-						type={showPassphrase ? "text" : "password"}
-						value={passphrase}
-						onChange={(e) => setPassphrase(e.target.value)}
-						onKeyDown={handleInputKeyDown}
-						placeholder={t("passphrase.placeholder")}
-						bg="kk.bg"
-						border="1px solid"
-						borderColor="kk.border"
-						color="kk.textPrimary"
-						fontSize="md"
-						px="4"
-						py="3"
-						pr="14"
-						borderRadius="md"
-						_focus={{ borderColor: "kk.gold", outline: "none" }}
-						_placeholder={{ color: "kk.textMuted" }}
-						autoComplete="off"
-						autoCorrect="off"
-						spellCheck={false}
-					/>
-					<Box
-						as="button"
-						position="absolute"
-						right="3"
-						top="50%"
-						transform="translateY(-50%)"
-						onClick={() => setShowPassphrase((v) => !v)}
-						color="kk.textSecondary"
-						_hover={{ color: "kk.textPrimary" }}
-						cursor="pointer"
-						p="1"
-					>
-						{showPassphrase ? (
-							<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
-								<path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94" />
-								<path d="M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19" />
-								<line x1="1" y1="1" x2="23" y2="23" />
+				{submitting ? (
+					/* ── Confirm on device state ── */
+					<Flex direction="column" align="center" gap="5" py="4">
+						<Box color="kk.gold">
+							<svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="1.5" strokeLinecap="round" strokeLinejoin="round">
+								<rect x="2" y="6" width="20" height="12" rx="2" />
+								<circle cx="12" cy="12" r="2" />
+								<path d="M6 12h.01M18 12h.01" />
 							</svg>
-						) : (
-							<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
-								<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
-								<circle cx="12" cy="12" r="3" />
-							</svg>
-						)}
-					</Box>
-				</Box>
+						</Box>
+						<Text fontSize="lg" fontWeight="bold" color="kk.textPrimary" textAlign="center">
+							{t("passphrase.confirmOnDevice")}
+						</Text>
+						<Text color="kk.textSecondary" fontSize="sm" textAlign="center">
+							{t("passphrase.confirmOnDeviceHint")}
+						</Text>
+						<Spinner size="sm" color="kk.gold" />
+					</Flex>
+				) : (
+					/* ── Passphrase input state ── */
+					<>
+						<Text fontSize="xl" fontWeight="bold" mb="2" textAlign="center" color="kk.textPrimary">
+							{t("passphrase.title")}
+						</Text>
+						<Text color="kk.textSecondary" fontSize="sm" mb="6" textAlign="center">
+							{t("passphrase.description")}
+						</Text>
+
+						{/* Passphrase input */}
+						<Box position="relative" mb="5">
+							<Input
+								ref={inputRef}
+								type={showPassphrase ? "text" : "password"}
+								value={passphrase}
+								onChange={(e) => setPassphrase(e.target.value)}
+								onKeyDown={handleInputKeyDown}
+								placeholder={t("passphrase.placeholder")}
+								bg="kk.bg"
+								border="1px solid"
+								borderColor="kk.border"
+								color="kk.textPrimary"
+								fontSize="md"
+								px="4"
+								py="3"
+								pr="14"
+								borderRadius="md"
+								_focus={{ borderColor: "kk.gold", outline: "none" }}
+								_placeholder={{ color: "kk.textMuted" }}
+								autoComplete="off"
+								autoCorrect="off"
+								spellCheck={false}
+							/>
+							<Box
+								as="button"
+								position="absolute"
+								right="3"
+								top="50%"
+								transform="translateY(-50%)"
+								onClick={() => setShowPassphrase((v) => !v)}
+								color="kk.textSecondary"
+								_hover={{ color: "kk.textPrimary" }}
+								cursor="pointer"
+								p="1"
+							>
+								{showPassphrase ? (
+									<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+										<path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94" />
+										<path d="M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19" />
+										<line x1="1" y1="1" x2="23" y2="23" />
+									</svg>
+								) : (
+									<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+										<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
+										<circle cx="12" cy="12" r="3" />
+									</svg>
+								)}
+							</Box>
+						</Box>
 
-				<Text color="kk.textMuted" fontSize="xs" mb="5" textAlign="center">
-					{t("passphrase.warning")}
-				</Text>
+						<Text color="kk.textMuted" fontSize="xs" mb="5" textAlign="center">
+							{t("passphrase.warning")}
+						</Text>
 
-				{/* Action buttons */}
-				<Flex gap="3" justifyContent="center">
-					<Button
-						onClick={onCancel}
-						size="md"
-						variant="outline"
-						borderColor="kk.border"
-						color="kk.textSecondary"
-						_hover={{ borderColor: "kk.gold", color: "kk.textPrimary" }}
-						flex={1}
-					>
-						{t("cancel", { ns: "common" })}
-					</Button>
-					<Button
-						onClick={handleSubmit}
-						size="md"
-						bg="kk.gold"
-						color="black"
-						fontWeight="semibold"
-						_hover={{ bg: "kk.goldHover" }}
-						flex={1}
-					>
-						{t("passphrase.unlock")}
-					</Button>
-				</Flex>
+						{/* Action buttons */}
+						<Flex gap="3" justifyContent="center">
+							<Button
+								onClick={onCancel}
+								size="md"
+								variant="outline"
+								borderColor="kk.border"
+								color="kk.textSecondary"
+								_hover={{ borderColor: "kk.gold", color: "kk.textPrimary" }}
+								flex={1}
+							>
+								{t("cancel", { ns: "common" })}
+							</Button>
+							<Button
+								onClick={handleSubmit}
+								size="md"
+								bg="kk.gold"
+								color="black"
+								fontWeight="semibold"
+								_hover={{ bg: "kk.goldHover" }}
+								flex={1}
+							>
+								{t("passphrase.unlock")}
+							</Button>
+						</Flex>
+					</>
+				)}
 			</Box>
 		</Flex>
 	)
diff --git a/projects/keepkey-vault/src/mainview/hooks/useDeviceState.ts b/projects/keepkey-vault/src/mainview/hooks/useDeviceState.ts
index 24a4dbe9..a4b7fdb0 100644
--- a/projects/keepkey-vault/src/mainview/hooks/useDeviceState.ts
+++ b/projects/keepkey-vault/src/mainview/hooks/useDeviceState.ts
@@ -9,7 +9,7 @@ const DEFAULT_STATE: DeviceStateInfo = {
   bootloaderMode: false,
   needsBootloaderUpdate: false,
   needsFirmwareUpdate: false,
-  needsInit: true,
+  needsInit: false, // L8 fix: default false prevents brief wizard flash before features arrive
   initialized: false,
   isOob: false,
 }
diff --git a/projects/keepkey-vault/src/mainview/hooks/useFirmwareUpdate.ts b/projects/keepkey-vault/src/mainview/hooks/useFirmwareUpdate.ts
index 2d4270e5..aff93095 100644
--- a/projects/keepkey-vault/src/mainview/hooks/useFirmwareUpdate.ts
+++ b/projects/keepkey-vault/src/mainview/hooks/useFirmwareUpdate.ts
@@ -1,5 +1,5 @@
-import { useState, useEffect, useCallback } from 'react'
-import { rpcRequest, onRpcMessage } from '../lib/rpc'
+import { useState, useEffect, useCallback, useRef } from 'react'
+import { onRpcMessage, rpcRequest } from '../lib/rpc'
 import type { FirmwareProgress } from '../../shared/types'
 
 type UpdateState = 'idle' | 'updating' | 'complete' | 'error'
@@ -8,12 +8,16 @@ export function useFirmwareUpdate() {
   const [state, setState] = useState<UpdateState>('idle')
   const [progress, setProgress] = useState<FirmwareProgress | null>(null)
   const [error, setError] = useState<string | null>(null)
+  // Guard: only process firmware-progress events when this hook initiated a flash
+  const activeRef = useRef(false)
 
   // Listen for firmware-progress messages from Bun
   useEffect(() => {
     const unsubscribe = onRpcMessage('firmware-progress', (payload: FirmwareProgress) => {
+      if (!activeRef.current) return // C1 fix: ignore events from other flash paths
       setProgress(payload)
       if (payload.percent >= 100) {
+        activeRef.current = false
         setState('complete')
       }
     })
@@ -22,32 +26,43 @@ export function useFirmwareUpdate() {
   }, [])
 
   const startBootloaderUpdate = useCallback(async () => {
+    activeRef.current = true
     setState('updating')
     setError(null)
     setProgress({ percent: 0, message: 'Starting bootloader update...' })
     try {
       await rpcRequest('startBootloaderUpdate', undefined, 0)
+      activeRef.current = false
       setState('complete')
     } catch (err: any) {
-      console.error('[firmware] Bootloader update error:', err?.message || err)
-      setState('complete')
+      activeRef.current = false
+      const msg = err?.message || 'Unknown error'
+      console.error('[firmware] Bootloader update error:', msg)
+      setError(msg) // C2 fix: actually set the error
+      setState('error')
     }
   }, [])
 
   const startFirmwareUpdate = useCallback(async (_version?: string) => {
+    activeRef.current = true
     setState('updating')
     setError(null)
     setProgress({ percent: 0, message: 'Starting firmware update...' })
     try {
       await rpcRequest('startFirmwareUpdate', undefined, 0)
+      activeRef.current = false
       setState('complete')
     } catch (err: any) {
-      console.error('[firmware] Firmware update error:', err?.message || err)
-      setState('complete')
+      activeRef.current = false
+      const msg = err?.message || 'Unknown error'
+      console.error('[firmware] Firmware update error:', msg)
+      setError(msg) // C2 fix: actually set the error
+      setState('error')
     }
   }, [])
 
   const reset = useCallback(() => {
+    activeRef.current = false
     setState('idle')
     setProgress(null)
     setError(null)
diff --git a/projects/keepkey-vault/src/mainview/i18n/LanguageSelector.tsx b/projects/keepkey-vault/src/mainview/i18n/LanguageSelector.tsx
index 10fb920b..a5cddf89 100644
--- a/projects/keepkey-vault/src/mainview/i18n/LanguageSelector.tsx
+++ b/projects/keepkey-vault/src/mainview/i18n/LanguageSelector.tsx
@@ -1,7 +1,9 @@
-import { Flex, Button } from "@chakra-ui/react"
+import { Flex, Box, Text, Button } from "@chakra-ui/react"
 import { useTranslation } from "react-i18next"
+import { FaGlobe } from "react-icons/fa"
+import { useState, useRef, useEffect } from "react"
 
-const LANGUAGES = [
+export const LANGUAGES = [
 	{ code: "en", label: "English" },
 	{ code: "es", label: "Español" },
 	{ code: "fr", label: "Français" },
@@ -47,3 +49,82 @@ export function LanguageSelector() {
 		</Flex>
 	)
 }
+
+/** Compact globe dropdown for use in wizard headers */
+export function LanguagePicker() {
+	const { i18n } = useTranslation()
+	const [open, setOpen] = useState(false)
+	const ref = useRef<HTMLDivElement>(null)
+
+	useEffect(() => {
+		if (!open) return
+		const handler = (e: MouseEvent) => {
+			if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false)
+		}
+		document.addEventListener("mousedown", handler)
+		return () => document.removeEventListener("mousedown", handler)
+	}, [open])
+
+	const current = LANGUAGES.find(l => l.code === i18n.language) || LANGUAGES[0]
+
+	return (
+		<Box ref={ref} position="relative">
+			<Flex
+				as="button"
+				align="center"
+				gap="1.5"
+				px="2"
+				py="1"
+				borderRadius="md"
+				cursor="pointer"
+				_hover={{ bg: "whiteAlpha.100" }}
+				onClick={() => setOpen(o => !o)}
+			>
+				<FaGlobe color="#A0AEC0" size={12} />
+				<Text fontSize="xs" color="gray.300">{current.label}</Text>
+			</Flex>
+			{open && (
+				<Box
+					position="absolute"
+					top="100%"
+					right="0"
+					mt="1"
+					bg="gray.800"
+					border="1px solid"
+					borderColor="gray.600"
+					borderRadius="lg"
+					boxShadow="0 8px 24px rgba(0,0,0,0.5)"
+					py="1"
+					zIndex={2000}
+					minW="140px"
+					maxH="280px"
+					overflowY="auto"
+				>
+					{LANGUAGES.map(({ code, label }) => {
+						const active = i18n.language === code
+						return (
+							<Flex
+								key={code}
+								as="button"
+								w="100%"
+								px="3"
+								py="1.5"
+								align="center"
+								gap="2"
+								fontSize="xs"
+								color={active ? "green.300" : "gray.300"}
+								fontWeight={active ? "600" : "400"}
+								bg={active ? "whiteAlpha.100" : "transparent"}
+								_hover={{ bg: "whiteAlpha.100" }}
+								cursor="pointer"
+								onClick={() => { i18n.changeLanguage(code); setOpen(false) }}
+							>
+								{label}
+							</Flex>
+						)
+					})}
+				</Box>
+			)}
+		</Box>
+	)
+}
diff --git a/projects/keepkey-vault/src/mainview/i18n/index.ts b/projects/keepkey-vault/src/mainview/i18n/index.ts
index 3a77ee05..e7541623 100644
--- a/projects/keepkey-vault/src/mainview/i18n/index.ts
+++ b/projects/keepkey-vault/src/mainview/i18n/index.ts
@@ -32,6 +32,7 @@ i18n
 	.init({
 		lng: savedLang,
 		fallbackLng: "en",
+		partialBundledLanguages: true,
 		defaultNS: "common",
 		ns: [
 			"common",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/de/dashboard.json b/projects/keepkey-vault/src/mainview/i18n/locales/de/dashboard.json
index 59ea8def..fd0486c7 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/de/dashboard.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/de/dashboard.json
@@ -7,5 +7,27 @@
 	"noBalance": "Kein Guthaben",
 	"tokensCount_one": "+{{count}} Token",
 	"tokensCount_other": "+{{count}} Token",
-	"watchOnlyBanner": "Nur Ansicht — Gerät verbinden für vollen Zugriff"
+	"watchOnlyBanner": "Nur Ansicht — Gerät verbinden für vollen Zugriff",
+	"welcomeTitle": "Willkommen bei KeepKey Vault",
+	"welcomeSubtitle": "Ihre Wallet ist bereit. So starten Sie:",
+	"welcomeTip1": "Tippen Sie auf eine Blockchain unten und dann auf Empfangen, um Ihre Einzahlungsadresse zu erhalten",
+	"welcomeTip2": "Senden Sie Krypto an Ihre Adresse — Ihr Guthaben erscheint hier automatisch",
+	"welcomeTip3": "Fügen Sie benutzerdefinierte EVM-Chains mit der +-Karte hinzu, um jedes Netzwerk zu verfolgen",
+	"balancesStale": "Guthaben können veraltet sein",
+	"lastUpdated": "Zuletzt aktualisiert {{time}}",
+	"lastUpdatedNever": "Nie geladen",
+	"refreshPrompt": "Drücken Sie, um Guthaben zu aktualisieren",
+	"tokenWarningTitle": "Token-Guthaben nicht verfügbar",
+	"tokenWarningDesc": "Keine Token-Daten zurückgegeben. Ihre nativen Guthaben werden angezeigt, aber ERC-20 / Token-Guthaben können fehlen.",
+	"refreshing": "Aktualisierung...",
+	"reports": "Berichte",
+	"pioneerOfflineTitle": "Guthabenserver offline",
+	"pioneerOfflineDesc": "Verbindung zu {{url}} nicht möglich. Guthaben sind möglicherweise nicht verfügbar.",
+	"changeServer": "Server wechseln",
+	"getSupport": "Support erhalten",
+	"retry": "Erneut versuchen",
+	"timeJustNow": "gerade eben",
+	"timeMinutesAgo": "vor {{count}}m",
+	"timeHoursAgo": "vor {{count}}h",
+	"timeDaysAgo": "vor {{count}}t"
 }
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/de/device.json b/projects/keepkey-vault/src/mainview/i18n/locales/de/device.json
index d64cb277..2aa87e03 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/de/device.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/de/device.json
@@ -20,7 +20,9 @@
 		"description": "Ihr Gerät hat den Passphrase-Schutz aktiviert. Geben Sie Ihre BIP-39-Passphrase ein, um zu entsperren. Lassen Sie das Feld leer für die Standard-Wallet.",
 		"placeholder": "Passphrase (optional)",
 		"warning": "Passphrasen unterscheiden Groß- und Kleinschreibung. Eine andere Passphrase erzeugt eine völlig andere Wallet.",
-		"unlock": "Entsperren"
+		"unlock": "Entsperren",
+		"confirmOnDevice": "Auf deinem KeepKey bestätigen",
+		"confirmOnDeviceHint": "Überprüfe den Bildschirm deines Geräts und drücke die Taste zum Bestätigen."
 	},
 	"pairing": {
 		"wantsToConnect": "möchte sich mit Ihrem KeepKey verbinden",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/de/setup.json b/projects/keepkey-vault/src/mainview/i18n/locales/de/setup.json
index ea63828f..0dfd0ac8 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/de/setup.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/de/setup.json
@@ -17,14 +17,31 @@
 	},
 	"welcome": {
 		"title": "Willkommen bei KeepKey",
+		"oobTitle": "Neues Gerät erkannt",
+		"oobWelcome": "Willkommen bei KeepKey",
+		"oobWizardDesc": "Dieser Assistent führt Sie durch Bootloader- und Firmware-Updates, um Ihr Gerät einsatzbereit zu machen.",
 		"oobIntro": "Lassen Sie uns Ihre Firmware aktualisieren und Ihre Wallet einrichten.",
 		"intro": "Lassen Sie uns Ihre Hardware-Wallet einrichten.",
+		"getStarted": "Loslegen",
 		"startingSetup": "Einrichtung wird gestartet...",
-		"detectingDevice": "Gerätestatus wird erkannt..."
+		"detectingDevice": "Gerätestatus wird erkannt...",
+		"readMore": "Wie funktioniert das?",
+		"readMoreTitle": "Wie funktioniert das?",
+		"readMoreBootloaderTitle": "Was ist der Bootloader?",
+		"readMoreBootloaderBody": "Der Bootloader ist ein kleines Programm, das zuerst ausgeführt wird, wenn Ihr KeepKey eingeschaltet wird. Stellen Sie ihn sich als Sicherheitswächter vor — er prüft, ob die Hauptsoftware auf Ihrem Gerät authentisch ist und nicht manipuliert wurde, bevor er sie ausführen lässt.",
+		"readMoreFirmwareTitle": "Was ist Firmware?",
+		"readMoreFirmwareBody": "Firmware ist die Hauptsoftware, die Ihr KeepKey zur Verwaltung Ihrer Kryptowährungen verwendet. Sie übernimmt alles von der Adressgenerierung bis zur Transaktionssignierung. Ein Update bringt Ihnen die neuesten Funktionen und Sicherheitspatches.",
+		"readMoreWhyTitle": "Warum beides aktualisieren?",
+		"readMoreWhyBody": "Durch die Aktualisierung des Bootloaders wird Ihr Gerät so gesperrt, dass es nur offizielle KeepKey-Software akzeptiert — selbst wenn jemand versuchen würde, etwas Schädliches zu installieren, würde Ihr Gerät es ablehnen. Zusammen halten Bootloader und Firmware Ihre Guthaben sicher.",
+		"gotIt": "Verstanden"
 	},
 	"bootloader": {
 		"title": "Bootloader-Update",
 		"description": "Ihr Bootloader muss aus Sicherheits- und Kompatibilitätsgründen aktualisiert werden.",
+		"putDeviceInBootloader": "Versetzen Sie Ihr Gerät in den Bootloader-Modus",
+		"followStepsBelow": "Befolgen Sie die untenstehenden Schritte, dann erkennen wir Ihr Gerät automatisch.",
+		"stepsTitle": "So gelangen Sie in den Bootloader-Modus:",
+		"waitingForBootloader": "Warte auf Ihr Gerät... schließen Sie es an, während Sie den Knopf gedrückt halten",
 		"current": "Aktuell",
 		"latest": "Neueste",
 		"outdated": "Veraltet",
@@ -33,13 +50,19 @@
 		"updateFailed": "Update fehlgeschlagen",
 		"tryAgain": "Erneut versuchen",
 		"enterFirmwareUpdateMode": "Firmware-Update-Modus starten",
-		"step1Unplug": "1. Trennen Sie Ihren KeepKey",
-		"step2Hold": "2. Halten Sie den Knopf am Gerät gedrückt",
-		"step3Plugin": "3. Stecken Sie bei gedrücktem Knopf das USB-Kabel ein",
-		"step4Release": "4. Lassen Sie los, wenn der Bootloader-Bildschirm erscheint",
+		"step1Unplug": "Trennen Sie Ihren KeepKey",
+		"step2Hold": "Halten Sie den Knopf am Gerät gedrückt",
+		"step3Plugin": "Stecken Sie bei gedrücktem Knopf das USB-Kabel ein",
+		"step4Release": "Lassen Sie los, wenn der Bootloader-Bildschirm erscheint",
 		"listeningForBootloader": "Warte auf Gerät im Bootloader-Modus...",
 		"readyDetectBootloader": "Bereit — Bootloader erkennen",
-		"skipBootloaderUpdate": "Bootloader-Update überspringen"
+		"skipBootloaderUpdate": "Bootloader-Update überspringen",
+		"verifyBackupHint": "Auf dem KeepKey werden Sie aufgefordert, das Backup zu überprüfen. Das machen wir nach dem Update — halten Sie den Knopf gedrückt, um dies vorerst zu überspringen.",
+		"followDirectionsOnDevice": "Folgen Sie den Anweisungen auf dem Gerät",
+		"deviceWillGuide": "Ihr KeepKey führt Sie durch den Update-Vorgang.",
+		"bootloaderDetected": "Bootloader-Modus erkannt",
+		"deviceReadyForUpdate": "Ihr KeepKey befindet sich im Bootloader-Modus und ist bereit für das Update.",
+		"updateBootloaderTo": "Bootloader auf v{{version}} aktualisieren"
 	},
 	"firmware": {
 		"title": "Firmware-Update",
@@ -58,7 +81,36 @@
 		"firmwareVerified": "Firmware als offizielle Version verifiziert",
 		"firmwareHashNotFound": "Firmware-Hash nicht im Manifest gefunden",
 		"updateFirmwareTo": "Firmware auf v{{version}} aktualisieren",
-		"skipUpdate": "Update überspringen"
+		"skipUpdate": "Update überspringen",
+		"confirmOnDevice": "Aktion auf dem Gerät bestätigen!",
+		"lookAtDeviceAndPress": "Schauen Sie auf den Bildschirm Ihres KeepKey und drücken Sie den Knopf zur Bestätigung.",
+		"verifyBackupNote": "Wenn Ihr Gerät noch nicht eingerichtet ist, können Sie den Bildschirm 'Backup überprüfen' bedenkenlos ignorieren.",
+		"uploadingFirmware": "Firmware wird hochgeladen... Trennen Sie Ihr Gerät nicht",
+		"estimatedTimeRemaining": "Geschätzte verbleibende Zeit: {{seconds}}s",
+		"deviceWillRestart": "Ihr Gerät wird nach Abschluss neu gestartet.",
+		"skipWarning": "Sie können mit älterer Firmware fortfahren. Einige Funktionen funktionieren möglicherweise nicht wie erwartet.",
+		"bootloaderReadyForFirmware": "Ihr KeepKey befindet sich im Bootloader-Modus und ist bereit für die Firmware.",
+		"installLatestFirmware": "Offizielle Firmware v{{version}} installieren",
+		"orCustomFirmware": "Oder benutzerdefinierte Firmware installieren",
+		"customFirmwareHint": "Wählen Sie eine .bin-Firmware-Datei von Ihrem Computer aus oder ziehen Sie sie hierher.",
+		"browseFiles": "Dateien durchsuchen",
+		"analyzingFirmware": "Firmware wird analysiert...",
+		"customFirmwareReady": "Benutzerdefinierte Firmware bereit zum Flashen",
+		"flashFirmware": "Firmware flashen",
+		"signed": "SIGNIERT",
+		"unsigned": "UNSIGNIERT",
+		"version": "Version",
+		"size": "Größe",
+		"willWipeWarning": "Das Flashen unsignierter Firmware auf ein signiertes Gerät LÖSCHT ALLE DATEN. Stellen Sie sicher, dass Ihr Seed gesichert ist.",
+		"unsignedWarning": "Dies ist unsignierte Entwickler-Firmware. Sie kann unerwartetes Verhalten verursachen.",
+		"customFlashFailed": "Flashen der benutzerdefinierten Firmware fehlgeschlagen",
+		"rebootTakingLong": "Die Wiederverbindung dauert länger als üblich...",
+		"rebootTakingLongSub": "Das Gerät benötigt möglicherweise einen Moment zum Neustart.",
+		"manualReconnectTitle": "Gerät verbindet sich nicht wieder?",
+		"manualReconnectStep1": "1. Trennen Sie Ihren KeepKey",
+		"manualReconnectStep2": "2. Warten Sie 5 Sekunden",
+		"manualReconnectStep3": "3. Schließen Sie ihn wieder an",
+		"manualReconnectNote": "Die Einrichtung wird automatisch fortgesetzt, sobald das Gerät erkannt wird."
 	},
 	"initChoose": {
 		"title": "Wallet einrichten",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/en/dashboard.json b/projects/keepkey-vault/src/mainview/i18n/locales/en/dashboard.json
index edb5685e..e2022cbd 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/en/dashboard.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/en/dashboard.json
@@ -16,8 +16,18 @@
 	"balancesStale": "Balances may be outdated",
 	"lastUpdated": "Last updated {{time}}",
 	"lastUpdatedNever": "Never loaded",
-	"refreshPrompt": "Press Refresh to load latest balances",
+	"refreshPrompt": "Press to update balances",
 	"tokenWarningTitle": "Token balances unavailable",
 	"tokenWarningDesc": "No token data was returned. Your native balances are shown but ERC-20 / token balances may be missing.",
-	"refreshing": "Refreshing..."
+	"refreshing": "Refreshing...",
+	"reports": "Reports",
+	"pioneerOfflineTitle": "Balance server offline",
+	"pioneerOfflineDesc": "Unable to connect to {{url}}. Balances may be unavailable.",
+	"changeServer": "Change Server",
+	"getSupport": "Get Support",
+	"retry": "Retry",
+	"timeJustNow": "just now",
+	"timeMinutesAgo": "{{count}}m ago",
+	"timeHoursAgo": "{{count}}h ago",
+	"timeDaysAgo": "{{count}}d ago"
 }
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/en/device.json b/projects/keepkey-vault/src/mainview/i18n/locales/en/device.json
index b343540a..67c7380c 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/en/device.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/en/device.json
@@ -20,7 +20,9 @@
 		"description": "Your device has passphrase protection enabled. Enter your BIP-39 passphrase to unlock. Leave empty for the default wallet.",
 		"placeholder": "Passphrase (optional)",
 		"warning": "Passphrases are case-sensitive. A different passphrase generates a completely different wallet.",
-		"unlock": "Unlock"
+		"unlock": "Unlock",
+		"confirmOnDevice": "Confirm on Your KeepKey",
+		"confirmOnDeviceHint": "Check your device screen and press the button to confirm."
 	},
 	"pairing": {
 		"wantsToConnect": "wants to connect to your KeepKey",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/en/setup.json b/projects/keepkey-vault/src/mainview/i18n/locales/en/setup.json
index 2f01219f..c312bfd0 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/en/setup.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/en/setup.json
@@ -17,14 +17,31 @@
 	},
 	"welcome": {
 		"title": "Welcome to KeepKey",
+		"oobTitle": "New Device Detected",
+		"oobWelcome": "Welcome to KeepKey",
+		"oobWizardDesc": "This wizard will walk you through bootloader and firmware updates to get your device ready.",
 		"oobIntro": "Let's update your firmware and set up your wallet.",
 		"intro": "Let's get your hardware wallet set up.",
+		"getStarted": "Get Started",
 		"startingSetup": "Starting setup...",
-		"detectingDevice": "Detecting device status..."
+		"detectingDevice": "Detecting device...",
+		"readMore": "How does this work?",
+		"readMoreTitle": "How Does This Work?",
+		"readMoreBootloaderTitle": "What is the bootloader?",
+		"readMoreBootloaderBody": "The bootloader is a small program that runs first when your KeepKey powers on. Think of it as a security guard — it checks that the main software on your device is authentic and hasn't been tampered with before allowing it to run.",
+		"readMoreFirmwareTitle": "What is firmware?",
+		"readMoreFirmwareBody": "Firmware is the main software your KeepKey uses to manage your crypto. It handles everything from generating addresses to signing transactions. Updating it gives you the latest features and security patches.",
+		"readMoreWhyTitle": "Why update both?",
+		"readMoreWhyBody": "Updating the bootloader locks your device to only accept official KeepKey software — so even if someone tried to install something malicious, your device would reject it. Together, the bootloader and firmware keep your funds safe.",
+		"gotIt": "Got It"
 	},
 	"bootloader": {
 		"title": "Bootloader Update",
 		"description": "Your bootloader needs to be updated for security and compatibility.",
+		"putDeviceInBootloader": "Put Your Device in Bootloader Mode",
+		"followStepsBelow": "Follow the steps below, then we'll detect your device automatically.",
+		"stepsTitle": "How to enter bootloader mode:",
+		"waitingForBootloader": "Waiting for your device... plug it in while holding the button",
 		"current": "Current",
 		"latest": "Latest",
 		"outdated": "Outdated",
@@ -33,16 +50,19 @@
 		"updateFailed": "Update Failed",
 		"tryAgain": "Try Again",
 		"enterFirmwareUpdateMode": "Enter Firmware Update Mode",
-		"step1Unplug": "1. Unplug your KeepKey",
-		"step2Hold": "2. Hold down the button on the device",
-		"step3Plugin": "3. While holding, plug in the USB cable",
-		"step4Release": "4. Release when the bootloader screen appears",
+		"step1Unplug": "Unplug your KeepKey",
+		"step2Hold": "Hold down the button on the device",
+		"step3Plugin": "While holding, plug in the USB cable",
+		"step4Release": "Release when the bootloader screen appears",
 		"listeningForBootloader": "Listening for device in bootloader mode...",
 		"readyDetectBootloader": "I'm Ready — Detect Bootloader",
 		"skipBootloaderUpdate": "Skip Bootloader Update",
 		"verifyBackupHint": "On the KeepKey, it will ask you to verify backup. We will do this after updating — hold the button to skip this for now.",
 		"followDirectionsOnDevice": "Follow directions on device",
-		"deviceWillGuide": "Your KeepKey will guide you through the update process."
+		"deviceWillGuide": "Your KeepKey will guide you through the update process.",
+		"bootloaderDetected": "Bootloader Mode Detected",
+		"deviceReadyForUpdate": "Your KeepKey is in bootloader mode and ready for update.",
+		"updateBootloaderTo": "Update Bootloader to v{{version}}"
 	},
 	"firmware": {
 		"title": "Firmware Update",
@@ -68,7 +88,29 @@
 		"uploadingFirmware": "Uploading firmware... Do not disconnect your device",
 		"estimatedTimeRemaining": "Estimated time remaining: {{seconds}}s",
 		"deviceWillRestart": "Your device will restart when complete.",
-		"skipWarning": "You can continue with older firmware. Some features may not work as expected."
+		"skipWarning": "You can continue with older firmware. Some features may not work as expected.",
+		"bootloaderReadyForFirmware": "Your KeepKey is in bootloader mode and ready for firmware.",
+		"installLatestFirmware": "Install Official Firmware v{{version}}",
+		"orCustomFirmware": "Or install custom firmware",
+		"customFirmwareHint": "Select a .bin firmware file from your computer, or drag and drop anywhere.",
+		"browseFiles": "Browse Files",
+		"analyzingFirmware": "Analyzing firmware...",
+		"customFirmwareReady": "Custom firmware ready to flash",
+		"flashFirmware": "Flash Firmware",
+		"signed": "SIGNED",
+		"unsigned": "UNSIGNED",
+		"version": "Version",
+		"size": "Size",
+		"willWipeWarning": "Flashing unsigned firmware onto a signed device will WIPE ALL DATA. Make sure your seed is backed up.",
+		"unsignedWarning": "This is unsigned developer firmware. It may cause unexpected behavior.",
+		"customFlashFailed": "Custom firmware flash failed",
+		"rebootTakingLong": "Reconnection is taking longer than usual...",
+		"rebootTakingLongSub": "The device may need a moment to restart.",
+		"manualReconnectTitle": "Device not reconnecting?",
+		"manualReconnectStep1": "1. Unplug your KeepKey",
+		"manualReconnectStep2": "2. Wait 5 seconds",
+		"manualReconnectStep3": "3. Plug it back in",
+		"manualReconnectNote": "Setup will continue automatically when the device is detected."
 	},
 	"initChoose": {
 		"title": "Set Up Your Wallet",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/es/dashboard.json b/projects/keepkey-vault/src/mainview/i18n/locales/es/dashboard.json
index 0fbca960..5458b07b 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/es/dashboard.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/es/dashboard.json
@@ -7,5 +7,27 @@
 	"noBalance": "Sin saldo",
 	"tokensCount_one": "+{{count}} token",
 	"tokensCount_other": "+{{count}} tokens",
-	"watchOnlyBanner": "Solo lectura — Conecta el dispositivo para acceso completo"
+	"watchOnlyBanner": "Solo lectura — Conecta el dispositivo para acceso completo",
+	"welcomeTitle": "Bienvenido a KeepKey Vault",
+	"welcomeSubtitle": "Tu billetera está lista. Aquí te explicamos cómo empezar:",
+	"welcomeTip1": "Toca cualquier cadena abajo y luego presiona Recibir para obtener tu dirección de depósito",
+	"welcomeTip2": "Envía cripto a tu dirección — tu saldo aparecerá aquí automáticamente",
+	"welcomeTip3": "Agrega cadenas EVM personalizadas con la tarjeta + para rastrear cualquier red",
+	"balancesStale": "Los saldos pueden estar desactualizados",
+	"lastUpdated": "Última actualización {{time}}",
+	"lastUpdatedNever": "Nunca cargado",
+	"refreshPrompt": "Presiona para actualizar saldos",
+	"tokenWarningTitle": "Saldos de tokens no disponibles",
+	"tokenWarningDesc": "No se devolvieron datos de tokens. Se muestran tus saldos nativos pero los saldos ERC-20 / tokens pueden faltar.",
+	"refreshing": "Actualizando...",
+	"reports": "Informes",
+	"pioneerOfflineTitle": "Servidor de saldos sin conexión",
+	"pioneerOfflineDesc": "No se puede conectar a {{url}}. Los saldos pueden no estar disponibles.",
+	"changeServer": "Cambiar servidor",
+	"getSupport": "Obtener soporte",
+	"retry": "Reintentar",
+	"timeJustNow": "ahora mismo",
+	"timeMinutesAgo": "hace {{count}}m",
+	"timeHoursAgo": "hace {{count}}h",
+	"timeDaysAgo": "hace {{count}}d"
 }
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/es/device.json b/projects/keepkey-vault/src/mainview/i18n/locales/es/device.json
index a67b63aa..c37228c3 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/es/device.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/es/device.json
@@ -20,7 +20,9 @@
 		"description": "Tu dispositivo tiene protección por contraseña habilitada. Ingresa tu contraseña BIP-39 para desbloquear. Déjalo vacío para la billetera predeterminada.",
 		"placeholder": "Contraseña (opcional)",
 		"warning": "Las contraseñas distinguen entre mayúsculas y minúsculas. Una contraseña diferente genera una billetera completamente diferente.",
-		"unlock": "Desbloquear"
+		"unlock": "Desbloquear",
+		"confirmOnDevice": "Confirmar en tu KeepKey",
+		"confirmOnDeviceHint": "Revisa la pantalla de tu dispositivo y presiona el botón para confirmar."
 	},
 	"pairing": {
 		"wantsToConnect": "quiere conectarse a tu KeepKey",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/es/setup.json b/projects/keepkey-vault/src/mainview/i18n/locales/es/setup.json
index d9743d26..fe0ae086 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/es/setup.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/es/setup.json
@@ -17,14 +17,31 @@
 	},
 	"welcome": {
 		"title": "Bienvenido a KeepKey",
+		"oobTitle": "Nuevo dispositivo detectado",
+		"oobWelcome": "Bienvenido a KeepKey",
+		"oobWizardDesc": "Este asistente te guiará a través de las actualizaciones de bootloader y firmware para preparar tu dispositivo.",
 		"oobIntro": "Actualicemos tu firmware y configuremos tu billetera.",
 		"intro": "Vamos a configurar tu billetera de hardware.",
+		"getStarted": "Comenzar",
 		"startingSetup": "Iniciando configuración...",
-		"detectingDevice": "Detectando estado del dispositivo..."
+		"detectingDevice": "Detectando estado del dispositivo...",
+		"readMore": "¿Cómo funciona esto?",
+		"readMoreTitle": "¿Cómo funciona esto?",
+		"readMoreBootloaderTitle": "¿Qué es el bootloader?",
+		"readMoreBootloaderBody": "El bootloader es un pequeño programa que se ejecuta primero cuando tu KeepKey se enciende. Piensa en él como un guardia de seguridad — verifica que el software principal de tu dispositivo sea auténtico y no haya sido alterado antes de permitir que se ejecute.",
+		"readMoreFirmwareTitle": "¿Qué es el firmware?",
+		"readMoreFirmwareBody": "El firmware es el software principal que tu KeepKey usa para gestionar tus criptomonedas. Maneja todo, desde generar direcciones hasta firmar transacciones. Actualizarlo te da las últimas funciones y parches de seguridad.",
+		"readMoreWhyTitle": "¿Por qué actualizar ambos?",
+		"readMoreWhyBody": "Actualizar el bootloader bloquea tu dispositivo para que solo acepte software oficial de KeepKey — así, incluso si alguien intentara instalar algo malicioso, tu dispositivo lo rechazaría. Juntos, el bootloader y el firmware mantienen tus fondos seguros.",
+		"gotIt": "Entendido"
 	},
 	"bootloader": {
 		"title": "Actualización del Bootloader",
 		"description": "Tu bootloader necesita ser actualizado por seguridad y compatibilidad.",
+		"putDeviceInBootloader": "Pon tu dispositivo en modo Bootloader",
+		"followStepsBelow": "Sigue los pasos a continuación, luego detectaremos tu dispositivo automáticamente.",
+		"stepsTitle": "Cómo entrar en modo bootloader:",
+		"waitingForBootloader": "Esperando tu dispositivo... conéctalo mientras mantienes presionado el botón",
 		"current": "Actual",
 		"latest": "Último",
 		"outdated": "Desactualizado",
@@ -33,13 +50,19 @@
 		"updateFailed": "Actualización fallida",
 		"tryAgain": "Intentar de nuevo",
 		"enterFirmwareUpdateMode": "Entrar en modo de actualización de firmware",
-		"step1Unplug": "1. Desconecta tu KeepKey",
-		"step2Hold": "2. Mantén presionado el botón del dispositivo",
-		"step3Plugin": "3. Mientras mantienes presionado, conecta el cable USB",
-		"step4Release": "4. Suelta cuando aparezca la pantalla del bootloader",
+		"step1Unplug": "Desconecta tu KeepKey",
+		"step2Hold": "Mantén presionado el botón del dispositivo",
+		"step3Plugin": "Mientras mantienes presionado, conecta el cable USB",
+		"step4Release": "Suelta cuando aparezca la pantalla del bootloader",
 		"listeningForBootloader": "Escuchando dispositivo en modo bootloader...",
 		"readyDetectBootloader": "Estoy listo — Detectar Bootloader",
-		"skipBootloaderUpdate": "Omitir actualización del bootloader"
+		"skipBootloaderUpdate": "Omitir actualización del bootloader",
+		"verifyBackupHint": "En el KeepKey, te pedirá verificar la copia de seguridad. Lo haremos después de actualizar — mantén presionado el botón para omitir esto por ahora.",
+		"followDirectionsOnDevice": "Sigue las instrucciones en el dispositivo",
+		"deviceWillGuide": "Tu KeepKey te guiará a través del proceso de actualización.",
+		"bootloaderDetected": "Modo Bootloader detectado",
+		"deviceReadyForUpdate": "Tu KeepKey está en modo bootloader y listo para la actualización.",
+		"updateBootloaderTo": "Actualizar Bootloader a v{{version}}"
 	},
 	"firmware": {
 		"title": "Actualización de Firmware",
@@ -58,7 +81,36 @@
 		"firmwareVerified": "Firmware verificado como versión oficial",
 		"firmwareHashNotFound": "Hash del firmware no encontrado en el manifiesto",
 		"updateFirmwareTo": "Actualizar Firmware a v{{version}}",
-		"skipUpdate": "Omitir actualización"
+		"skipUpdate": "Omitir actualización",
+		"confirmOnDevice": "¡Confirma la acción en el dispositivo!",
+		"lookAtDeviceAndPress": "Mira la pantalla de tu KeepKey y presiona el botón para confirmar.",
+		"verifyBackupNote": "Si tu dispositivo no está configurado, puedes ignorar con seguridad cualquier pantalla de \"verificar copia de seguridad\".",
+		"uploadingFirmware": "Subiendo firmware... No desconectes tu dispositivo",
+		"estimatedTimeRemaining": "Tiempo estimado restante: {{seconds}}s",
+		"deviceWillRestart": "Tu dispositivo se reiniciará cuando termine.",
+		"skipWarning": "Puedes continuar con firmware más antiguo. Algunas funciones pueden no funcionar como se espera.",
+		"bootloaderReadyForFirmware": "Tu KeepKey está en modo bootloader y listo para el firmware.",
+		"installLatestFirmware": "Instalar Firmware Oficial v{{version}}",
+		"orCustomFirmware": "O instalar firmware personalizado",
+		"customFirmwareHint": "Selecciona un archivo de firmware .bin de tu computadora, o arrástralo y suéltalo en cualquier lugar.",
+		"browseFiles": "Explorar archivos",
+		"analyzingFirmware": "Analizando firmware...",
+		"customFirmwareReady": "Firmware personalizado listo para flashear",
+		"flashFirmware": "Flashear Firmware",
+		"signed": "FIRMADO",
+		"unsigned": "SIN FIRMAR",
+		"version": "Versión",
+		"size": "Tamaño",
+		"willWipeWarning": "Flashear firmware sin firmar en un dispositivo firmado BORRARÁ TODOS LOS DATOS. Asegúrate de tener tu semilla respaldada.",
+		"unsignedWarning": "Este es firmware de desarrollador sin firmar. Puede causar comportamiento inesperado.",
+		"customFlashFailed": "Error al flashear firmware personalizado",
+		"rebootTakingLong": "La reconexión está tardando más de lo habitual...",
+		"rebootTakingLongSub": "El dispositivo puede necesitar un momento para reiniciarse.",
+		"manualReconnectTitle": "¿El dispositivo no se reconecta?",
+		"manualReconnectStep1": "1. Desconecta tu KeepKey",
+		"manualReconnectStep2": "2. Espera 5 segundos",
+		"manualReconnectStep3": "3. Conéctalo de nuevo",
+		"manualReconnectNote": "La configuración continuará automáticamente cuando se detecte el dispositivo."
 	},
 	"initChoose": {
 		"title": "Configura tu billetera",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/fr/dashboard.json b/projects/keepkey-vault/src/mainview/i18n/locales/fr/dashboard.json
index 39bfb296..68ad3aa0 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/fr/dashboard.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/fr/dashboard.json
@@ -7,5 +7,27 @@
 	"noBalance": "Aucun solde",
 	"tokensCount_one": "+{{count}} jeton",
 	"tokensCount_other": "+{{count}} jetons",
-	"watchOnlyBanner": "Lecture seule — Connectez l'appareil pour un accès complet"
+	"watchOnlyBanner": "Lecture seule — Connectez l'appareil pour un accès complet",
+	"welcomeTitle": "Bienvenue sur KeepKey Vault",
+	"welcomeSubtitle": "Votre portefeuille est prêt. Voici comment démarrer :",
+	"welcomeTip1": "Appuyez sur une chaîne ci-dessous, puis sur Recevoir pour obtenir votre adresse de dépôt",
+	"welcomeTip2": "Envoyez des cryptos à votre adresse — votre solde apparaîtra ici automatiquement",
+	"welcomeTip3": "Ajoutez des chaînes EVM personnalisées avec la carte + pour suivre n'importe quel réseau",
+	"balancesStale": "Les soldes peuvent être obsolètes",
+	"lastUpdated": "Dernière mise à jour {{time}}",
+	"lastUpdatedNever": "Jamais chargé",
+	"refreshPrompt": "Appuyez pour mettre à jour les soldes",
+	"tokenWarningTitle": "Soldes des jetons indisponibles",
+	"tokenWarningDesc": "Aucune donnée de jeton n'a été retournée. Vos soldes natifs sont affichés mais les soldes ERC-20 / jetons peuvent manquer.",
+	"refreshing": "Rafraîchissement...",
+	"reports": "Rapports",
+	"pioneerOfflineTitle": "Serveur de soldes hors ligne",
+	"pioneerOfflineDesc": "Impossible de se connecter à {{url}}. Les soldes peuvent être indisponibles.",
+	"changeServer": "Changer de serveur",
+	"getSupport": "Obtenir de l'aide",
+	"retry": "Réessayer",
+	"timeJustNow": "à l'instant",
+	"timeMinutesAgo": "il y a {{count}}m",
+	"timeHoursAgo": "il y a {{count}}h",
+	"timeDaysAgo": "il y a {{count}}j"
 }
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/fr/device.json b/projects/keepkey-vault/src/mainview/i18n/locales/fr/device.json
index ee15b922..55691c05 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/fr/device.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/fr/device.json
@@ -20,7 +20,9 @@
 		"description": "Votre appareil a la protection par phrase secrète activée. Entrez votre phrase secrète BIP-39 pour déverrouiller. Laissez vide pour le portefeuille par défaut.",
 		"placeholder": "Phrase secrète (facultatif)",
 		"warning": "Les phrases secrètes sont sensibles à la casse. Une phrase secrète différente génère un portefeuille complètement différent.",
-		"unlock": "Déverrouiller"
+		"unlock": "Déverrouiller",
+		"confirmOnDevice": "Confirmer sur votre KeepKey",
+		"confirmOnDeviceHint": "Vérifiez l'écran de votre appareil et appuyez sur le bouton pour confirmer."
 	},
 	"pairing": {
 		"wantsToConnect": "veut se connecter à votre KeepKey",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/fr/setup.json b/projects/keepkey-vault/src/mainview/i18n/locales/fr/setup.json
index 77f33ef4..288bffdb 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/fr/setup.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/fr/setup.json
@@ -17,14 +17,31 @@
 	},
 	"welcome": {
 		"title": "Bienvenue sur KeepKey",
+		"oobTitle": "Nouvel appareil détecté",
+		"oobWelcome": "Bienvenue sur KeepKey",
+		"oobWizardDesc": "Cet assistant vous guidera à travers les mises à jour du bootloader et du firmware pour préparer votre appareil.",
 		"oobIntro": "Mettons à jour votre firmware et configurons votre portefeuille.",
 		"intro": "Configurons votre portefeuille matériel.",
+		"getStarted": "Commencer",
 		"startingSetup": "Démarrage de la configuration...",
-		"detectingDevice": "Détection de l'état de l'appareil..."
+		"detectingDevice": "Détection de l'état de l'appareil...",
+		"readMore": "Comment ça marche ?",
+		"readMoreTitle": "Comment ça marche ?",
+		"readMoreBootloaderTitle": "Qu'est-ce que le bootloader ?",
+		"readMoreBootloaderBody": "Le bootloader est un petit programme qui s'exécute en premier lorsque votre KeepKey s'allume. Considérez-le comme un agent de sécurité — il vérifie que le logiciel principal de votre appareil est authentique et n'a pas été altéré avant de l'autoriser à s'exécuter.",
+		"readMoreFirmwareTitle": "Qu'est-ce que le firmware ?",
+		"readMoreFirmwareBody": "Le firmware est le logiciel principal que votre KeepKey utilise pour gérer vos cryptomonnaies. Il gère tout, de la génération d'adresses à la signature de transactions. Le mettre à jour vous donne les dernières fonctionnalités et correctifs de sécurité.",
+		"readMoreWhyTitle": "Pourquoi mettre à jour les deux ?",
+		"readMoreWhyBody": "La mise à jour du bootloader verrouille votre appareil pour n'accepter que le logiciel officiel KeepKey — ainsi, même si quelqu'un tentait d'installer quelque chose de malveillant, votre appareil le rejetterait. Ensemble, le bootloader et le firmware protègent vos fonds.",
+		"gotIt": "Compris"
 	},
 	"bootloader": {
 		"title": "Mise à jour du Bootloader",
 		"description": "Votre bootloader doit être mis à jour pour la sécurité et la compatibilité.",
+		"putDeviceInBootloader": "Mettez votre appareil en mode Bootloader",
+		"followStepsBelow": "Suivez les étapes ci-dessous, nous détecterons automatiquement votre appareil.",
+		"stepsTitle": "Comment entrer en mode bootloader :",
+		"waitingForBootloader": "En attente de votre appareil... branchez-le en maintenant le bouton enfoncé",
 		"current": "Actuel",
 		"latest": "Dernier",
 		"outdated": "Obsolète",
@@ -33,13 +50,19 @@
 		"updateFailed": "Mise à jour échouée",
 		"tryAgain": "Réessayer",
 		"enterFirmwareUpdateMode": "Entrer en mode de mise à jour du firmware",
-		"step1Unplug": "1. Débranchez votre KeepKey",
-		"step2Hold": "2. Maintenez le bouton de l'appareil enfoncé",
-		"step3Plugin": "3. Tout en maintenant, branchez le câble USB",
-		"step4Release": "4. Relâchez lorsque l'écran du bootloader apparaît",
+		"step1Unplug": "Débranchez votre KeepKey",
+		"step2Hold": "Maintenez le bouton de l'appareil enfoncé",
+		"step3Plugin": "Tout en maintenant, branchez le câble USB",
+		"step4Release": "Relâchez lorsque l'écran du bootloader apparaît",
 		"listeningForBootloader": "Écoute de l'appareil en mode bootloader...",
 		"readyDetectBootloader": "Je suis prêt — Détecter le Bootloader",
-		"skipBootloaderUpdate": "Passer la mise à jour du bootloader"
+		"skipBootloaderUpdate": "Passer la mise à jour du bootloader",
+		"verifyBackupHint": "Sur le KeepKey, il vous sera demandé de vérifier la sauvegarde. Nous le ferons après la mise à jour — maintenez le bouton enfoncé pour passer cette étape pour l'instant.",
+		"followDirectionsOnDevice": "Suivez les instructions sur l'appareil",
+		"deviceWillGuide": "Votre KeepKey vous guidera tout au long du processus de mise à jour.",
+		"bootloaderDetected": "Mode Bootloader détecté",
+		"deviceReadyForUpdate": "Votre KeepKey est en mode bootloader et prêt pour la mise à jour.",
+		"updateBootloaderTo": "Mettre à jour le Bootloader vers v{{version}}"
 	},
 	"firmware": {
 		"title": "Mise à jour du Firmware",
@@ -58,7 +81,36 @@
 		"firmwareVerified": "Firmware vérifié comme version officielle",
 		"firmwareHashNotFound": "Hash du firmware non trouvé dans le manifeste",
 		"updateFirmwareTo": "Mettre à jour le Firmware vers v{{version}}",
-		"skipUpdate": "Passer la mise à jour"
+		"skipUpdate": "Passer la mise à jour",
+		"confirmOnDevice": "Confirmez l'action sur l'appareil !",
+		"lookAtDeviceAndPress": "Regardez l'écran de votre KeepKey et appuyez sur le bouton pour confirmer.",
+		"verifyBackupNote": "Si votre appareil n'est pas configuré, vous pouvez ignorer en toute sécurité tout écran « vérifier la sauvegarde ».",
+		"uploadingFirmware": "Téléversement du firmware... Ne déconnectez pas votre appareil",
+		"estimatedTimeRemaining": "Temps restant estimé : {{seconds}}s",
+		"deviceWillRestart": "Votre appareil redémarrera une fois terminé.",
+		"skipWarning": "Vous pouvez continuer avec l'ancien firmware. Certaines fonctionnalités pourraient ne pas fonctionner comme prévu.",
+		"bootloaderReadyForFirmware": "Votre KeepKey est en mode bootloader et prêt pour le firmware.",
+		"installLatestFirmware": "Installer le Firmware officiel v{{version}}",
+		"orCustomFirmware": "Ou installer un firmware personnalisé",
+		"customFirmwareHint": "Sélectionnez un fichier firmware .bin depuis votre ordinateur, ou glissez-déposez n'importe où.",
+		"browseFiles": "Parcourir les fichiers",
+		"analyzingFirmware": "Analyse du firmware...",
+		"customFirmwareReady": "Firmware personnalisé prêt à être flashé",
+		"flashFirmware": "Flasher le Firmware",
+		"signed": "SIGNÉ",
+		"unsigned": "NON SIGNÉ",
+		"version": "Version",
+		"size": "Taille",
+		"willWipeWarning": "Flasher un firmware non signé sur un appareil signé EFFACERA TOUTES LES DONNÉES. Assurez-vous que votre phrase de récupération est sauvegardée.",
+		"unsignedWarning": "Ceci est un firmware développeur non signé. Il peut provoquer un comportement inattendu.",
+		"customFlashFailed": "Échec du flash du firmware personnalisé",
+		"rebootTakingLong": "La reconnexion prend plus de temps que prévu...",
+		"rebootTakingLongSub": "L'appareil peut avoir besoin d'un moment pour redémarrer.",
+		"manualReconnectTitle": "L'appareil ne se reconnecte pas ?",
+		"manualReconnectStep1": "1. Débranchez votre KeepKey",
+		"manualReconnectStep2": "2. Attendez 5 secondes",
+		"manualReconnectStep3": "3. Rebranchez-le",
+		"manualReconnectNote": "La configuration continuera automatiquement lorsque l'appareil sera détecté."
 	},
 	"initChoose": {
 		"title": "Configurez votre portefeuille",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/it/dashboard.json b/projects/keepkey-vault/src/mainview/i18n/locales/it/dashboard.json
index 3c697b27..08c3febb 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/it/dashboard.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/it/dashboard.json
@@ -7,5 +7,27 @@
 	"noBalance": "Nessun saldo",
 	"tokensCount_one": "+{{count}} token",
 	"tokensCount_other": "+{{count}} token",
-	"watchOnlyBanner": "Solo visualizzazione — Collega il dispositivo per l'accesso completo"
+	"watchOnlyBanner": "Solo visualizzazione — Collega il dispositivo per l'accesso completo",
+	"welcomeTitle": "Benvenuto in KeepKey Vault",
+	"welcomeSubtitle": "Il tuo portafoglio è pronto. Ecco come iniziare:",
+	"welcomeTip1": "Tocca una catena qui sotto, poi premi Ricevi per ottenere il tuo indirizzo di deposito",
+	"welcomeTip2": "Invia crypto al tuo indirizzo — il tuo saldo apparirà qui automaticamente",
+	"welcomeTip3": "Aggiungi catene EVM personalizzate con la scheda + per monitorare qualsiasi rete",
+	"balancesStale": "I saldi potrebbero essere obsoleti",
+	"lastUpdated": "Ultimo aggiornamento {{time}}",
+	"lastUpdatedNever": "Mai caricato",
+	"refreshPrompt": "Premi per aggiornare i saldi",
+	"tokenWarningTitle": "Saldi token non disponibili",
+	"tokenWarningDesc": "Nessun dato token restituito. Vengono mostrati i saldi nativi ma i saldi ERC-20 / token potrebbero mancare.",
+	"refreshing": "Aggiornamento...",
+	"reports": "Rapporti",
+	"pioneerOfflineTitle": "Server saldi offline",
+	"pioneerOfflineDesc": "Impossibile connettersi a {{url}}. I saldi potrebbero non essere disponibili.",
+	"changeServer": "Cambia server",
+	"getSupport": "Ottieni supporto",
+	"retry": "Riprova",
+	"timeJustNow": "proprio ora",
+	"timeMinutesAgo": "{{count}}m fa",
+	"timeHoursAgo": "{{count}}h fa",
+	"timeDaysAgo": "{{count}}g fa"
 }
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/it/device.json b/projects/keepkey-vault/src/mainview/i18n/locales/it/device.json
index fbfee0dd..c5bac750 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/it/device.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/it/device.json
@@ -20,7 +20,9 @@
 		"description": "Il tuo dispositivo ha la protezione passphrase abilitata. Inserisci la tua passphrase BIP-39 per sbloccare. Lascia vuoto per il portafoglio predefinito.",
 		"placeholder": "Passphrase (facoltativa)",
 		"warning": "Le passphrase distinguono maiuscole e minuscole. Una passphrase diversa genera un portafoglio completamente diverso.",
-		"unlock": "Sblocca"
+		"unlock": "Sblocca",
+		"confirmOnDevice": "Conferma sul tuo KeepKey",
+		"confirmOnDeviceHint": "Controlla lo schermo del dispositivo e premi il pulsante per confermare."
 	},
 	"pairing": {
 		"wantsToConnect": "vuole connettersi al tuo KeepKey",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/it/setup.json b/projects/keepkey-vault/src/mainview/i18n/locales/it/setup.json
index 7e621696..f924d286 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/it/setup.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/it/setup.json
@@ -17,14 +17,31 @@
 	},
 	"welcome": {
 		"title": "Benvenuto su KeepKey",
+		"oobTitle": "Nuovo dispositivo rilevato",
+		"oobWelcome": "Benvenuto in KeepKey",
+		"oobWizardDesc": "Questa procedura guidata ti accompagnerà attraverso gli aggiornamenti del bootloader e del firmware per preparare il tuo dispositivo.",
 		"oobIntro": "Aggiorniamo il firmware e configuriamo il tuo portafoglio.",
 		"intro": "Configuriamo il tuo portafoglio hardware.",
+		"getStarted": "Inizia",
 		"startingSetup": "Avvio configurazione...",
-		"detectingDevice": "Rilevamento stato dispositivo..."
+		"detectingDevice": "Rilevamento stato dispositivo...",
+		"readMore": "Come funziona?",
+		"readMoreTitle": "Come funziona?",
+		"readMoreBootloaderTitle": "Cos'è il bootloader?",
+		"readMoreBootloaderBody": "Il bootloader è un piccolo programma che si avvia per primo quando il tuo KeepKey si accende. Pensalo come una guardia di sicurezza — verifica che il software principale sul tuo dispositivo sia autentico e non sia stato manomesso prima di permetterne l'esecuzione.",
+		"readMoreFirmwareTitle": "Cos'è il firmware?",
+		"readMoreFirmwareBody": "Il firmware è il software principale che il tuo KeepKey usa per gestire le tue criptovalute. Si occupa di tutto, dalla generazione degli indirizzi alla firma delle transazioni. Aggiornarlo ti offre le ultime funzionalità e le patch di sicurezza più recenti.",
+		"readMoreWhyTitle": "Perché aggiornare entrambi?",
+		"readMoreWhyBody": "Aggiornare il bootloader blocca il tuo dispositivo affinché accetti solo software ufficiale KeepKey — quindi anche se qualcuno tentasse di installare qualcosa di malevolo, il tuo dispositivo lo rifiuterebbe. Insieme, il bootloader e il firmware mantengono i tuoi fondi al sicuro.",
+		"gotIt": "Capito"
 	},
 	"bootloader": {
 		"title": "Aggiornamento Bootloader",
 		"description": "Il bootloader deve essere aggiornato per sicurezza e compatibilità.",
+		"putDeviceInBootloader": "Metti il tuo dispositivo in modalità Bootloader",
+		"followStepsBelow": "Segui i passaggi qui sotto, poi rileveremo il tuo dispositivo automaticamente.",
+		"stepsTitle": "Come entrare in modalità bootloader:",
+		"waitingForBootloader": "In attesa del dispositivo... collegalo tenendo premuto il pulsante",
 		"current": "Attuale",
 		"latest": "Ultimo",
 		"outdated": "Obsoleto",
@@ -33,13 +50,19 @@
 		"updateFailed": "Aggiornamento fallito",
 		"tryAgain": "Riprova",
 		"enterFirmwareUpdateMode": "Entra in modalità aggiornamento firmware",
-		"step1Unplug": "1. Scollega il tuo KeepKey",
-		"step2Hold": "2. Tieni premuto il pulsante del dispositivo",
-		"step3Plugin": "3. Tenendo premuto, collega il cavo USB",
-		"step4Release": "4. Rilascia quando appare la schermata del bootloader",
+		"step1Unplug": "Scollega il tuo KeepKey",
+		"step2Hold": "Tieni premuto il pulsante del dispositivo",
+		"step3Plugin": "Tenendo premuto, collega il cavo USB",
+		"step4Release": "Rilascia quando appare la schermata del bootloader",
 		"listeningForBootloader": "In ascolto del dispositivo in modalità bootloader...",
 		"readyDetectBootloader": "Pronto — Rileva Bootloader",
-		"skipBootloaderUpdate": "Salta aggiornamento bootloader"
+		"skipBootloaderUpdate": "Salta aggiornamento bootloader",
+		"verifyBackupHint": "Sul KeepKey, ti verrà chiesto di verificare il backup. Lo faremo dopo l'aggiornamento — tieni premuto il pulsante per saltare questo passaggio per ora.",
+		"followDirectionsOnDevice": "Segui le istruzioni sul dispositivo",
+		"deviceWillGuide": "Il tuo KeepKey ti guiderà attraverso il processo di aggiornamento.",
+		"bootloaderDetected": "Modalità Bootloader rilevata",
+		"deviceReadyForUpdate": "Il tuo KeepKey è in modalità bootloader e pronto per l'aggiornamento.",
+		"updateBootloaderTo": "Aggiorna Bootloader a v{{version}}"
 	},
 	"firmware": {
 		"title": "Aggiornamento Firmware",
@@ -58,7 +81,36 @@
 		"firmwareVerified": "Firmware verificato come versione ufficiale",
 		"firmwareHashNotFound": "Hash del firmware non trovato nel manifesto",
 		"updateFirmwareTo": "Aggiorna Firmware a v{{version}}",
-		"skipUpdate": "Salta aggiornamento"
+		"skipUpdate": "Salta aggiornamento",
+		"confirmOnDevice": "Conferma l'azione sul dispositivo!",
+		"lookAtDeviceAndPress": "Guarda lo schermo del tuo KeepKey e premi il pulsante per confermare.",
+		"verifyBackupNote": "Se il tuo dispositivo non è configurato, puoi ignorare tranquillamente qualsiasi schermata \"verifica backup\".",
+		"uploadingFirmware": "Caricamento firmware... Non scollegare il dispositivo",
+		"estimatedTimeRemaining": "Tempo stimato rimanente: {{seconds}}s",
+		"deviceWillRestart": "Il dispositivo si riavvierà al completamento.",
+		"skipWarning": "Puoi continuare con il firmware precedente. Alcune funzionalità potrebbero non funzionare correttamente.",
+		"bootloaderReadyForFirmware": "Il tuo KeepKey è in modalità bootloader e pronto per il firmware.",
+		"installLatestFirmware": "Installa Firmware Ufficiale v{{version}}",
+		"orCustomFirmware": "Oppure installa firmware personalizzato",
+		"customFirmwareHint": "Seleziona un file firmware .bin dal tuo computer, oppure trascinalo qui.",
+		"browseFiles": "Sfoglia file",
+		"analyzingFirmware": "Analisi firmware...",
+		"customFirmwareReady": "Firmware personalizzato pronto per il flash",
+		"flashFirmware": "Installa Firmware",
+		"signed": "FIRMATO",
+		"unsigned": "NON FIRMATO",
+		"version": "Versione",
+		"size": "Dimensione",
+		"willWipeWarning": "Installare firmware non firmato su un dispositivo firmato CANCELLERÀ TUTTI I DATI. Assicurati che il tuo seed sia stato salvato.",
+		"unsignedWarning": "Questo è firmware non firmato per sviluppatori. Potrebbe causare comportamenti imprevisti.",
+		"customFlashFailed": "Installazione firmware personalizzato fallita",
+		"rebootTakingLong": "La riconnessione sta impiegando più tempo del previsto...",
+		"rebootTakingLongSub": "Il dispositivo potrebbe aver bisogno di un momento per riavviarsi.",
+		"manualReconnectTitle": "Il dispositivo non si riconnette?",
+		"manualReconnectStep1": "1. Scollega il tuo KeepKey",
+		"manualReconnectStep2": "2. Attendi 5 secondi",
+		"manualReconnectStep3": "3. Ricollegalo",
+		"manualReconnectNote": "La configurazione continuerà automaticamente quando il dispositivo verrà rilevato."
 	},
 	"initChoose": {
 		"title": "Configura il tuo portafoglio",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ja/dashboard.json b/projects/keepkey-vault/src/mainview/i18n/locales/ja/dashboard.json
index bebf70c2..e8994bff 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ja/dashboard.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ja/dashboard.json
@@ -7,5 +7,27 @@
 	"noBalance": "残高なし",
 	"tokensCount_one": "+{{count}} トークン",
 	"tokensCount_other": "+{{count}} トークン",
-	"watchOnlyBanner": "閲覧専用 — フルアクセスにはデバイスを接続してください"
+	"watchOnlyBanner": "閲覧専用 — フルアクセスにはデバイスを接続してください",
+	"welcomeTitle": "KeepKey Vault へようこそ",
+	"welcomeSubtitle": "ウォレットの準備ができました。始め方はこちら：",
+	"welcomeTip1": "下のチェーンをタップして「受取」を押し、入金アドレスを取得します",
+	"welcomeTip2": "アドレスに暗号通貨を送信 — 残高はここに自動的に表示されます",
+	"welcomeTip3": "+ カードでカスタム EVM チェーンを追加して、任意のネットワークを追跡します",
+	"balancesStale": "残高が古い可能性があります",
+	"lastUpdated": "最終更新 {{time}}",
+	"lastUpdatedNever": "未読み込み",
+	"refreshPrompt": "押して残高を更新",
+	"tokenWarningTitle": "トークン残高が利用できません",
+	"tokenWarningDesc": "トークンデータが返されませんでした。ネイティブ残高は表示されていますが、ERC-20 / トークン残高が欠落している可能性があります。",
+	"refreshing": "更新中...",
+	"reports": "レポート",
+	"pioneerOfflineTitle": "残高サーバーがオフラインです",
+	"pioneerOfflineDesc": "{{url}} に接続できません。残高が利用できない場合があります。",
+	"changeServer": "サーバーを変更",
+	"getSupport": "サポートを受ける",
+	"retry": "再試行",
+	"timeJustNow": "たった今",
+	"timeMinutesAgo": "{{count}}分前",
+	"timeHoursAgo": "{{count}}時間前",
+	"timeDaysAgo": "{{count}}日前"
 }
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ja/device.json b/projects/keepkey-vault/src/mainview/i18n/locales/ja/device.json
index 60fc5b23..d196b816 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ja/device.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ja/device.json
@@ -20,7 +20,9 @@
 		"description": "お使いのデバイスはパスフレーズ保護が有効になっています。ロックを解除するにはBIP-39パスフレーズを入力してください。デフォルトのウォレットの場合は空のままにしてください。",
 		"placeholder": "パスフレーズ（任意）",
 		"warning": "パスフレーズは大文字と小文字を区別します。異なるパスフレーズは完全に異なるウォレットを生成します。",
-		"unlock": "ロック解除"
+		"unlock": "ロック解除",
+		"confirmOnDevice": "KeepKeyで確認",
+		"confirmOnDeviceHint": "デバイスの画面を確認し、ボタンを押して承認してください。"
 	},
 	"pairing": {
 		"wantsToConnect": "がKeepKeyに接続しようとしています",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ja/setup.json b/projects/keepkey-vault/src/mainview/i18n/locales/ja/setup.json
index 570f5c9f..1f31fd03 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ja/setup.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ja/setup.json
@@ -17,14 +17,31 @@
 	},
 	"welcome": {
 		"title": "KeepKeyへようこそ",
+		"oobTitle": "新しいデバイスが検出されました",
+		"oobWelcome": "KeepKeyへようこそ",
+		"oobWizardDesc": "このウィザードでは、ブートローダーとファームウェアの更新を行い、デバイスを使用可能な状態にします。",
 		"oobIntro": "ファームウェアを更新してウォレットを設定しましょう。",
 		"intro": "ハードウェアウォレットを設定しましょう。",
+		"getStarted": "始める",
 		"startingSetup": "セットアップを開始中...",
-		"detectingDevice": "デバイスの状態を検出中..."
+		"detectingDevice": "デバイスの状態を検出中...",
+		"readMore": "どのように機能しますか？",
+		"readMoreTitle": "どのように機能しますか？",
+		"readMoreBootloaderTitle": "ブートローダーとは？",
+		"readMoreBootloaderBody": "ブートローダーは、KeepKeyの電源を入れたときに最初に実行される小さなプログラムです。セキュリティガードのようなもので、デバイス上のメインソフトウェアが本物であり、改ざんされていないことを確認してから実行を許可します。",
+		"readMoreFirmwareTitle": "ファームウェアとは？",
+		"readMoreFirmwareBody": "ファームウェアは、KeepKeyが暗号資産を管理するために使用するメインソフトウェアです。アドレスの生成からトランザクションの署名まで、すべてを処理します。更新することで、最新の機能とセキュリティパッチが適用されます。",
+		"readMoreWhyTitle": "なぜ両方を更新するのですか？",
+		"readMoreWhyBody": "ブートローダーを更新すると、デバイスは公式のKeepKeyソフトウェアのみを受け入れるようになります。たとえ誰かが悪意のあるソフトウェアをインストールしようとしても、デバイスはそれを拒否します。ブートローダーとファームウェアが一緒になって、あなたの資金を安全に保ちます。",
+		"gotIt": "了解しました"
 	},
 	"bootloader": {
 		"title": "ブートローダーの更新",
 		"description": "セキュリティと互換性のためにブートローダーを更新する必要があります。",
+		"putDeviceInBootloader": "デバイスをブートローダーモードにしてください",
+		"followStepsBelow": "以下の手順に従ってください。デバイスは自動的に検出されます。",
+		"stepsTitle": "ブートローダーモードに入る方法：",
+		"waitingForBootloader": "デバイスを待機中...ボタンを押しながら接続してください",
 		"current": "現在",
 		"latest": "最新",
 		"outdated": "古い",
@@ -33,13 +50,19 @@
 		"updateFailed": "更新に失敗しました",
 		"tryAgain": "再試行",
 		"enterFirmwareUpdateMode": "ファームウェア更新モードに入る",
-		"step1Unplug": "1. KeepKeyを抜いてください",
-		"step2Hold": "2. デバイスのボタンを押し続けてください",
-		"step3Plugin": "3. ボタンを押したまま、USBケーブルを接続してください",
-		"step4Release": "4. ブートローダー画面が表示されたら離してください",
+		"step1Unplug": "KeepKeyを抜いてください",
+		"step2Hold": "デバイスのボタンを押し続けてください",
+		"step3Plugin": "ボタンを押したまま、USBケーブルを接続してください",
+		"step4Release": "ブートローダー画面が表示されたら離してください",
 		"listeningForBootloader": "ブートローダーモードのデバイスを待機中...",
 		"readyDetectBootloader": "準備完了 — ブートローダーを検出",
-		"skipBootloaderUpdate": "ブートローダー更新をスキップ"
+		"skipBootloaderUpdate": "ブートローダー更新をスキップ",
+		"verifyBackupHint": "KeepKeyでバックアップの確認を求められます。更新後に行いますので、今はボタンを長押ししてスキップしてください。",
+		"followDirectionsOnDevice": "デバイスの指示に従ってください",
+		"deviceWillGuide": "KeepKeyが更新プロセスをガイドします。",
+		"bootloaderDetected": "ブートローダーモードを検出しました",
+		"deviceReadyForUpdate": "KeepKeyはブートローダーモードで、更新の準備ができています。",
+		"updateBootloaderTo": "ブートローダーをv{{version}}に更新"
 	},
 	"firmware": {
 		"title": "ファームウェアの更新",
@@ -58,7 +81,36 @@
 		"firmwareVerified": "ファームウェアは公式リリースとして検証されました",
 		"firmwareHashNotFound": "マニフェストにファームウェアハッシュが見つかりません",
 		"updateFirmwareTo": "ファームウェアをv{{version}}に更新",
-		"skipUpdate": "更新をスキップ"
+		"skipUpdate": "更新をスキップ",
+		"confirmOnDevice": "デバイスで操作を確認してください！",
+		"lookAtDeviceAndPress": "KeepKeyの画面を見て、ボタンを押して確認してください。",
+		"verifyBackupNote": "デバイスが未設定の場合、「バックアップを確認」画面は無視しても安全です。",
+		"uploadingFirmware": "ファームウェアをアップロード中...デバイスを切断しないでください",
+		"estimatedTimeRemaining": "推定残り時間：{{seconds}}秒",
+		"deviceWillRestart": "完了するとデバイスが再起動します。",
+		"skipWarning": "古いファームウェアのまま続行できます。一部の機能が正常に動作しない場合があります。",
+		"bootloaderReadyForFirmware": "KeepKeyはブートローダーモードで、ファームウェアの準備ができています。",
+		"installLatestFirmware": "公式ファームウェアv{{version}}をインストール",
+		"orCustomFirmware": "またはカスタムファームウェアをインストール",
+		"customFirmwareHint": "コンピュータから.binファームウェアファイルを選択するか、ここにドラッグ＆ドロップしてください。",
+		"browseFiles": "ファイルを参照",
+		"analyzingFirmware": "ファームウェアを分析中...",
+		"customFirmwareReady": "カスタムファームウェアの書き込み準備完了",
+		"flashFirmware": "ファームウェアを書き込む",
+		"signed": "署名済み",
+		"unsigned": "未署名",
+		"version": "バージョン",
+		"size": "サイズ",
+		"willWipeWarning": "署名済みデバイスに未署名ファームウェアを書き込むと、すべてのデータが消去されます。シードがバックアップされていることを確認してください。",
+		"unsignedWarning": "これは未署名の開発者向けファームウェアです。予期しない動作を引き起こす可能性があります。",
+		"customFlashFailed": "カスタムファームウェアの書き込みに失敗しました",
+		"rebootTakingLong": "再接続に通常より時間がかかっています...",
+		"rebootTakingLongSub": "デバイスの再起動に少し時間がかかる場合があります。",
+		"manualReconnectTitle": "デバイスが再接続しませんか？",
+		"manualReconnectStep1": "1. KeepKeyを抜いてください",
+		"manualReconnectStep2": "2. 5秒待ってください",
+		"manualReconnectStep3": "3. もう一度接続してください",
+		"manualReconnectNote": "デバイスが検出されると、セットアップは自動的に続行されます。"
 	},
 	"initChoose": {
 		"title": "ウォレットをセットアップ",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ko/dashboard.json b/projects/keepkey-vault/src/mainview/i18n/locales/ko/dashboard.json
index 6bbf3cbb..d013c19a 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ko/dashboard.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ko/dashboard.json
@@ -7,5 +7,27 @@
 	"noBalance": "잔액 없음",
 	"tokensCount_one": "+{{count}}개 토큰",
 	"tokensCount_other": "+{{count}}개 토큰",
-	"watchOnlyBanner": "읽기 전용 — 전체 액세스를 위해 기기를 연결하세요"
+	"watchOnlyBanner": "읽기 전용 — 전체 액세스를 위해 기기를 연결하세요",
+	"welcomeTitle": "KeepKey Vault에 오신 것을 환영합니다",
+	"welcomeSubtitle": "지갑이 준비되었습니다. 시작하는 방법은 다음과 같습니다:",
+	"welcomeTip1": "아래 체인을 탭한 다음 수신을 눌러 입금 주소를 받으세요",
+	"welcomeTip2": "주소로 암호화폐를 보내세요 — 잔액이 여기에 자동으로 표시됩니다",
+	"welcomeTip3": "+ 카드로 커스텀 EVM 체인을 추가하여 모든 네트워크를 추적하세요",
+	"balancesStale": "잔액이 오래되었을 수 있습니다",
+	"lastUpdated": "마지막 업데이트 {{time}}",
+	"lastUpdatedNever": "로드된 적 없음",
+	"refreshPrompt": "눌러서 잔액 업데이트",
+	"tokenWarningTitle": "토큰 잔액을 사용할 수 없습니다",
+	"tokenWarningDesc": "토큰 데이터가 반환되지 않았습니다. 네이티브 잔액은 표시되지만 ERC-20 / 토큰 잔액이 누락될 수 있습니다.",
+	"refreshing": "새로고침 중...",
+	"reports": "보고서",
+	"pioneerOfflineTitle": "잔액 서버 오프라인",
+	"pioneerOfflineDesc": "{{url}}에 연결할 수 없습니다. 잔액을 사용할 수 없을 수 있습니다.",
+	"changeServer": "서버 변경",
+	"getSupport": "지원 받기",
+	"retry": "재시도",
+	"timeJustNow": "방금",
+	"timeMinutesAgo": "{{count}}분 전",
+	"timeHoursAgo": "{{count}}시간 전",
+	"timeDaysAgo": "{{count}}일 전"
 }
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ko/device.json b/projects/keepkey-vault/src/mainview/i18n/locales/ko/device.json
index 16628389..a8e5e8cc 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ko/device.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ko/device.json
@@ -20,7 +20,9 @@
 		"description": "기기에 비밀번호 구문 보호가 활성화되어 있습니다. 잠금 해제하려면 BIP-39 비밀번호 구문을 입력하세요. 기본 지갑을 사용하려면 비워두세요.",
 		"placeholder": "비밀번호 구문 (선택사항)",
 		"warning": "비밀번호 구문은 대소문자를 구분합니다. 다른 비밀번호 구문은 완전히 다른 지갑을 생성합니다.",
-		"unlock": "잠금 해제"
+		"unlock": "잠금 해제",
+		"confirmOnDevice": "KeepKey에서 확인",
+		"confirmOnDeviceHint": "기기 화면을 확인하고 버튼을 눌러 승인하세요."
 	},
 	"pairing": {
 		"wantsToConnect": "이(가) KeepKey에 연결하려고 합니다",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ko/setup.json b/projects/keepkey-vault/src/mainview/i18n/locales/ko/setup.json
index 391a90a0..15d4e6c1 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ko/setup.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ko/setup.json
@@ -17,14 +17,31 @@
 	},
 	"welcome": {
 		"title": "KeepKey에 오신 것을 환영합니다",
+		"oobTitle": "새 기기가 감지되었습니다",
+		"oobWelcome": "KeepKey에 오신 것을 환영합니다",
+		"oobWizardDesc": "이 마법사가 부트로더 및 펌웨어 업데이트를 안내하여 기기를 준비합니다.",
 		"oobIntro": "펌웨어를 업데이트하고 지갑을 설정해 봅시다.",
 		"intro": "하드웨어 지갑을 설정해 봅시다.",
+		"getStarted": "시작하기",
 		"startingSetup": "설정 시작 중...",
-		"detectingDevice": "기기 상태 감지 중..."
+		"detectingDevice": "기기 상태 감지 중...",
+		"readMore": "어떻게 작동하나요?",
+		"readMoreTitle": "어떻게 작동하나요?",
+		"readMoreBootloaderTitle": "부트로더란 무엇인가요?",
+		"readMoreBootloaderBody": "부트로더는 KeepKey 전원이 켜질 때 가장 먼저 실행되는 작은 프로그램입니다. 보안 요원이라고 생각하면 됩니다 — 기기의 메인 소프트웨어가 정품이고 변조되지 않았는지 확인한 후에만 실행을 허용합니다.",
+		"readMoreFirmwareTitle": "펌웨어란 무엇인가요?",
+		"readMoreFirmwareBody": "펌웨어는 KeepKey가 암호화폐를 관리하는 데 사용하는 메인 소프트웨어입니다. 주소 생성부터 거래 서명까지 모든 것을 처리합니다. 업데이트하면 최신 기능과 보안 패치를 받을 수 있습니다.",
+		"readMoreWhyTitle": "왜 둘 다 업데이트해야 하나요?",
+		"readMoreWhyBody": "부트로더를 업데이트하면 기기가 공식 KeepKey 소프트웨어만 허용하도록 잠깁니다 — 누군가 악성 소프트웨어를 설치하려 해도 기기가 거부합니다. 부트로더와 펌웨어가 함께 자금을 안전하게 보호합니다.",
+		"gotIt": "이해했습니다"
 	},
 	"bootloader": {
 		"title": "부트로더 업데이트",
 		"description": "보안 및 호환성을 위해 부트로더를 업데이트해야 합니다.",
+		"putDeviceInBootloader": "기기를 부트로더 모드로 전환하세요",
+		"followStepsBelow": "아래 단계를 따르면 기기가 자동으로 감지됩니다.",
+		"stepsTitle": "부트로더 모드 진입 방법:",
+		"waitingForBootloader": "기기를 기다리는 중... 버튼을 누른 채로 연결하세요",
 		"current": "현재",
 		"latest": "최신",
 		"outdated": "구버전",
@@ -33,13 +50,19 @@
 		"updateFailed": "업데이트 실패",
 		"tryAgain": "다시 시도",
 		"enterFirmwareUpdateMode": "펌웨어 업데이트 모드 진입",
-		"step1Unplug": "1. KeepKey를 분리하세요",
-		"step2Hold": "2. 기기의 버튼을 길게 누르세요",
-		"step3Plugin": "3. 버튼을 누른 채로 USB 케이블을 연결하세요",
-		"step4Release": "4. 부트로더 화면이 나타나면 놓으세요",
+		"step1Unplug": "KeepKey를 분리하세요",
+		"step2Hold": "기기의 버튼을 길게 누르세요",
+		"step3Plugin": "버튼을 누른 채로 USB 케이블을 연결하세요",
+		"step4Release": "부트로더 화면이 나타나면 놓으세요",
 		"listeningForBootloader": "부트로더 모드의 기기를 대기 중...",
 		"readyDetectBootloader": "준비 완료 — 부트로더 감지",
-		"skipBootloaderUpdate": "부트로더 업데이트 건너뛰기"
+		"skipBootloaderUpdate": "부트로더 업데이트 건너뛰기",
+		"verifyBackupHint": "KeepKey에서 백업 확인을 요청할 것입니다. 업데이트 후에 진행할 것이므로 — 지금은 버튼을 길게 눌러 건너뛰세요.",
+		"followDirectionsOnDevice": "기기의 안내를 따르세요",
+		"deviceWillGuide": "KeepKey가 업데이트 과정을 안내합니다.",
+		"bootloaderDetected": "부트로더 모드 감지됨",
+		"deviceReadyForUpdate": "KeepKey가 부트로더 모드에 있으며 업데이트 준비가 되었습니다.",
+		"updateBootloaderTo": "부트로더를 v{{version}}(으)로 업데이트"
 	},
 	"firmware": {
 		"title": "펌웨어 업데이트",
@@ -58,7 +81,36 @@
 		"firmwareVerified": "펌웨어가 공식 릴리스로 확인되었습니다",
 		"firmwareHashNotFound": "매니페스트에서 펌웨어 해시를 찾을 수 없습니다",
 		"updateFirmwareTo": "펌웨어를 v{{version}}(으)로 업데이트",
-		"skipUpdate": "업데이트 건너뛰기"
+		"skipUpdate": "업데이트 건너뛰기",
+		"confirmOnDevice": "기기에서 작업을 확인하세요!",
+		"lookAtDeviceAndPress": "KeepKey 화면을 보고 버튼을 눌러 확인하세요.",
+		"verifyBackupNote": "기기가 설정되지 않은 경우 \"백업 확인\" 화면은 무시해도 됩니다.",
+		"uploadingFirmware": "펌웨어 업로드 중... 기기를 분리하지 마세요",
+		"estimatedTimeRemaining": "예상 남은 시간: {{seconds}}초",
+		"deviceWillRestart": "완료되면 기기가 재시작됩니다.",
+		"skipWarning": "이전 펌웨어로 계속할 수 있습니다. 일부 기능이 예상대로 작동하지 않을 수 있습니다.",
+		"bootloaderReadyForFirmware": "KeepKey가 부트로더 모드에 있으며 펌웨어 설치 준비가 되었습니다.",
+		"installLatestFirmware": "공식 펌웨어 v{{version}} 설치",
+		"orCustomFirmware": "또는 커스텀 펌웨어 설치",
+		"customFirmwareHint": "컴퓨터에서 .bin 펌웨어 파일을 선택하거나 아무 곳에나 끌어다 놓으세요.",
+		"browseFiles": "파일 찾아보기",
+		"analyzingFirmware": "펌웨어 분석 중...",
+		"customFirmwareReady": "커스텀 펌웨어 플래시 준비 완료",
+		"flashFirmware": "펌웨어 플래시",
+		"signed": "서명됨",
+		"unsigned": "서명되지 않음",
+		"version": "버전",
+		"size": "크기",
+		"willWipeWarning": "서명된 기기에 서명되지 않은 펌웨어를 플래시하면 모든 데이터가 삭제됩니다. 시드가 백업되어 있는지 확인하세요.",
+		"unsignedWarning": "이것은 서명되지 않은 개발자 펌웨어입니다. 예기치 않은 동작이 발생할 수 있습니다.",
+		"customFlashFailed": "커스텀 펌웨어 플래시 실패",
+		"rebootTakingLong": "재연결이 평소보다 오래 걸리고 있습니다...",
+		"rebootTakingLongSub": "기기가 재시작하는 데 시간이 필요할 수 있습니다.",
+		"manualReconnectTitle": "기기가 다시 연결되지 않나요?",
+		"manualReconnectStep1": "1. KeepKey를 분리하세요",
+		"manualReconnectStep2": "2. 5초간 기다리세요",
+		"manualReconnectStep3": "3. 다시 연결하세요",
+		"manualReconnectNote": "기기가 감지되면 설정이 자동으로 계속됩니다."
 	},
 	"initChoose": {
 		"title": "지갑 설정",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/pt/dashboard.json b/projects/keepkey-vault/src/mainview/i18n/locales/pt/dashboard.json
index 81622259..18a83bba 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/pt/dashboard.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/pt/dashboard.json
@@ -7,5 +7,27 @@
 	"noBalance": "Sem saldo",
 	"tokensCount_one": "+{{count}} token",
 	"tokensCount_other": "+{{count}} tokens",
-	"watchOnlyBanner": "Somente leitura — Conecte o dispositivo para acesso completo"
+	"watchOnlyBanner": "Somente leitura — Conecte o dispositivo para acesso completo",
+	"welcomeTitle": "Bem-vindo ao KeepKey Vault",
+	"welcomeSubtitle": "Sua carteira está pronta. Veja como começar:",
+	"welcomeTip1": "Toque em qualquer rede abaixo e depois em Receber para obter seu endereço de depósito",
+	"welcomeTip2": "Envie cripto para seu endereço — seu saldo aparecerá aqui automaticamente",
+	"welcomeTip3": "Adicione redes EVM personalizadas com o cartão + para rastrear qualquer rede",
+	"balancesStale": "Os saldos podem estar desatualizados",
+	"lastUpdated": "Última atualização {{time}}",
+	"lastUpdatedNever": "Nunca carregado",
+	"refreshPrompt": "Pressione para atualizar saldos",
+	"tokenWarningTitle": "Saldos de tokens indisponíveis",
+	"tokenWarningDesc": "Nenhum dado de token foi retornado. Seus saldos nativos são exibidos, mas saldos ERC-20 / tokens podem estar ausentes.",
+	"refreshing": "Atualizando...",
+	"reports": "Relatórios",
+	"pioneerOfflineTitle": "Servidor de saldos offline",
+	"pioneerOfflineDesc": "Não foi possível conectar a {{url}}. Os saldos podem estar indisponíveis.",
+	"changeServer": "Alterar servidor",
+	"getSupport": "Obter suporte",
+	"retry": "Tentar novamente",
+	"timeJustNow": "agora mesmo",
+	"timeMinutesAgo": "{{count}}min atrás",
+	"timeHoursAgo": "{{count}}h atrás",
+	"timeDaysAgo": "{{count}}d atrás"
 }
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/pt/device.json b/projects/keepkey-vault/src/mainview/i18n/locales/pt/device.json
index bb01c1c0..2294536b 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/pt/device.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/pt/device.json
@@ -20,7 +20,9 @@
 		"description": "Seu dispositivo tem proteção por frase-senha ativada. Insira sua frase-senha BIP-39 para desbloquear. Deixe vazio para a carteira padrão.",
 		"placeholder": "Frase-senha (opcional)",
 		"warning": "Frases-senha diferenciam maiúsculas de minúsculas. Uma frase-senha diferente gera uma carteira completamente diferente.",
-		"unlock": "Desbloquear"
+		"unlock": "Desbloquear",
+		"confirmOnDevice": "Confirmar no seu KeepKey",
+		"confirmOnDeviceHint": "Verifique a tela do seu dispositivo e pressione o botão para confirmar."
 	},
 	"pairing": {
 		"wantsToConnect": "quer se conectar ao seu KeepKey",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/pt/setup.json b/projects/keepkey-vault/src/mainview/i18n/locales/pt/setup.json
index bfceab3f..f7b3eade 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/pt/setup.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/pt/setup.json
@@ -17,14 +17,31 @@
 	},
 	"welcome": {
 		"title": "Bem-vindo ao KeepKey",
+		"oobTitle": "Novo dispositivo detectado",
+		"oobWelcome": "Bem-vindo ao KeepKey",
+		"oobWizardDesc": "Este assistente irá guiá-lo pelas atualizações do bootloader e firmware para deixar seu dispositivo pronto.",
 		"oobIntro": "Vamos atualizar seu firmware e configurar sua carteira.",
 		"intro": "Vamos configurar sua carteira de hardware.",
+		"getStarted": "Começar",
 		"startingSetup": "Iniciando configuração...",
-		"detectingDevice": "Detectando estado do dispositivo..."
+		"detectingDevice": "Detectando estado do dispositivo...",
+		"readMore": "Como funciona?",
+		"readMoreTitle": "Como funciona?",
+		"readMoreBootloaderTitle": "O que é o bootloader?",
+		"readMoreBootloaderBody": "O bootloader é um pequeno programa que roda primeiro quando seu KeepKey liga. Pense nele como um guarda de segurança — ele verifica se o software principal do seu dispositivo é autêntico e não foi adulterado antes de permitir sua execução.",
+		"readMoreFirmwareTitle": "O que é firmware?",
+		"readMoreFirmwareBody": "O firmware é o software principal que seu KeepKey usa para gerenciar suas criptomoedas. Ele cuida de tudo, desde gerar endereços até assinar transações. Atualizá-lo traz os recursos e correções de segurança mais recentes.",
+		"readMoreWhyTitle": "Por que atualizar ambos?",
+		"readMoreWhyBody": "Atualizar o bootloader bloqueia seu dispositivo para aceitar apenas software oficial do KeepKey — então, mesmo que alguém tentasse instalar algo malicioso, seu dispositivo o rejeitaria. Juntos, o bootloader e o firmware mantêm seus fundos seguros.",
+		"gotIt": "Entendi"
 	},
 	"bootloader": {
 		"title": "Atualização do Bootloader",
 		"description": "Seu bootloader precisa ser atualizado por segurança e compatibilidade.",
+		"putDeviceInBootloader": "Coloque seu dispositivo no modo Bootloader",
+		"followStepsBelow": "Siga os passos abaixo e detectaremos seu dispositivo automaticamente.",
+		"stepsTitle": "Como entrar no modo bootloader:",
+		"waitingForBootloader": "Aguardando seu dispositivo... conecte-o enquanto segura o botão",
 		"current": "Atual",
 		"latest": "Mais recente",
 		"outdated": "Desatualizado",
@@ -33,13 +50,19 @@
 		"updateFailed": "Atualização falhou",
 		"tryAgain": "Tentar novamente",
 		"enterFirmwareUpdateMode": "Entrar no modo de atualização de firmware",
-		"step1Unplug": "1. Desconecte seu KeepKey",
-		"step2Hold": "2. Segure o botão do dispositivo",
-		"step3Plugin": "3. Enquanto segura, conecte o cabo USB",
-		"step4Release": "4. Solte quando a tela do bootloader aparecer",
+		"step1Unplug": "Desconecte seu KeepKey",
+		"step2Hold": "Segure o botão do dispositivo",
+		"step3Plugin": "Enquanto segura, conecte o cabo USB",
+		"step4Release": "Solte quando a tela do bootloader aparecer",
 		"listeningForBootloader": "Aguardando dispositivo no modo bootloader...",
 		"readyDetectBootloader": "Estou pronto — Detectar Bootloader",
-		"skipBootloaderUpdate": "Pular atualização do bootloader"
+		"skipBootloaderUpdate": "Pular atualização do bootloader",
+		"verifyBackupHint": "No KeepKey, será solicitado que você verifique o backup. Faremos isso após a atualização — segure o botão para pular por enquanto.",
+		"followDirectionsOnDevice": "Siga as instruções no dispositivo",
+		"deviceWillGuide": "Seu KeepKey irá guiá-lo pelo processo de atualização.",
+		"bootloaderDetected": "Modo Bootloader detectado",
+		"deviceReadyForUpdate": "Seu KeepKey está no modo bootloader e pronto para atualização.",
+		"updateBootloaderTo": "Atualizar Bootloader para v{{version}}"
 	},
 	"firmware": {
 		"title": "Atualização de Firmware",
@@ -58,7 +81,36 @@
 		"firmwareVerified": "Firmware verificado como versão oficial",
 		"firmwareHashNotFound": "Hash do firmware não encontrado no manifesto",
 		"updateFirmwareTo": "Atualizar Firmware para v{{version}}",
-		"skipUpdate": "Pular atualização"
+		"skipUpdate": "Pular atualização",
+		"confirmOnDevice": "Confirme a ação no dispositivo!",
+		"lookAtDeviceAndPress": "Olhe para a tela do seu KeepKey e pressione o botão para confirmar.",
+		"verifyBackupNote": "Se seu dispositivo não estiver configurado, você pode ignorar com segurança qualquer tela de \"verificar backup\".",
+		"uploadingFirmware": "Enviando firmware... Não desconecte seu dispositivo",
+		"estimatedTimeRemaining": "Tempo estimado restante: {{seconds}}s",
+		"deviceWillRestart": "Seu dispositivo reiniciará quando concluído.",
+		"skipWarning": "Você pode continuar com firmware mais antigo. Alguns recursos podem não funcionar como esperado.",
+		"bootloaderReadyForFirmware": "Seu KeepKey está no modo bootloader e pronto para o firmware.",
+		"installLatestFirmware": "Instalar Firmware Oficial v{{version}}",
+		"orCustomFirmware": "Ou instalar firmware personalizado",
+		"customFirmwareHint": "Selecione um arquivo de firmware .bin do seu computador ou arraste e solte em qualquer lugar.",
+		"browseFiles": "Procurar Arquivos",
+		"analyzingFirmware": "Analisando firmware...",
+		"customFirmwareReady": "Firmware personalizado pronto para instalação",
+		"flashFirmware": "Gravar Firmware",
+		"signed": "ASSINADO",
+		"unsigned": "NÃO ASSINADO",
+		"version": "Versão",
+		"size": "Tamanho",
+		"willWipeWarning": "Gravar firmware não assinado em um dispositivo assinado IRÁ APAGAR TODOS OS DADOS. Certifique-se de que sua semente está salva.",
+		"unsignedWarning": "Este é firmware de desenvolvedor não assinado. Pode causar comportamento inesperado.",
+		"customFlashFailed": "Falha ao gravar firmware personalizado",
+		"rebootTakingLong": "A reconexão está demorando mais que o normal...",
+		"rebootTakingLongSub": "O dispositivo pode precisar de um momento para reiniciar.",
+		"manualReconnectTitle": "Dispositivo não reconecta?",
+		"manualReconnectStep1": "1. Desconecte seu KeepKey",
+		"manualReconnectStep2": "2. Aguarde 5 segundos",
+		"manualReconnectStep3": "3. Conecte novamente",
+		"manualReconnectNote": "A configuração continuará automaticamente quando o dispositivo for detectado."
 	},
 	"initChoose": {
 		"title": "Configure sua carteira",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ru/dashboard.json b/projects/keepkey-vault/src/mainview/i18n/locales/ru/dashboard.json
index c5c75f72..4e0912c2 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ru/dashboard.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ru/dashboard.json
@@ -7,5 +7,27 @@
 	"noBalance": "Нет баланса",
 	"tokensCount_one": "+{{count}} токен",
 	"tokensCount_other": "+{{count}} токенов",
-	"watchOnlyBanner": "Только просмотр — Подключите устройство для полного доступа"
+	"watchOnlyBanner": "Только просмотр — Подключите устройство для полного доступа",
+	"welcomeTitle": "Добро пожаловать в KeepKey Vault",
+	"welcomeSubtitle": "Ваш кошелёк готов. Вот как начать:",
+	"welcomeTip1": "Нажмите на любую сеть ниже, затем нажмите Получить, чтобы получить ваш адрес для пополнения",
+	"welcomeTip2": "Отправьте криптовалюту на ваш адрес — баланс отобразится здесь автоматически",
+	"welcomeTip3": "Добавляйте пользовательские EVM-сети с помощью карточки +, чтобы отслеживать любую сеть",
+	"balancesStale": "Балансы могут быть устаревшими",
+	"lastUpdated": "Последнее обновление {{time}}",
+	"lastUpdatedNever": "Никогда не загружалось",
+	"refreshPrompt": "Нажмите для обновления балансов",
+	"tokenWarningTitle": "Балансы токенов недоступны",
+	"tokenWarningDesc": "Данные о токенах не были получены. Отображаются ваши нативные балансы, но балансы ERC-20 / токенов могут отсутствовать.",
+	"refreshing": "Обновление...",
+	"reports": "Отчёты",
+	"pioneerOfflineTitle": "Сервер балансов офлайн",
+	"pioneerOfflineDesc": "Не удалось подключиться к {{url}}. Балансы могут быть недоступны.",
+	"changeServer": "Сменить сервер",
+	"getSupport": "Получить поддержку",
+	"retry": "Повторить",
+	"timeJustNow": "только что",
+	"timeMinutesAgo": "{{count}}м назад",
+	"timeHoursAgo": "{{count}}ч назад",
+	"timeDaysAgo": "{{count}}д назад"
 }
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ru/device.json b/projects/keepkey-vault/src/mainview/i18n/locales/ru/device.json
index e3205461..9743ada7 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ru/device.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ru/device.json
@@ -20,7 +20,9 @@
 		"description": "На вашем устройстве включена защита кодовой фразой. Введите кодовую фразу BIP-39 для разблокировки. Оставьте пустым для кошелька по умолчанию.",
 		"placeholder": "Кодовая фраза (необязательно)",
 		"warning": "Кодовые фразы чувствительны к регистру. Другая кодовая фраза создаёт совершенно другой кошелёк.",
-		"unlock": "Разблокировать"
+		"unlock": "Разблокировать",
+		"confirmOnDevice": "Подтвердите на KeepKey",
+		"confirmOnDeviceHint": "Проверьте экран устройства и нажмите кнопку для подтверждения."
 	},
 	"pairing": {
 		"wantsToConnect": "хочет подключиться к вашему KeepKey",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/ru/setup.json b/projects/keepkey-vault/src/mainview/i18n/locales/ru/setup.json
index 781dc7f2..f45586e4 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/ru/setup.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/ru/setup.json
@@ -17,14 +17,31 @@
 	},
 	"welcome": {
 		"title": "Добро пожаловать в KeepKey",
+		"oobTitle": "Обнаружено новое устройство",
+		"oobWelcome": "Добро пожаловать в KeepKey",
+		"oobWizardDesc": "Этот мастер поможет вам обновить загрузчик и прошивку, чтобы подготовить устройство к работе.",
 		"oobIntro": "Давайте обновим прошивку и настроим ваш кошелёк.",
 		"intro": "Давайте настроим ваш аппаратный кошелёк.",
+		"getStarted": "Начать",
 		"startingSetup": "Начало настройки...",
-		"detectingDevice": "Определение состояния устройства..."
+		"detectingDevice": "Определение состояния устройства...",
+		"readMore": "Как это работает?",
+		"readMoreTitle": "Как это работает?",
+		"readMoreBootloaderTitle": "Что такое загрузчик?",
+		"readMoreBootloaderBody": "Загрузчик — это небольшая программа, которая запускается первой при включении KeepKey. Считайте его охранником — он проверяет, что основное программное обеспечение на вашем устройстве подлинное и не было изменено, прежде чем разрешить его запуск.",
+		"readMoreFirmwareTitle": "Что такое прошивка?",
+		"readMoreFirmwareBody": "Прошивка — это основное программное обеспечение, которое KeepKey использует для управления вашей криптовалютой. Она отвечает за всё: от генерации адресов до подписания транзакций. Обновление даёт вам новейшие функции и исправления безопасности.",
+		"readMoreWhyTitle": "Зачем обновлять оба компонента?",
+		"readMoreWhyBody": "Обновление загрузчика блокирует устройство, чтобы оно принимало только официальное программное обеспечение KeepKey — даже если кто-то попытается установить что-то вредоносное, устройство отклонит это. Вместе загрузчик и прошивка обеспечивают безопасность ваших средств.",
+		"gotIt": "Понятно"
 	},
 	"bootloader": {
 		"title": "Обновление загрузчика",
 		"description": "Ваш загрузчик необходимо обновить для безопасности и совместимости.",
+		"putDeviceInBootloader": "Переведите устройство в режим загрузчика",
+		"followStepsBelow": "Выполните действия ниже, и мы автоматически обнаружим ваше устройство.",
+		"stepsTitle": "Как войти в режим загрузчика:",
+		"waitingForBootloader": "Ожидание устройства... подключите его, удерживая кнопку",
 		"current": "Текущий",
 		"latest": "Последний",
 		"outdated": "Устаревший",
@@ -33,13 +50,19 @@
 		"updateFailed": "Обновление не удалось",
 		"tryAgain": "Попробовать снова",
 		"enterFirmwareUpdateMode": "Войти в режим обновления прошивки",
-		"step1Unplug": "1. Отключите ваш KeepKey",
-		"step2Hold": "2. Зажмите кнопку на устройстве",
-		"step3Plugin": "3. Удерживая кнопку, подключите USB-кабель",
-		"step4Release": "4. Отпустите, когда появится экран загрузчика",
+		"step1Unplug": "Отключите ваш KeepKey",
+		"step2Hold": "Зажмите кнопку на устройстве",
+		"step3Plugin": "Удерживая кнопку, подключите USB-кабель",
+		"step4Release": "Отпустите, когда появится экран загрузчика",
 		"listeningForBootloader": "Ожидание устройства в режиме загрузчика...",
 		"readyDetectBootloader": "Готов — Обнаружить загрузчик",
-		"skipBootloaderUpdate": "Пропустить обновление загрузчика"
+		"skipBootloaderUpdate": "Пропустить обновление загрузчика",
+		"verifyBackupHint": "На KeepKey появится запрос на проверку резервной копии. Мы сделаем это после обновления — удерживайте кнопку, чтобы пропустить.",
+		"followDirectionsOnDevice": "Следуйте указаниям на устройстве",
+		"deviceWillGuide": "Ваш KeepKey проведёт вас через процесс обновления.",
+		"bootloaderDetected": "Обнаружен режим загрузчика",
+		"deviceReadyForUpdate": "Ваш KeepKey находится в режиме загрузчика и готов к обновлению.",
+		"updateBootloaderTo": "Обновить загрузчик до v{{version}}"
 	},
 	"firmware": {
 		"title": "Обновление прошивки",
@@ -58,7 +81,36 @@
 		"firmwareVerified": "Прошивка подтверждена как официальный релиз",
 		"firmwareHashNotFound": "Хеш прошивки не найден в манифесте",
 		"updateFirmwareTo": "Обновить прошивку до v{{version}}",
-		"skipUpdate": "Пропустить обновление"
+		"skipUpdate": "Пропустить обновление",
+		"confirmOnDevice": "Подтвердите действие на устройстве!",
+		"lookAtDeviceAndPress": "Посмотрите на экран KeepKey и нажмите кнопку для подтверждения.",
+		"verifyBackupNote": "Если ваше устройство не настроено, вы можете спокойно проигнорировать экран «проверка резервной копии».",
+		"uploadingFirmware": "Загрузка прошивки... Не отключайте устройство",
+		"estimatedTimeRemaining": "Примерное оставшееся время: {{seconds}} сек.",
+		"deviceWillRestart": "Устройство перезагрузится после завершения.",
+		"skipWarning": "Вы можете продолжить с более старой прошивкой. Некоторые функции могут работать некорректно.",
+		"bootloaderReadyForFirmware": "Ваш KeepKey находится в режиме загрузчика и готов к установке прошивки.",
+		"installLatestFirmware": "Установить официальную прошивку v{{version}}",
+		"orCustomFirmware": "Или установить пользовательскую прошивку",
+		"customFirmwareHint": "Выберите файл прошивки .bin с вашего компьютера или перетащите его сюда.",
+		"browseFiles": "Выбрать файл",
+		"analyzingFirmware": "Анализ прошивки...",
+		"customFirmwareReady": "Пользовательская прошивка готова к прошивке",
+		"flashFirmware": "Прошить",
+		"signed": "ПОДПИСАННАЯ",
+		"unsigned": "НЕПОДПИСАННАЯ",
+		"version": "Версия",
+		"size": "Размер",
+		"willWipeWarning": "Прошивка неподписанной прошивки на подписанное устройство УДАЛИТ ВСЕ ДАННЫЕ. Убедитесь, что ваша сид-фраза сохранена.",
+		"unsignedWarning": "Это неподписанная прошивка для разработчиков. Она может вызвать непредвиденное поведение.",
+		"customFlashFailed": "Не удалось прошить пользовательскую прошивку",
+		"rebootTakingLong": "Переподключение занимает больше времени, чем обычно...",
+		"rebootTakingLongSub": "Устройству может потребоваться время для перезагрузки.",
+		"manualReconnectTitle": "Устройство не переподключается?",
+		"manualReconnectStep1": "1. Отключите ваш KeepKey",
+		"manualReconnectStep2": "2. Подождите 5 секунд",
+		"manualReconnectStep3": "3. Подключите его обратно",
+		"manualReconnectNote": "Настройка продолжится автоматически, когда устройство будет обнаружено."
 	},
 	"initChoose": {
 		"title": "Настройте кошелёк",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/zh/dashboard.json b/projects/keepkey-vault/src/mainview/i18n/locales/zh/dashboard.json
index a3de565d..399930c2 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/zh/dashboard.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/zh/dashboard.json
@@ -7,5 +7,27 @@
 	"noBalance": "无余额",
 	"tokensCount_one": "+{{count}} 个代币",
 	"tokensCount_other": "+{{count}} 个代币",
-	"watchOnlyBanner": "仅查看 — 连接设备以获得完整访问权限"
+	"watchOnlyBanner": "仅查看 — 连接设备以获得完整访问权限",
+	"welcomeTitle": "欢迎使用 KeepKey Vault",
+	"welcomeSubtitle": "您的钱包已准备就绪。以下是入门指南：",
+	"welcomeTip1": "点击下方任意链，然后按「接收」获取您的存款地址",
+	"welcomeTip2": "将加密货币发送到您的地址 — 余额将自动显示在此处",
+	"welcomeTip3": "使用 + 卡片添加自定义 EVM 链以跟踪任何网络",
+	"balancesStale": "余额可能已过时",
+	"lastUpdated": "上次更新 {{time}}",
+	"lastUpdatedNever": "从未加载",
+	"refreshPrompt": "按下以更新余额",
+	"tokenWarningTitle": "代币余额不可用",
+	"tokenWarningDesc": "未返回代币数据。已显示您的原生余额，但 ERC-20 / 代币余额可能缺失。",
+	"refreshing": "刷新中...",
+	"reports": "报告",
+	"pioneerOfflineTitle": "余额服务器离线",
+	"pioneerOfflineDesc": "无法连接到 {{url}}。余额可能不可用。",
+	"changeServer": "更换服务器",
+	"getSupport": "获取支持",
+	"retry": "重试",
+	"timeJustNow": "刚刚",
+	"timeMinutesAgo": "{{count}}分钟前",
+	"timeHoursAgo": "{{count}}小时前",
+	"timeDaysAgo": "{{count}}天前"
 }
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/zh/device.json b/projects/keepkey-vault/src/mainview/i18n/locales/zh/device.json
index 4113bce8..593f6485 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/zh/device.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/zh/device.json
@@ -20,7 +20,9 @@
 		"description": "您的设备已启用密码短语保护。输入您的 BIP-39 密码短语以解锁。留空则使用默认钱包。",
 		"placeholder": "密码短语（可选）",
 		"warning": "密码短语区分大小写。不同的密码短语会生成完全不同的钱包。",
-		"unlock": "解锁"
+		"unlock": "解锁",
+		"confirmOnDevice": "在 KeepKey 上确认",
+		"confirmOnDeviceHint": "请检查设备屏幕并按下按钮确认。"
 	},
 	"pairing": {
 		"wantsToConnect": "想要连接到您的 KeepKey",
diff --git a/projects/keepkey-vault/src/mainview/i18n/locales/zh/setup.json b/projects/keepkey-vault/src/mainview/i18n/locales/zh/setup.json
index 9d8d14cf..c06577c2 100644
--- a/projects/keepkey-vault/src/mainview/i18n/locales/zh/setup.json
+++ b/projects/keepkey-vault/src/mainview/i18n/locales/zh/setup.json
@@ -17,14 +17,31 @@
 	},
 	"welcome": {
 		"title": "欢迎使用 KeepKey",
+		"oobTitle": "检测到新设备",
+		"oobWelcome": "欢迎使用 KeepKey",
+		"oobWizardDesc": "此向导将引导您完成引导程序和固件更新，以准备好您的设备。",
 		"oobIntro": "让我们更新固件并设置您的钱包。",
 		"intro": "让我们设置您的硬件钱包。",
+		"getStarted": "开始",
 		"startingSetup": "正在启动设置...",
-		"detectingDevice": "正在检测设备状态..."
+		"detectingDevice": "正在检测设备状态...",
+		"readMore": "这是如何工作的？",
+		"readMoreTitle": "这是如何工作的？",
+		"readMoreBootloaderTitle": "什么是引导加载程序？",
+		"readMoreBootloaderBody": "引导加载程序是 KeepKey 开机时首先运行的小程序。可以把它想象成一名安全卫士——它会在允许主软件运行之前，检查设备上的软件是否真实且未被篡改。",
+		"readMoreFirmwareTitle": "什么是固件？",
+		"readMoreFirmwareBody": "固件是 KeepKey 用来管理加密资产的主要软件。它负责从生成地址到签署交易的所有操作。更新固件可以获得最新的功能和安全补丁。",
+		"readMoreWhyTitle": "为什么两者都要更新？",
+		"readMoreWhyBody": "更新引导加载程序可以锁定您的设备，使其只接受官方 KeepKey 软件——即使有人试图安装恶意软件，您的设备也会拒绝。引导加载程序和固件共同保护您的资金安全。",
+		"gotIt": "明白了"
 	},
 	"bootloader": {
 		"title": "引导程序更新",
 		"description": "您的引导程序需要更新以确保安全性和兼容性。",
+		"putDeviceInBootloader": "将设备切换到引导加载程序模式",
+		"followStepsBelow": "请按照以下步骤操作，我们将自动检测您的设备。",
+		"stepsTitle": "如何进入引导加载程序模式：",
+		"waitingForBootloader": "等待您的设备...请按住按钮的同时插入设备",
 		"current": "当前",
 		"latest": "最新",
 		"outdated": "过期",
@@ -33,13 +50,19 @@
 		"updateFailed": "更新失败",
 		"tryAgain": "重试",
 		"enterFirmwareUpdateMode": "进入固件更新模式",
-		"step1Unplug": "1. 拔出您的 KeepKey",
-		"step2Hold": "2. 按住设备上的按钮",
-		"step3Plugin": "3. 按住按钮的同时插入 USB 线",
-		"step4Release": "4. 当引导程序屏幕出现时松开按钮",
+		"step1Unplug": "拔出您的 KeepKey",
+		"step2Hold": "按住设备上的按钮",
+		"step3Plugin": "按住按钮的同时插入 USB 线",
+		"step4Release": "当引导程序屏幕出现时松开按钮",
 		"listeningForBootloader": "正在监听引导程序模式下的设备...",
 		"readyDetectBootloader": "已准备好 — 检测引导程序",
-		"skipBootloaderUpdate": "跳过引导程序更新"
+		"skipBootloaderUpdate": "跳过引导程序更新",
+		"verifyBackupHint": "KeepKey 设备上会要求您验证备份。我们将在更新后进行此操作——请按住按钮暂时跳过。",
+		"followDirectionsOnDevice": "请按照设备上的指示操作",
+		"deviceWillGuide": "您的 KeepKey 将引导您完成更新过程。",
+		"bootloaderDetected": "已检测到引导加载程序模式",
+		"deviceReadyForUpdate": "您的 KeepKey 处于引导加载程序模式，已准备好进行更新。",
+		"updateBootloaderTo": "将引导程序更新至 v{{version}}"
 	},
 	"firmware": {
 		"title": "固件更新",
@@ -58,7 +81,36 @@
 		"firmwareVerified": "固件已验证为官方版本",
 		"firmwareHashNotFound": "在清单中未找到固件哈希",
 		"updateFirmwareTo": "将固件更新至 v{{version}}",
-		"skipUpdate": "跳过更新"
+		"skipUpdate": "跳过更新",
+		"confirmOnDevice": "请在设备上确认操作！",
+		"lookAtDeviceAndPress": "请查看 KeepKey 屏幕并按下按钮进行确认。",
+		"verifyBackupNote": "如果您的设备尚未设置，您可以安全地忽略任何'验证备份'屏幕。",
+		"uploadingFirmware": "正在上传固件...请勿断开设备连接",
+		"estimatedTimeRemaining": "预计剩余时间：{{seconds}}秒",
+		"deviceWillRestart": "完成后您的设备将自动重启。",
+		"skipWarning": "您可以继续使用旧版固件。某些功能可能无法正常工作。",
+		"bootloaderReadyForFirmware": "您的 KeepKey 处于引导加载程序模式，已准备好安装固件。",
+		"installLatestFirmware": "安装官方固件 v{{version}}",
+		"orCustomFirmware": "或安装自定义固件",
+		"customFirmwareHint": "从您的电脑中选择一个 .bin 固件文件，或将其拖放到此处。",
+		"browseFiles": "浏览文件",
+		"analyzingFirmware": "正在分析固件...",
+		"customFirmwareReady": "自定义固件已准备好刷写",
+		"flashFirmware": "刷写固件",
+		"signed": "已签名",
+		"unsigned": "未签名",
+		"version": "版本",
+		"size": "大小",
+		"willWipeWarning": "将未签名固件刷写到已签名设备上将会清除所有数据。请确保您已备份助记词。",
+		"unsignedWarning": "这是未签名的开发者固件。可能会导致意外行为。",
+		"customFlashFailed": "自定义固件刷写失败",
+		"rebootTakingLong": "重新连接时间超出预期...",
+		"rebootTakingLongSub": "设备可能需要一些时间来重启。",
+		"manualReconnectTitle": "设备无法重新连接？",
+		"manualReconnectStep1": "1. 拔出您的 KeepKey",
+		"manualReconnectStep2": "2. 等待 5 秒",
+		"manualReconnectStep3": "3. 重新插入",
+		"manualReconnectNote": "检测到设备后，设置将自动继续。"
 	},
 	"initChoose": {
 		"title": "设置您的钱包",
diff --git a/projects/keepkey-vault/src/shared/firmware-versions.ts b/projects/keepkey-vault/src/shared/firmware-versions.ts
new file mode 100644
index 00000000..f63e7499
--- /dev/null
+++ b/projects/keepkey-vault/src/shared/firmware-versions.ts
@@ -0,0 +1,159 @@
+/**
+ * Firmware Version Map — tracks features introduced in each firmware release.
+ *
+ * Used by the upgrade preview UI to show users what they gain from a firmware update.
+ * Only versions that introduce notable user-facing features need entries.
+ */
+
+export interface FirmwareFeature {
+  /** Short title: "Solana Support" */
+  title: string
+  /** One-line description */
+  description: string
+  /** Chain IDs from chains.ts that this feature enables (for logo display) */
+  chains?: string[]
+  /** Brand color override for the feature highlight */
+  color?: string
+  /** Icon key: 'chain' shows chain logos, 'security' shows a shield, 'performance' shows a bolt */
+  icon?: 'chain' | 'security' | 'performance' | 'feature'
+}
+
+export interface FirmwareVersionInfo {
+  version: string
+  /** Release date (display only) */
+  date?: string
+  /** Headline shown at top of upgrade preview */
+  headline: string
+  /** Features introduced in this version */
+  features: FirmwareFeature[]
+}
+
+/**
+ * Map of firmware versions to their notable features.
+ * Ordered newest-first. Only versions with user-visible features are listed.
+ */
+export const FIRMWARE_VERSION_MAP: FirmwareVersionInfo[] = [
+  {
+    version: '7.11.0',
+    date: '2025-03',
+    headline: 'Solana has arrived on KeepKey',
+    features: [
+      {
+        title: 'Solana Support',
+        description: 'Send, receive, and sign Solana transactions directly from your KeepKey.',
+        chains: ['solana'],
+        color: '#14F195',
+        icon: 'chain',
+      },
+    ],
+  },
+  // Future versions go here:
+  // {
+  //   version: '7.12.0',
+  //   headline: 'Zcash Privacy',
+  //   features: [
+  //     { title: 'Zcash Shielded', description: '...', chains: ['zcash'], color: '#F4B728', icon: 'chain' },
+  //   ],
+  // },
+]
+
+/**
+ * Get features introduced between two firmware versions (exclusive of `from`, inclusive of `to`).
+ * Returns features newest-first. If `from` is null, returns all features up to `to`.
+ */
+export function getUpgradeFeatures(from: string | null, to: string): FirmwareFeature[] {
+  const features: FirmwareFeature[] = []
+  for (const entry of FIRMWARE_VERSION_MAP) {
+    if (versionCompare(entry.version, to) > 0) continue       // skip versions newer than target
+    if (from && versionCompare(entry.version, from) <= 0) break // stop at current version
+    features.push(...entry.features)
+  }
+  return features
+}
+
+/**
+ * Get the version info for a specific firmware version.
+ */
+export function getVersionInfo(version: string): FirmwareVersionInfo | undefined {
+  return FIRMWARE_VERSION_MAP.find(v => v.version === version)
+}
+
+/**
+ * Get all version infos between two versions (features the user will gain).
+ */
+export function getUpgradeVersions(from: string | null, to: string): FirmwareVersionInfo[] {
+  const versions: FirmwareVersionInfo[] = []
+  for (const entry of FIRMWARE_VERSION_MAP) {
+    if (versionCompare(entry.version, to) > 0) continue
+    if (from && versionCompare(entry.version, from) <= 0) break
+    versions.push(entry)
+  }
+  return versions
+}
+
+/**
+ * On-device firmware hash → version map.
+ *
+ * The device reports SHA-256(meta_descriptor + app_code) which equals the
+ * full-file SHA-256 of the downloadable .bin. This is different from the
+ * manifest's hashes.firmware which are payload-only (skip 256-byte KPKY header).
+ *
+ * Used to resolve firmware version in bootloader mode where the device can't
+ * report version numbers. Unknown hashes indicate custom/unsigned firmware.
+ */
+export const ONDEVICE_FIRMWARE_HASHES: Record<string, string> = {
+  'd380357b7403064d7b1ea963dc56032239541a21ef0b7e08082fb36ed470de82': 'v6.0.0',
+  '699f75ae5936977bf4f9df0478afe40106ea21bc2d94746bbe244a7832d4c5ca': 'v6.0.1',
+  '14cf71b0872a5c3cda1af2007aafd9bd0d5401be927e08e5b226fe764334d515': 'v6.0.2',
+  '61c157a7fbc22f4d9825909ac067277a94e44c174e77db419fbb78b361fbf4ea': 'v6.0.4',
+  '4246ff0e1b71a2a6b3e89e2cfd0882dc207f96b2516640d6c5fff406c02097bf': 'v6.1.0',
+  'f9dfd903e6d4d8189409a72b9d31897ca1753a4000a24cc1c9217f4b8141403c': 'v6.1.1',
+  '0158073bb527b3b14148641722e77346ecec66a12fc4a5b4457dc0559c63169e': 'v6.2.0',
+  '5bcbeecea0a1c78cbd11344bb31c809072a01cb775f1e42368ef275888012208': 'v6.2.2',
+  '0e2463b777f39dc8b450aca78f55b3355e906c69d19b59e84052786c5fa8f78c': 'v6.3.0',
+  '0ef1b51a450fafd8e0586103bda38526c5d012fc260618b8df5437cba7682c5b': 'v6.4.0',
+  '89d1b5230bbca2e02901b091cbd77207d0636e6f1956f6f27a0ecb10c43cce3d': 'v6.5.1',
+  '85a44f1872b4b4ed0d5ff062711cfd4d4d69d9274312c9e3780b7db8da9072e8': 'v6.6.0',
+  '24071db7596f0824e51ce971c1ec39ac5a07e7a5bcaf5f1b33313de844e25580': 'v6.7.0',
+  '6a5e2bcf98aeafbb2faa98ea425ac066a7b4733e5b9edb29e544bad659cb3766': 'v7.0.3',
+  'd8b2b43eada45ded399f347289750a7083081186b37158b85eab41a38cbc6e50': 'v7.1.0',
+  'eb3d8853d549671dee532b51363cffdfa2038bc7730117e72dc17bb1452de4db': 'v7.1.1',
+  'aa5834bb591c40dffd5e083797fe25e6d5591199a781220025fa469a965d0279': 'v7.1.2',
+  '7a52fa75be2e3e9794c4a01e74fc2a68cd502aace13fca1f272d5296156f1499': 'v7.1.4',
+  '2b7edd319536076e0a00058d0cfd1b1863c8d616ba5851668796d04966df8594': 'v7.1.7',
+  '72838adfe3762760dbbbadd74c8914b783660ea0ef3b8fe340e4a663442c5549': 'v7.1.8',
+  'c6cf79e7c2cc1b9cf7eca57aacaab5310b4dd0eff1559cda307295d753251eff': 'v7.2.1',
+  'efcdcb32f199110e9a38010bc48d2acc66da89d41fb30c7d0b64c1ef74c90359': 'v7.3.2',
+  '43472b6fc1a3c9a2546ba771af830005f5758acbd9ea0679d4f20d480f63a040': 'v7.4.0',
+  '08b1153a6e9ba5f45776094d62c8d055632d414a38f0c70acd1e751229bf097c': 'v7.5.0',
+  'fdd10f5cf6469655c82c8259f075cdb3c704a93eb691072e3fa8ba5b4c4cafc4': 'v7.5.1',
+  'a94ba237468243929e0363a1bd2f48914580abfe2a90abbb533b0a201c434d54': 'v7.5.2',
+  'b4022a002278d1c00ccea54eb4d03934542ac509d03d77c0b7a8b8485b731f11': 'v7.6.0',
+  '1eb79470f73e40464d5e689e5008dddb47e7eb53bc87c50b1de4f3f150ed36bf': 'v7.7.0',
+  '31c1cdd945a7331e01b3cced866cb28add5b49eef87c2bbc08370e5aa7daf9bf': 'v7.8.0',
+  '387ec4c8d3dcc83df8707aa0129eeb44e824c3797fb629a493be845327669da1': 'v7.9.0',
+  'fc13cb3a405fdee342ebd0d945403b334f0c43ba19771fdabd0e81caf85a63f7': 'v7.9.1',
+  '24cca93ef5e7907dc6d8405b8ab9800d4e072dd9259138cf7679107985b88137': 'v7.9.3',
+  '518ad41643ee8a0aa6a6422f8534ac94f56cd65bc637aea4db7f3fdbb53255c3': 'v7.10.0',
+}
+
+/**
+ * Resolve firmware version from on-device hash. Returns version string or null for custom firmware.
+ */
+export function resolveOndeviceFirmwareVersion(hash: string | undefined): string | null {
+  if (!hash) return null
+  return ONDEVICE_FIRMWARE_HASHES[hash] ?? null
+}
+
+/** Compare semver strings: returns -1 (a<b), 0 (a==b), 1 (a>b) */
+function versionCompare(a: string, b: string): number {
+  const pa = a.split('.').map(Number)
+  const pb = b.split('.').map(Number)
+  for (let i = 0; i < 3; i++) {
+    const va = pa[i] || 0
+    const vb = pb[i] || 0
+    if (va < vb) return -1
+    if (va > vb) return 1
+  }
+  return 0
+}
diff --git a/projects/keepkey-vault/src/shared/rpc-schema.ts b/projects/keepkey-vault/src/shared/rpc-schema.ts
index 6b0ac42a..8477f718 100644
--- a/projects/keepkey-vault/src/shared/rpc-schema.ts
+++ b/projects/keepkey-vault/src/shared/rpc-schema.ts
@@ -1,5 +1,5 @@
 import type { ElectrobunRPCSchema } from 'electrobun/bun'
-import type { DeviceStateInfo, FirmwareProgress, FirmwareAnalysis, PinRequest, CharacterRequest, ChainBalance, BuildTxParams, BuildTxResult, BroadcastResult, BtcAccountSet, BtcScriptType, EvmAddressSet, CustomToken, CustomChain, AppSettings, BtcGetAddressParams, EthGetAddressParams, EthSignTxParams, BtcSignTxParams, GetPublicKeysParams, UpdateInfo, UpdateStatus, TokenVisibilityStatus, PairingRequestInfo, PairedAppInfo, SigningRequestInfo, ApiLogEntry, PioneerChainInfo } from './types'
+import type { DeviceStateInfo, FirmwareProgress, FirmwareAnalysis, PinRequest, CharacterRequest, ChainBalance, BuildTxParams, BuildTxResult, BroadcastResult, BtcAccountSet, BtcScriptType, EvmAddressSet, CustomToken, CustomChain, AppSettings, BtcGetAddressParams, EthGetAddressParams, EthSignTxParams, BtcSignTxParams, GetPublicKeysParams, UpdateInfo, UpdateStatus, TokenVisibilityStatus, PairingRequestInfo, PairedAppInfo, SigningRequestInfo, ApiLogEntry, PioneerChainInfo, ReportMeta, ReportData } from './types'
 
 /**
  * RPC Schema for Bun ↔ WebView communication.
@@ -119,6 +119,13 @@ export type VaultRPCSchema = ElectrobunRPCSchema & {
       setRestApiEnabled: { params: { enabled: boolean }; response: AppSettings }
       setPioneerApiBase: { params: { url: string }; response: AppSettings }
 
+      // ── Reports ──────────────────────────────────────────────────────
+      generateReport: { params: void; response: ReportMeta }
+      listReports: { params: void; response: ReportMeta[] }
+      getReport: { params: { id: string }; response: { meta: ReportMeta; data: ReportData } | null }
+      deleteReport: { params: { id: string }; response: void }
+      saveReportFile: { params: { id: string; format: 'pdf' | 'cointracker' | 'zenledger' }; response: { filePath: string } }
+
       // ── Balance cache (instant portfolio) ─────────────────────────────
       getCachedBalances: { params: void; response: { balances: ChainBalance[]; updatedAt: number } | null }
 
@@ -162,6 +169,7 @@ export type VaultRPCSchema = ElectrobunRPCSchema & {
       'signing-request': SigningRequestInfo
       'signing-dismissed': { id: string }
       'api-log': ApiLogEntry
+      'report-progress': { id: string; message: string; percent: number }
       'walletconnect-uri': string
     }
   }
diff --git a/projects/keepkey-vault/src/shared/spamFilter.ts b/projects/keepkey-vault/src/shared/spamFilter.ts
index ae85a4a1..545dc6da 100644
--- a/projects/keepkey-vault/src/shared/spamFilter.ts
+++ b/projects/keepkey-vault/src/shared/spamFilter.ts
@@ -1,11 +1,14 @@
 /**
- * Token Spam Filter — 3-tier detection adapted from keepkey-vault v10.
+ * Token Spam Filter — multi-tier heuristic detection.
  *
- * Detection tiers:
- *  1. User override (SQLite-persisted 'visible'/'hidden') — bypasses all detection
- *  2. Value >= $1 → NOT spam
- *  3. Known stablecoin symbol with value < $0.50 → CONFIRMED spam
- *  4. Value < $1 → POSSIBLE spam (likely worthless airdrop)
+ * Detection order (first match wins):
+ *  1. User override (SQLite-persisted 'visible'/'hidden') — absolute precedence
+ *  2. Name/symbol contains URL or phishing keywords → CONFIRMED spam
+ *  3. Symbol has suspicious characters or excessive length → CONFIRMED spam
+ *  4. Known stablecoin symbol with value < $0.50 → CONFIRMED spam
+ *  5. Dust airdrop: huge quantity (>1M) + near-zero unit price (<$0.0001) → CONFIRMED spam
+ *  6. Value < $1 → POSSIBLE spam
+ *  7. Otherwise → clean
  */
 
 import type { TokenBalance } from './types'
@@ -15,6 +18,27 @@ export const KNOWN_STABLECOINS = [
 	'FRAX', 'LUSD', 'SUSD', 'ALUSD', 'FEI', 'MIM', 'DOLA', 'AGEUR', 'EURT', 'EURS',
 ]
 
+/** Well-known legitimate token symbols — exempt from dust-airdrop heuristic */
+const KNOWN_LEGIT_SYMBOLS = new Set([
+	// Top tokens by market cap
+	'ETH', 'BTC', 'WETH', 'WBTC', 'BNB', 'MATIC', 'POL', 'AVAX', 'SOL', 'DOT',
+	'ADA', 'LINK', 'UNI', 'AAVE', 'MKR', 'CRV', 'COMP', 'SNX', 'SUSHI', 'YFI',
+	'LDO', 'RPL', 'ARB', 'OP', 'FTM', 'ATOM', 'OSMO', 'RUNE', 'CACAO', 'XRP',
+	'DOGE', 'LTC', 'BCH', 'DASH', 'ZEC', 'ETC',
+	// Wrapped / bridged
+	'WAVAX', 'WBNB', 'WMATIC', 'WPOL', 'WFTM',
+	// Major stablecoins (also in KNOWN_STABLECOINS but listed here for whitelist purposes)
+	...KNOWN_STABLECOINS,
+	// Major DeFi / governance
+	'GRT', 'ENS', 'APE', 'SHIB', 'PEPE', 'WLD', 'IMX', 'RNDR', 'FET', 'OCEAN',
+	'SAND', 'MANA', 'AXS', 'GALA', 'ILV', 'BLUR', 'PENDLE', 'ENA', 'ETHFI',
+	'STX', 'INJ', 'TIA', 'SEI', 'SUI', 'APT', 'NEAR', 'FIL', 'AR',
+	// LSTs / LRTs
+	'STETH', 'RETH', 'CBETH', 'WSTETH', 'SWETH', 'EETH', 'WEETH', 'METH', 'RSETH',
+	// FOX
+	'FOX',
+])
+
 export type SpamLevel = 'confirmed' | 'possible' | null
 
 export interface SpamResult {
@@ -23,8 +47,22 @@ export interface SpamResult {
 	reason: string
 }
 
+// ── Heuristic helpers ────────────────────────────────────────────────
+
+/** URL-like patterns in name or symbol — nearly always phishing */
+const URL_PATTERN = /(?:\.[a-z]{2,6}(?:\/|$))|https?:|www\./i
+
+/** Phishing action words that appear in scam token names */
+const PHISHING_KEYWORDS = /\b(claim|visit|reward|bonus|airdrop|free|voucher|gift|redeem|activate|eligible)\b/i
+
+/** Symbols should be short alphanumeric; these chars indicate scam */
+const SUSPICIOUS_SYMBOL_CHARS = /[./:$!@#%^&*()+=\[\]{}|\\<>,?~`'"]/
+
+/** Max reasonable symbol length — real tokens are 2-11 chars */
+const MAX_SYMBOL_LENGTH = 11
+
 /**
- * Detect whether a token is spam based on its USD value and symbol.
+ * Detect whether a token is spam.
  *
  * Call with optional `userOverride` from the token_visibility DB table.
  * When a user override is present it takes absolute precedence.
@@ -33,7 +71,7 @@ export function detectSpamToken(
 	token: TokenBalance,
 	userOverride?: 'visible' | 'hidden' | null,
 ): SpamResult {
-	// User override — absolute precedence
+	// ── Tier 0: User override — absolute precedence ──────────────────
 	if (userOverride === 'visible') {
 		return { isSpam: false, level: null, reason: 'User marked as safe' }
 	}
@@ -42,14 +80,37 @@ export function detectSpamToken(
 	}
 
 	const usd = token.balanceUsd ?? 0
+	const sym = (token.symbol || '').toUpperCase()
+	const name = token.name || ''
 
-	// Tier 1: significant value → NOT spam
-	if (usd >= 1) {
-		return { isSpam: false, level: null, reason: 'Has significant USD value' }
+	// ── Tier 1: Name/symbol contains URL → CONFIRMED spam ────────────
+	if (URL_PATTERN.test(name) || URL_PATTERN.test(token.symbol || '')) {
+		return {
+			isSpam: true,
+			level: 'confirmed',
+			reason: `Name/symbol contains URL — phishing token`,
+		}
 	}
 
-	// Tier 2: fake stablecoin
-	const sym = (token.symbol || '').toUpperCase()
+	// ── Tier 2: Name contains phishing keywords → CONFIRMED spam ─────
+	if (PHISHING_KEYWORDS.test(name)) {
+		return {
+			isSpam: true,
+			level: 'confirmed',
+			reason: `Name contains phishing keyword`,
+		}
+	}
+
+	// ── Tier 3: Suspicious symbol characters or length → CONFIRMED ───
+	if (SUSPICIOUS_SYMBOL_CHARS.test(token.symbol || '') || (token.symbol || '').length > MAX_SYMBOL_LENGTH) {
+		return {
+			isSpam: true,
+			level: 'confirmed',
+			reason: `Symbol has suspicious characters or is too long`,
+		}
+	}
+
+	// ── Tier 4: Fake stablecoin (symbol matches but value way off) ───
 	if (KNOWN_STABLECOINS.includes(sym) && usd < 0.50) {
 		return {
 			isSpam: true,
@@ -58,12 +119,42 @@ export function detectSpamToken(
 		}
 	}
 
-	// Tier 3: low value → possible spam
-	return {
-		isSpam: true,
-		level: 'possible',
-		reason: `Low value ($${usd.toFixed(4)}) — common airdrop spam pattern`,
+	// ── Tier 5: Dust airdrop heuristic ───────────────────────────────
+	// Huge quantity + near-zero unit price = classic airdrop spam
+	// Exempt known legitimate tokens
+	if (!KNOWN_LEGIT_SYMBOLS.has(sym)) {
+		const qty = parseFloat(token.balance || '0')
+		const price = token.priceUsd ?? 0
+
+		if (qty > 1_000_000 && price < 0.0001) {
+			return {
+				isSpam: true,
+				level: 'confirmed',
+				reason: `Dust airdrop — ${qty.toLocaleString()} units at $${price.toFixed(8)}/unit`,
+			}
+		}
+
+		// Moderate quantity + zero price but somehow has USD value (manipulated)
+		if (qty > 10_000 && price === 0 && usd > 0) {
+			return {
+				isSpam: true,
+				level: 'confirmed',
+				reason: `Suspicious — large quantity with $0 price but non-zero value`,
+			}
+		}
+	}
+
+	// ── Tier 6: Low value → POSSIBLE spam ────────────────────────────
+	if (usd < 1) {
+		return {
+			isSpam: true,
+			level: 'possible',
+			reason: `Low value ($${usd.toFixed(4)}) — common airdrop spam pattern`,
+		}
 	}
+
+	// ── Clean — passed all checks ────────────────────────────────────
+	return { isSpam: false, level: null, reason: 'Passed all spam checks' }
 }
 
 /**
diff --git a/projects/keepkey-vault/src/shared/types.ts b/projects/keepkey-vault/src/shared/types.ts
index b088bd69..cef30af1 100644
--- a/projects/keepkey-vault/src/shared/types.ts
+++ b/projects/keepkey-vault/src/shared/types.ts
@@ -31,6 +31,7 @@ export interface DeviceStateInfo {
   needsInit: boolean
   initialized: boolean
   isOob: boolean
+  resolvedFwVersion?: string  // firmware version resolved from on-device hash (bootloader mode only)
   firmwareHash?: string
   bootloaderHash?: string
   firmwareVerified?: boolean
@@ -336,6 +337,31 @@ export interface UpdateStatus {
   errorMessage?: string
 }
 
+// ── Report types ────────────────────────────────────────────────────
+
+export interface ReportMeta {
+  id: string
+  createdAt: number
+  chain: string
+  totalUsd: number
+  status: 'generating' | 'complete' | 'error'
+  error?: string
+}
+
+export interface ReportData {
+  title: string
+  subtitle: string
+  generatedDate: string
+  chain?: string
+  sections: ReportSection[]
+}
+
+export type ReportSection =
+  | { title: string; type: 'table'; data: { headers: string[]; rows: string[][]; widths?: string[] } }
+  | { title: string; type: 'summary'; data: string[] }
+  | { title: string; type: 'list'; data: string[] }
+  | { title: string; type: 'text'; data: string }
+
 // RPC types — derived from the single source of truth in rpc-schema.ts
 // Import VaultRPCSchema from './rpc-schema' if you need the full Electrobun schema.
 // These aliases are for convenience in frontend code that doesn't need Electrobun types.
diff --git a/scripts/build-windows-production.ps1 b/scripts/build-windows-production.ps1
index a07341d8..4b1dc652 100644
--- a/scripts/build-windows-production.ps1
+++ b/scripts/build-windows-production.ps1
@@ -80,7 +80,7 @@ if ($PSCommandPath) {
 }
 $RepoRoot = Split-Path -Path $ScriptDir -Parent
 $ProjectDir = Join-Path $RepoRoot "projects\keepkey-vault"
-$BuildDir = Join-Path $ProjectDir "build\dev-win-x64\keepkey-vault-dev"
+$BuildDir = Join-Path $ProjectDir "_build\dev-win-x64\keepkey-vault-dev"
 $ArtifactsDir = Join-Path $RepoRoot $OutputDir
 
 # Read version from package.json
@@ -249,7 +249,7 @@ if (-not $SkipBuild) {
     # Only init the submodules we actually need — recursive init pulls deeply
     # nested firmware deps whose paths exceed Windows MAX_PATH (260 chars)
     git submodule update --init modules/hdwallet
-    git submodule update --init modules/proto-tx-builder-vendored
+    git submodule update --init modules/proto-tx-builder
     git submodule update --init modules/keepkey-firmware
     Pop-Location