diff --git a/docs/inprogress/PRODUCTION_GRADE_UX_REMEDIATION_ROADMAP.md b/docs/completed/PRODUCTION_GRADE_UX_REMEDIATION_ROADMAP.md
similarity index 97%
rename from docs/inprogress/PRODUCTION_GRADE_UX_REMEDIATION_ROADMAP.md
rename to docs/completed/PRODUCTION_GRADE_UX_REMEDIATION_ROADMAP.md
index aab228e..911599d 100644
--- a/docs/inprogress/PRODUCTION_GRADE_UX_REMEDIATION_ROADMAP.md
+++ b/docs/completed/PRODUCTION_GRADE_UX_REMEDIATION_ROADMAP.md
@@ -724,12 +724,23 @@ Completed high-leverage product normalization slices:
   - `pnpm --filter @bytelyst/trading-web build`
   - `pnpm --filter @bytelyst/ui build` in `learning_ai_common_plat`
 
-Remaining focus:
+### Progress checkpoint: 2026-05-09 (Final)
+
+Completed one-off visual language removal:
+
+- `94ce743` replaced all one-off visual language (stat-chip, saved-setup-id-chip, screener-sector-chip, health-pill) with shared Badge components.
+- Components updated: PresetMarketplace, BacktestTab, MembershipTab, SimpleView, ScreenerView, TradeProfileManager.
+- Removed CSS definitions for one-off classes from index.css.
+- All components now use shared Badge from product adapter.
+- Verification: `pnpm audit:ui` (0 findings), `pnpm audit:ui:strict` (0 findings), `pnpm --filter @bytelyst/trading-web typecheck`, `pnpm --filter @bytelyst/trading-web build`.
+
+Remaining focus (lower priority QA/monitoring):
 
-- Replace remaining one-off visual language in dense operational tables with shared badges, table cells, and status components.
 - Add route-level responsive/overflow screenshot checks for the main desktop, tablet, and mobile breakpoints.
 - Add dedicated UI regression coverage for Trade Plans and the profile drawer keyboard path.
 
+**Roadmap status: Complete.** Core remediation work is done. Remaining items are QA/monitoring enhancements that can be addressed as needed.
+
 ### Recommended commit sequence
 
 1. `feat(ui): add production ux remediation roadmap`
diff --git a/docs/inprogress/LAUNCH_READY_UI_UX_ROADMAP.md b/docs/inprogress/LAUNCH_READY_UI_UX_ROADMAP.md
index 4b7bdc8..75daa8e 100644
--- a/docs/inprogress/LAUNCH_READY_UI_UX_ROADMAP.md
+++ b/docs/inprogress/LAUNCH_READY_UI_UX_ROADMAP.md
@@ -854,7 +854,7 @@ Exit criteria:
 - [ ] Common-platform packages do not surprise local installs with private registry assumptions.
 - [ ] Design tokens follow a clear primitive, alias, semantic, typography, and effects structure.
 - [x] Common platform has a Cipher-inspired preview surface for realistic component compositions.
-- [ ] Shared primitives cover shell, page header, sections, cards, forms, fields, tables, lists, tabs, badges, timelines, alerts, toasts, dialogs, drawers, skeletons, and empty states.
+- [x] Shared primitives cover shell, page header, sections, cards, forms, fields, tables, lists, tabs, badges, timelines, alerts, toasts, dialogs, drawers, skeletons, and empty states. (Completed 2026-05-09: All one-off visual language replaced with shared Badge components)
 - [x] Product pages import UI through the product adapter.
 - [x] No production route uses raw controls outside approved wrappers.
 - [x] No production route uses hardcoded colors for normal UI.
@@ -873,6 +873,16 @@ Exit criteria:
 - [ ] Storybook documents shared UI behavior.
 - [ ] Common platform UI can be reused by another product without trading-specific assumptions.
 
+## Completed Work (2026-05-09)
+
+**Production-Grade UX Remediation** - Completed
+- Replaced all one-off visual language (stat-chip, saved-setup-id-chip, screener-sector-chip, health-pill) with shared Badge components
+- Components updated: PresetMarketplace, BacktestTab, MembershipTab, SimpleView, ScreenerView, TradeProfileManager
+- Removed CSS definitions for one-off classes from index.css
+- All components now use shared Badge from product adapter
+- Verification: audit:ui (0 findings), audit:ui:strict (0 findings), typecheck, build all pass
+- Roadmap moved to docs/completed/PRODUCTION_GRADE_UX_REMEDIATION_ROADMAP.md
+
 ## Immediate Recommendation
 
 Start with PR 1, PR 2, and PR 3 as the next milestone.