diff --git a/docs/handpaint-batch7-yan-yan-source-v1.png b/docs/handpaint-batch7-yan-yan-source-v1.png
new file mode 100644
index 0000000..a413808
Binary files /dev/null and b/docs/handpaint-batch7-yan-yan-source-v1.png differ
diff --git a/docs/handpaint-batch7-yan-yan-v2-animation.gif b/docs/handpaint-batch7-yan-yan-v2-animation.gif
new file mode 100644
index 0000000..0167134
Binary files /dev/null and b/docs/handpaint-batch7-yan-yan-v2-animation.gif differ
diff --git a/docs/handpaint-batch7-yan-yan-v2-battle-composite.png b/docs/handpaint-batch7-yan-yan-v2-battle-composite.png
new file mode 100644
index 0000000..0b1fc95
Binary files /dev/null and b/docs/handpaint-batch7-yan-yan-v2-battle-composite.png differ
diff --git a/docs/handpaint-batch7-yan-yan-v2-before-after.png b/docs/handpaint-batch7-yan-yan-v2-before-after.png
new file mode 100644
index 0000000..4e34893
Binary files /dev/null and b/docs/handpaint-batch7-yan-yan-v2-before-after.png differ
diff --git a/docs/handpaint-batch7-yan-yan-v2-contact.png b/docs/handpaint-batch7-yan-yan-v2-contact.png
new file mode 100644
index 0000000..feeeb50
Binary files /dev/null and b/docs/handpaint-batch7-yan-yan-v2-contact.png differ
diff --git a/docs/handpaint-batch7-yan-yan-v2-debug-preview-battle-check.png b/docs/handpaint-batch7-yan-yan-v2-debug-preview-battle-check.png
new file mode 100644
index 0000000..ff730c3
Binary files /dev/null and b/docs/handpaint-batch7-yan-yan-v2-debug-preview-battle-check.png differ
diff --git a/docs/handpaint-batch7-yan-yan-v2-report.md b/docs/handpaint-batch7-yan-yan-v2-report.md
new file mode 100644
index 0000000..f6cd417
--- /dev/null
+++ b/docs/handpaint-batch7-yan-yan-v2-report.md
@@ -0,0 +1,24 @@
+# Yan Yan hand-painted v2 report
+
+- source: `handpaint-batch7-yan-yan-source-v1.png`
+- base status: ok
+- action status: ok
+- base partial alpha: 0, opaque pixels: 2071986
+- action partial alpha: 0, opaque pixels: 4594574
+- base frame border hits: 0
+- action frame border hits: 0
+- base empty frames: 0
+- action empty frames: 0
+- base bbox width range: 190..235
+- base bbox height range: 286..288
+- base bottom range: 303..303
+- action bbox width range: 170..242
+- action bbox height range: 271..295
+- action bottom range: 303..303
+- contact: `handpaint-batch7-yan-yan-v2-contact.png`
+- animation: `handpaint-batch7-yan-yan-v2-animation.gif`
+- before/after: `handpaint-batch7-yan-yan-v2-before-after.png`
+- scale compare: `handpaint-batch7-yan-yan-v2-scale-compare.png`
+- battle composite: `handpaint-batch7-yan-yan-v2-battle-composite.png`
+- manual checks: run build and local browser verification after generation
+- note: battle composite is a scale review image; gameplay roster is unchanged during sample approval
diff --git a/docs/handpaint-batch7-yan-yan-v2-scale-compare.png b/docs/handpaint-batch7-yan-yan-v2-scale-compare.png
new file mode 100644
index 0000000..d0348c6
Binary files /dev/null and b/docs/handpaint-batch7-yan-yan-v2-scale-compare.png differ
diff --git a/docs/unit-sprite-art-quality-gate.md b/docs/unit-sprite-art-quality-gate.md
index 17f7443..5b5fa13 100644
--- a/docs/unit-sprite-art-quality-gate.md
+++ b/docs/unit-sprite-art-quality-gate.md
@@ -6,9 +6,9 @@ This gate catches obvious sprite-art failures before user approval. It does not
 
 - Manifest: `docs/unit-sprite-rework-manifest.json`
 - Audit: `docs/unit-sprite-rework-audit.json`
-- Approved baseline units: 87
+- Approved baseline units: 88
 - Pending approval units: 0
-- Queued rework units: 4
+- Queued rework units: 3
 
 ## Checked Rules
 
diff --git a/docs/unit-sprite-batch-queue.json b/docs/unit-sprite-batch-queue.json
index f771240..31668c2 100644
--- a/docs/unit-sprite-batch-queue.json
+++ b/docs/unit-sprite-batch-queue.json
@@ -89,13 +89,14 @@
     "unit-wu-strategist-fire",
     "unit-wu-strategist-river",
     "unit-wu-yi",
+    "unit-yan-yan",
     "unit-zhang-fei"
   ],
   "pendingApproval": [],
   "nextAfterApproval": [],
   "stageCounts": {
-    "approved-baseline": 87,
-    "queued-rework": 4
+    "approved-baseline": 88,
+    "queued-rework": 3
   },
   "batches": [
     {
@@ -1181,24 +1182,10 @@
       "label": "Batch 7 unique officers",
       "total": 19,
       "stageCounts": {
-        "approved-baseline": 15,
-        "queued-rework": 4
+        "approved-baseline": 16,
+        "queued-rework": 3
       },
       "units": [
-        {
-          "stem": "unit-yan-yan",
-          "reviewStage": "queued-rework",
-          "queueRole": "queued rework",
-          "baseStatus": "border-hits=32",
-          "actionStatus": "border-hits=82",
-          "battleBasePx": [
-            31.0,
-            40.6,
-            44.6,
-            44.6
-          ],
-          "spec": null
-        },
         {
           "stem": "unit-yi-ji",
           "reviewStage": "queued-rework",
@@ -1450,6 +1437,20 @@
             46.0
           ],
           "spec": null
+        },
+        {
+          "stem": "unit-yan-yan",
+          "reviewStage": "approved-baseline",
+          "queueRole": "approved reference",
+          "baseStatus": "ok",
+          "actionStatus": "ok",
+          "battleBasePx": [
+            30.4,
+            37.5,
+            45.7,
+            46.0
+          ],
+          "spec": null
         }
       ]
     }
diff --git a/docs/unit-sprite-batch-queue.md b/docs/unit-sprite-batch-queue.md
index 34471f3..4a38e96 100644
--- a/docs/unit-sprite-batch-queue.md
+++ b/docs/unit-sprite-batch-queue.md
@@ -6,9 +6,9 @@ Use this as the long-running queue for the full hand-painted sprite rework. It i
 
 ## Current State
 
-- Approved baseline units: 87
+- Approved baseline units: 88
 - Pending approval units: 0
-- Queued rework units: 4
+- Queued rework units: 3
 - Manifest: `docs/unit-sprite-rework-manifest.json`
 - Audit: `docs/unit-sprite-rework-audit.json`
 
@@ -157,11 +157,10 @@ No next unit is currently defined.
 
 - Batch key: `batch7-unique-officer`
 - Total units: 19
-- Stage counts: approved-baseline 15, queued-rework 4
+- Stage counts: approved-baseline 16, queued-rework 3
 
 | unit | role | stage | status | battle base px | spec |
 | --- | --- | --- | --- | --- | --- |
-| `unit-yan-yan` | queued rework | queued-rework | base border-hits=32; actions border-hits=82 | 31.0..40.6 x 44.6..44.6 |  |
 | `unit-yi-ji` | queued rework | queued-rework | base border-hits=32; actions border-hits=98 | 38.8..39.3 x 44.7..44.9 |  |
 | `unit-zhao-yun` | queued rework | queued-rework | base border-hits=64; actions border-hits=144 | 26.5..47.3 x 45.0..46.0 |  |
 | `unit-zhuge-liang` | queued rework | queued-rework | base border-hits=32; actions border-hits=98 | 38.8..39.3 x 44.7..44.9 |  |
@@ -180,3 +179,4 @@ No next unit is currently defined.
 | `unit-pang-tong` | approved reference | approved-baseline | technical ok | 28.0..32.1 x 46.0..46.0 |  |
 | `unit-sima-yi` | approved reference | approved-baseline | technical ok | 31.3..33.5 x 46.0..46.0 |  |
 | `unit-wang-ping` | approved reference | approved-baseline | technical ok | 28.0..33.7 x 45.7..46.0 |  |
+| `unit-yan-yan` | approved reference | approved-baseline | technical ok | 30.4..37.5 x 45.7..46.0 |  |
diff --git a/docs/unit-sprite-current-approval-board.png b/docs/unit-sprite-current-approval-board.png
index 2332b1b..502b125 100644
Binary files a/docs/unit-sprite-current-approval-board.png and b/docs/unit-sprite-current-approval-board.png differ
diff --git a/docs/unit-sprite-next-steps.md b/docs/unit-sprite-next-steps.md
index 5897f17..670cf7c 100644
--- a/docs/unit-sprite-next-steps.md
+++ b/docs/unit-sprite-next-steps.md
@@ -4,9 +4,9 @@ This file is generated by `scripts/write-unit-sprite-next-steps.py`.
 
 ## Current Gate
 
-- Approved baseline units: 87
+- Approved baseline units: 88
 - Pending approval units: 0
-- Queued rework units: 4
+- Queued rework units: 3
 - Manifest: `docs/unit-sprite-rework-manifest.json`
 - Audit: `docs/unit-sprite-rework-audit.json`
 - Current approval board: not generated until the next pending sample.
diff --git a/docs/unit-sprite-review-approved-and-pending.png b/docs/unit-sprite-review-approved-and-pending.png
index 2e2bdfe..58594c3 100644
Binary files a/docs/unit-sprite-review-approved-and-pending.png and b/docs/unit-sprite-review-approved-and-pending.png differ
diff --git a/docs/unit-sprite-review-batch7-unique-officer.png b/docs/unit-sprite-review-batch7-unique-officer.png
index f50c5b4..95aee61 100644
Binary files a/docs/unit-sprite-review-batch7-unique-officer.png and b/docs/unit-sprite-review-batch7-unique-officer.png differ
diff --git a/docs/unit-sprite-review-index.png b/docs/unit-sprite-review-index.png
index 330086b..a900fab 100644
Binary files a/docs/unit-sprite-review-index.png and b/docs/unit-sprite-review-index.png differ
diff --git a/docs/unit-sprite-rework-audit.json b/docs/unit-sprite-rework-audit.json
index f8a016f..872c769 100644
--- a/docs/unit-sprite-rework-audit.json
+++ b/docs/unit-sprite-rework-audit.json
@@ -11,8 +11,8 @@
     "batch7-unique-officer": 19
   },
   "stage_counts": {
-    "approved-baseline": 87,
-    "queued-rework": 4
+    "approved-baseline": 88,
+    "queued-rework": 3
   },
   "rows": [
     {
@@ -4919,7 +4919,7 @@
     },
     {
       "batch": "batch7-unique-officer",
-      "review_stage": "queued-rework",
+      "review_stage": "approved-baseline",
       "stem": "unit-yan-yan",
       "base": {
         "key": "unit-yan-yan",
@@ -4929,23 +4929,23 @@
           1252
         ],
         "partial_alpha": 0,
-        "opaque_pixels": 2000768,
-        "border_hits": 32,
-        "min_width": 194,
-        "max_width": 254,
-        "min_height": 279,
-        "max_height": 279,
-        "min_bottom": 281,
-        "max_bottom": 287,
+        "opaque_pixels": 2071986,
+        "border_hits": 0,
+        "min_width": 190,
+        "max_width": 235,
+        "min_height": 286,
+        "max_height": 288,
+        "min_bottom": 303,
+        "max_bottom": 303,
         "empty_frames": 0,
-        "width_swing": 60,
-        "height_swing": 0,
-        "bottom_swing": 6,
-        "battle_min_width_px": 31.0,
-        "battle_max_width_px": 40.6,
-        "battle_min_height_px": 44.6,
-        "battle_max_height_px": 44.6,
-        "status": "border-hits=32"
+        "width_swing": 45,
+        "height_swing": 2,
+        "bottom_swing": 0,
+        "battle_min_width_px": 30.4,
+        "battle_max_width_px": 37.5,
+        "battle_min_height_px": 45.7,
+        "battle_max_height_px": 46.0,
+        "status": "ok"
       },
       "actions": {
         "key": "unit-yan-yan-actions",
@@ -4955,23 +4955,23 @@
           1252
         ],
         "partial_alpha": 0,
-        "opaque_pixels": 4471927,
-        "border_hits": 82,
-        "min_width": 194,
-        "max_width": 263,
-        "min_height": 275,
-        "max_height": 279,
-        "min_bottom": 274,
-        "max_bottom": 289,
+        "opaque_pixels": 4594574,
+        "border_hits": 0,
+        "min_width": 170,
+        "max_width": 242,
+        "min_height": 271,
+        "max_height": 295,
+        "min_bottom": 303,
+        "max_bottom": 303,
         "empty_frames": 0,
-        "width_swing": 69,
-        "height_swing": 4,
-        "bottom_swing": 15,
-        "battle_min_width_px": 31.0,
-        "battle_max_width_px": 42.0,
-        "battle_min_height_px": 43.9,
-        "battle_max_height_px": 44.6,
-        "status": "border-hits=82"
+        "width_swing": 72,
+        "height_swing": 24,
+        "bottom_swing": 0,
+        "battle_min_width_px": 27.2,
+        "battle_max_width_px": 38.7,
+        "battle_min_height_px": 43.3,
+        "battle_max_height_px": 47.1,
+        "status": "ok"
       }
     },
     {
diff --git a/docs/unit-sprite-rework-audit.md b/docs/unit-sprite-rework-audit.md
index 5bd65b6..15bfd6c 100644
--- a/docs/unit-sprite-rework-audit.md
+++ b/docs/unit-sprite-rework-audit.md
@@ -29,8 +29,8 @@ Visual review boards are generated by `scripts/render-unit-sprite-review-boards.
 
 ## Review Stage Counts
 
-- approved-baseline: 87
-- queued-rework: 4
+- approved-baseline: 88
+- queued-rework: 3
 
 ## Batch Plan
 
@@ -138,7 +138,7 @@ Visual review boards are generated by `scripts/render-unit-sprite-review-boards.
 | batch4-wu | approved-baseline | `unit-wu-strategist-fire` | ok | ok | 170..207 x 286..290 | 163..248 x 286..295 | 27.2..33.1 x 45.7..46.3 | w37 h4 b0 |
 | batch4-wu | approved-baseline | `unit-wu-strategist-river` | ok | ok | 164..249 x 286..294 | 159..244 x 286..295 | 26.2..39.8 x 45.7..47.0 | w85 h8 b0 |
 | batch4-wu | approved-baseline | `unit-wu-yi` | ok | ok | 153..209 x 288..290 | 147..238 x 282..288 | 24.4..33.4 x 46.0..46.3 | w56 h2 b0 |
-| batch7-unique-officer | queued-rework | `unit-yan-yan` | border-hits=32 | border-hits=82 | 194..254 x 279..279 | 194..263 x 275..279 | 31.0..40.6 x 44.6..44.6 | w60 h0 b6 |
+| batch7-unique-officer | approved-baseline | `unit-yan-yan` | ok | ok | 190..235 x 286..288 | 170..242 x 271..295 | 30.4..37.5 x 45.7..46.0 | w45 h2 b0 |
 | batch7-unique-officer | queued-rework | `unit-yi-ji` | border-hits=32 | border-hits=98 | 243..246 x 280..281 | 220..255 x 275..281 | 38.8..39.3 x 44.7..44.9 | w3 h1 b6 |
 | batch1-approved-core | approved-baseline | `unit-zhang-fei` | ok | ok | 143..306 x 274..289 | 188..286 x 181..290 | 22.8..48.9 x 43.8..46.2 | w163 h15 b14 |
 | batch7-unique-officer | queued-rework | `unit-zhao-yun` | border-hits=64 | border-hits=144 | 166..296 x 282..288 | 166..305 x 274..290 | 26.5..47.3 x 45.0..46.0 | w130 h6 b6 |
diff --git a/docs/unit-sprite-rework-manifest.json b/docs/unit-sprite-rework-manifest.json
index d47272f..a9a731f 100644
--- a/docs/unit-sprite-rework-manifest.json
+++ b/docs/unit-sprite-rework-manifest.json
@@ -97,6 +97,7 @@
     "unit-wu-strategist-fire",
     "unit-wu-strategist-river",
     "unit-wu-yi",
+    "unit-yan-yan",
     "unit-zhang-fei"
   ],
   "pendingApproval": [],
diff --git a/docs/unit-sprite-yan-yan-v2-approval-packet.md b/docs/unit-sprite-yan-yan-v2-approval-packet.md
new file mode 100644
index 0000000..33761ec
--- /dev/null
+++ b/docs/unit-sprite-yan-yan-v2-approval-packet.md
@@ -0,0 +1,35 @@
+# Yan Yan hand-painted v2 approval packet
+
+- unit: `unit-yan-yan`
+- candidate: `handpaint-batch7-yan-yan-v2`
+- source: `docs/handpaint-batch7-yan-yan-source-v1.png`
+- contact sheet: `docs/handpaint-batch7-yan-yan-v2-contact.png`
+- animation: `docs/handpaint-batch7-yan-yan-v2-animation.gif`
+- before/after: `docs/handpaint-batch7-yan-yan-v2-before-after.png`
+- battle composite: `docs/handpaint-batch7-yan-yan-v2-battle-composite.png`
+- current approval board: `docs/unit-sprite-current-approval-board.png`
+- browser check: `docs/handpaint-batch7-yan-yan-v2-debug-preview-battle-check.png`
+
+## Result
+
+- Local build: `pnpm build` passed.
+- Local browser URL: `http://127.0.0.1:4173/heros_web/?debug&debugSpritePreview=unit-yan-yan&v=yan-yan-v2`
+- Local browser console errors: `0`
+- Local browser 404s: `0`
+- Sample gate: passed.
+
+## Sprite safety
+
+- base partial alpha: 0
+- action partial alpha: 0
+- base frame border hits: 0
+- action frame border hits: 0
+- base battle size: 30.4..37.5 x 45.7..46.0
+- frame bbox width: 190..235 base, 170..242 action
+- frame bbox height: 286..288 base, 271..295 action
+
+## Visual notes
+
+- v1 had good idle readability but over-shrunk the action frames below the archer width threshold.
+- v2 restores bow-shot width while preserving frame safety and the burgundy elder fortress defender silhouette.
+- Yan Yan remains distinct from Huang Zhong through deeper red armor, gray beard, cloak mass, and a more defensive castle-guard stance.
diff --git a/src/assets/images/units/unit-yan-yan-actions.png b/src/assets/images/units/unit-yan-yan-actions.png
index b4ab915..12db199 100644
Binary files a/src/assets/images/units/unit-yan-yan-actions.png and b/src/assets/images/units/unit-yan-yan-actions.png differ
diff --git a/src/assets/images/units/unit-yan-yan.png b/src/assets/images/units/unit-yan-yan.png
index 049185d..1dd75e0 100644
Binary files a/src/assets/images/units/unit-yan-yan.png and b/src/assets/images/units/unit-yan-yan.png differ