From bd8a8af3032b776cee93e898f7fb766f4fd52a69 Mon Sep 17 00:00:00 2001
From: Chris Huber <chris.huber@a8c.com>
Date: Sat, 4 Jul 2026 09:21:30 -0400
Subject: [PATCH 1/2] fix(php-transformer): convert inline svg to native icons

---
 .../src/HtmlToBlocks/HtmlTransformer.php      | 50 +++++++++++++------
 php-transformer/tests/contract/run.php        | 32 ++++++------
 .../html-background-icon-media-patterns.json  |  8 +--
 .../parity/html-flex-media-text-columns.json  |  8 +--
 .../html-inline-svg-artwork-preserved.json    | 26 +++++-----
 ...html-inline-svg-benefit-icon-faithful.json | 10 ++--
 .../parity/html-inline-svg-decorative.json    |  8 +--
 .../html-inline-svg-diagram-preserved.json    | 28 +++++------
 .../parity/html-inline-svg-fallback.json      |  8 +--
 .../html-inline-svg-local-use-symbol.json     | 12 ++---
 .../html-inline-svg-native-icon-sizing.json   | 42 ++++++++++++++++
 .../parity/html-inline-svg-unsafe.json        | 18 +++----
 .../html-product-card-svg-price-grid.json     | 10 ++--
 .../html-single-child-flex-svg-address.json   |  8 +--
 .../parity/html-single-child-flex-svg.json    |  8 +--
 15 files changed, 169 insertions(+), 107 deletions(-)
 create mode 100644 php-transformer/tests/fixtures/parity/html-inline-svg-native-icon-sizing.json

diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php
index 8a694a59..5e8cd72a 100644
--- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php
+++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php
@@ -1552,14 +1552,10 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca
                 }
             }
 
-            // Imported inline SVGs are preserved faithfully as raw markup
-            // (core/html via inlineSvgBlockFromElement). They are never routed
-            // through core/icon: that block is a dynamic block keyed on a
-            // registry slug (its `icon` attribute) and discards arbitrary inline
-            // SVG markup, so render_block_core_icon() returns empty output for
-            // imported SVGs. Faithful passthrough keeps the original element,
-            // its sizing class(es), and correct-case viewBox so the
-            // materialized source CSS can size it.
+            // Imported inline SVGs are represented as core/icon with the
+            // sanitized source <svg> stored verbatim in its svg attribute. This
+            // keeps the actual SVG element, sizing classes/attributes, and
+            // correct-case viewBox while avoiding core/html fallback blocks.
             if ( $this->isSafeDecorativeSvgElement($element) ) {
                 // Faithfully preserve any inline SVG that carries real drawable
                 // artwork — icons, diagrams, illustrations — even when it is
@@ -4247,14 +4243,38 @@ private function inlineSvgBlockFromElement(DOMElement $element): ?array
             return null;
         }
 
-        // Keep illustrative/decorative inline SVG inline as a core/html block.
         // Externalizing to an `assets/*.svg` file + core/image would be lost in
-        // WordPress, which blocks SVG uploads by default. The markup is already
-        // safe-sanitized above (scripts, event handlers, foreignObject, and
-        // javascript: URLs stripped via sanitizeInlineSvgMarkup + verified by
-        // isSafeSvgContent), and the original outer SVG preserves
-        // viewBox/role/aria-label/class.
-        return $this->createBlock('core/html', array( 'content' => $this->restoreSvgCasing($html) ), array(), $element);
+        // WordPress, which blocks SVG uploads by default. core/icon is the
+        // native block in this runtime that can carry inline SVG markup, and the
+        // original outer SVG preserves viewBox/width/height/preserveAspectRatio,
+        // role/aria-label, and CSS sizing classes on the actual rendered <svg>.
+        return $this->createBlock('core/icon', $this->inlineSvgIconAttributes($element, $html), array(), $element);
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    private function inlineSvgIconAttributes(DOMElement $element, string $html): array
+    {
+        $attrs = $this->presentationAttributes($element);
+        $attrs['svg'] = $this->restoreSvgCasing($html);
+
+        $label = trim($this->attr($element, 'aria-label'));
+        if ( '' === $label ) {
+            $title = $element->getElementsByTagName('title')->item(0);
+            if ( $title instanceof DOMElement ) {
+                $label = trim($title->textContent ?? '');
+            }
+        }
+        if ( '' !== $label ) {
+            $attrs['label'] = $label;
+        }
+
+        if ( 'true' === strtolower(trim($this->attr($element, 'aria-hidden'))) || in_array(strtolower(trim($this->attr($element, 'role'))), array( 'presentation', 'none' ), true) ) {
+            $attrs['ariaHidden'] = true;
+        }
+
+        return $attrs;
     }
 
     /**
diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php
index 3306df7e..b62b9485 100644
--- a/php-transformer/tests/contract/run.php
+++ b/php-transformer/tests/contract/run.php
@@ -498,8 +498,8 @@ public function match(DOMElement $element, PatternContext $context): ?array
     '<main><svg class="album-art" viewBox="0 0 100 100" role="img" aria-label="Album art"><rect width="100" height="100" fill="#111"/><circle cx="50" cy="50" r="30" fill="#c4581a"/></svg></main>'
 )->toArray();
 $inlineSvgMarkup = (string) ($inlineSvgArtwork['serialized_blocks'] ?? '');
-$assert('core/html' === ($inlineSvgArtwork['blocks'][0]['blockName'] ?? ''), 'meaningful inline SVG artwork materializes as sanitized inline HTML');
-$assert(str_contains($inlineSvgMarkup, '<!-- wp:html'), 'meaningful inline SVG artwork serializes as core/html');
+$assert('core/icon' === ($inlineSvgArtwork['blocks'][0]['blockName'] ?? ''), 'meaningful inline SVG artwork materializes as a native core/icon block');
+$assert(str_contains($inlineSvgMarkup, '<!-- wp:icon'), 'meaningful inline SVG artwork serializes as core/icon');
 $assert(str_contains($inlineSvgMarkup, '<svg class="album-art"'), 'meaningful inline SVG artwork preserves the SVG element and class');
 $assert(str_contains($inlineSvgMarkup, 'aria-label="Album art"'), 'meaningful inline SVG artwork preserves accessible label');
 $assert(! str_contains($inlineSvgMarkup, 'data:image/svg+xml'), 'meaningful inline SVG artwork avoids unreliable data image URLs');
@@ -805,16 +805,16 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $assert('success' === ($safeInlineSvg['status'] ?? ''), 'safe inline SVG does not trip strict fallback gates', (string) ($safeInlineSvg['status'] ?? ''));
 $assert(array() === ($safeInlineSvg['fallbacks'] ?? array()), 'safe decorative inline SVG is consumed instead of recorded as fallback metadata');
 $assert('core/group' === ($safeInlineSvg['blocks'][0]['blockName'] ?? ''), 'decorative inline SVG preserves its CSS-addressable wrapper when present');
-$assert('core/html' === ($safeInlineSvg['blocks'][0]['innerBlocks'][0]['innerBlocks'][0]['blockName'] ?? ''), 'icon-context decorative SVG is preserved faithfully as a core/html block, not a dynamic core/icon (which discards inline SVG markup and renders empty)');
-$assert(str_contains($safeInlineSvgSerialized, '<!-- wp:html'), 'icon-context inline SVG is preserved through a faithful core/html block so the verbatim <svg> element survives rendering');
+$assert('core/icon' === ($safeInlineSvg['blocks'][0]['innerBlocks'][0]['innerBlocks'][0]['blockName'] ?? ''), 'icon-context decorative SVG is preserved as a native core/icon block');
+$assert(str_contains($safeInlineSvgSerialized, '<!-- wp:icon'), 'icon-context inline SVG is preserved through core/icon so the verbatim <svg> element survives rendering');
 $assert(! str_contains($safeInlineSvgSerialized, 'data:image/svg+xml,'), 'decorative inline SVG avoids image data URI noise');
 $assert(str_contains($safeInlineSvgSerialized, '<svg viewBox="0 0 16 16"'), 'decorative icon SVG markup is preserved verbatim with correct-case viewBox');
 
 $safeInlineSvgAsset = ( new HtmlTransformer() )->transform(
     '<svg role="img" aria-label="Status badge" viewBox="0 0 10 10"><title>Status badge</title><circle cx="5" cy="5" r="4"></circle></svg>'
 )->toArray();
-$safeInlineSvgAssetContent = (string) ($safeInlineSvgAsset['blocks'][0]['attrs']['content'] ?? '');
-$assert('core/html' === ($safeInlineSvgAsset['blocks'][0]['blockName'] ?? ''), 'simple accessible inline SVG is preserved faithfully as a core/html block, not a dynamic core/icon');
+$safeInlineSvgAssetContent = (string) ($safeInlineSvgAsset['blocks'][0]['attrs']['svg'] ?? '');
+$assert('core/icon' === ($safeInlineSvgAsset['blocks'][0]['blockName'] ?? ''), 'simple accessible inline SVG is preserved as a native core/icon block');
 $assert(str_contains($safeInlineSvgAssetContent, 'aria-label="Status badge"') && str_contains($safeInlineSvgAssetContent, 'viewBox="0 0 10 10"'), 'safe accessible inline SVG preserves its accessible label and correct-case viewBox in faithful markup');
 $assert(array() === ($safeInlineSvgAsset['assets'] ?? array()), 'safe accessible inline SVG icon does not generate an image asset');
 $assert(! str_contains((string) ($safeInlineSvgAsset['serialized_blocks'] ?? ''), 'data:image/svg+xml,'), 'safe accessible inline SVG avoids data URI serialization');
@@ -822,8 +822,8 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $complexSvgAsset = ( new HtmlTransformer() )->transform(
     '<svg role="img" aria-label="Site illustration" viewBox="0 0 400 200"><title>Site illustration</title><path d="M0 0h400v200H0z"></path></svg>'
 )->toArray();
-$complexSvgContent = (string) ($complexSvgAsset['blocks'][0]['attrs']['content'] ?? '');
-$assert('core/html' === ($complexSvgAsset['blocks'][0]['blockName'] ?? ''), 'large illustrative inline SVG is preserved inline as a core/html block (WordPress blocks SVG uploads, so an externalized .svg asset would not render)');
+$complexSvgContent = (string) ($complexSvgAsset['blocks'][0]['attrs']['svg'] ?? '');
+$assert('core/icon' === ($complexSvgAsset['blocks'][0]['blockName'] ?? ''), 'large illustrative inline SVG is preserved inline as a native core/icon block');
 $assert(array() === ($complexSvgAsset['assets'] ?? array()), 'inline illustrative SVG is not externalized to a generated .svg image asset');
 $assert(str_contains($complexSvgContent, '<svg') && str_contains($complexSvgContent, 'viewBox="0 0 400 200"'), 'inline illustrative SVG preserves its viewBox casing so it scales correctly');
 $assert(str_contains($complexSvgContent, 'role="img"') && str_contains($complexSvgContent, 'aria-label="Site illustration"'), 'inline illustrative SVG preserves accessibility attributes');
@@ -841,8 +841,8 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $assert(str_contains((string) ($texClassBlocks[1]['attrs']['content'] ?? ''), 'a^2 + b^2 = c^2'), 'TeX-delimited math preserves expression content');
 
 $unsafeInlineSvg = ( new HtmlTransformer() )->transform('<main><svg onload="alert(1)"><path d="M0 0h1v1z"></path></svg></main>')->toArray();
-$unsafeInlineSvgContent = (string) ($unsafeInlineSvg['blocks'][0]['attrs']['content'] ?? '');
-$assert('core/html' === ($unsafeInlineSvg['blocks'][0]['blockName'] ?? ''), 'unsafe inline SVG is sanitized and preserved as a core/html block instead of being dropped');
+$unsafeInlineSvgContent = (string) ($unsafeInlineSvg['blocks'][0]['attrs']['svg'] ?? '');
+$assert('core/icon' === ($unsafeInlineSvg['blocks'][0]['blockName'] ?? ''), 'unsafe inline SVG is sanitized and preserved as a native core/icon block instead of being dropped');
 $assert(array() === ($unsafeInlineSvg['fallbacks'] ?? array()), 'inline SVG with stripped unsafe parts keeps its artwork and emits no fallback diagnostic');
 $assert(str_contains($unsafeInlineSvgContent, '<svg') && str_contains($unsafeInlineSvgContent, '<path'), 'sanitized inline SVG keeps its shape markup');
 $assert(! str_contains($unsafeInlineSvgContent, 'onload'), 'sanitized inline SVG strips event-handler attributes while keeping the shapes');
@@ -1191,7 +1191,7 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $assert('runtime_island_preserved' === ($preservedRuntimeDiagnostics[0]['diagnostic_class'] ?? ''), 'preserved_runtime_island diagnostic exposes runtime-island diagnostic class');
 $assert('accepted_runtime_preservation' === ($preservedRuntimeDiagnostics[0]['preservation_status'] ?? ''), 'preserved_runtime_island diagnostic exposes accepted preservation status');
 $assertNormalizedFallbackDiagnostic($diagnosticsByCode['html_iframe_embed_fallback'] ?? array(), 'html_iframe_embed_fallback', 'warning', 'third_party_embed_runtime', 'embed');
-$assert(! isset($diagnosticsByCode['html_inline_svg_fallback']), 'safe inline SVGs convert to inline core/html blocks instead of fallback diagnostics');
+$assert(! isset($diagnosticsByCode['html_inline_svg_fallback']), 'safe inline SVGs convert to core/icon blocks instead of fallback diagnostics');
 $assert(! isset($diagnosticsByCode['html_canvas_runtime_fallback']), 'non-runtime canvas does not emit runtime canvas fallback diagnostics');
 
 $coffeeFixturePath = dirname(__DIR__, 3) . '/fixtures/websites/2-onepager-coffee/index.html';
@@ -1356,8 +1356,8 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $unsafeDecorativeSvg = ( new HtmlTransformer() )->transform(
     '<main><svg aria-hidden="true" viewBox="0 0 10 10"><script>alert(1)</script><circle onclick="alert(1)" cx="5" cy="5" r="5"></circle></svg></main>'
 )->toArray();
-$unsafeDecorativeContent = (string) ($unsafeDecorativeSvg['blocks'][0]['attrs']['content'] ?? '');
-$assert('core/html' === ($unsafeDecorativeSvg['blocks'][0]['blockName'] ?? ''), 'unsafe decorative inline SVG is sanitized and preserved as a core/html block rather than dropped');
+$unsafeDecorativeContent = (string) ($unsafeDecorativeSvg['blocks'][0]['attrs']['svg'] ?? '');
+$assert('core/icon' === ($unsafeDecorativeSvg['blocks'][0]['blockName'] ?? ''), 'unsafe decorative inline SVG is sanitized and preserved as a native core/icon block rather than dropped');
 $assert(array() === ($unsafeDecorativeSvg['source_reports']['conversion_report']['fallback_diagnostics'] ?? array()), 'sanitized decorative inline SVG keeps its artwork and emits no fallback diagnostic');
 $assert(str_contains($unsafeDecorativeContent, '<circle'), 'unsafe decorative inline SVG keeps its shape markup after sanitization');
 $assert(! str_contains($unsafeDecorativeContent, '<script'), 'unsafe decorative inline SVG strips scripts while keeping the shapes');
@@ -1490,9 +1490,9 @@ public function match(DOMElement $element, PatternContext $context): ?array
         'generated_html' => '<svg role="img" aria-label="Inline logo" viewBox="0 0 12 12"><title>Inline logo</title><path d="M0 0h12v12H0z"></path></svg>',
     )
 )->toArray();
-$artifactInlineSvgContent = (string) ($artifactInlineSvg['blocks'][0]['attrs']['content'] ?? '');
+$artifactInlineSvgContent = (string) ($artifactInlineSvg['blocks'][0]['attrs']['svg'] ?? '');
 $artifactInlineSvgAssets = $artifactInlineSvg['source_reports']['materialization_plan']['assets'] ?? array();
-$assert('core/html' === ($artifactInlineSvg['blocks'][0]['blockName'] ?? ''), 'artifact safe inline SVG is preserved inline as a core/html block (WordPress blocks SVG uploads, so an externalized .svg asset would not render)');
+$assert('core/icon' === ($artifactInlineSvg['blocks'][0]['blockName'] ?? ''), 'artifact safe inline SVG is preserved inline as a native core/icon block');
 $assert(array() === $artifactInlineSvgAssets, 'artifact safe inline SVG is not externalized to a generated .svg image asset');
 $assert(str_contains($artifactInlineSvgContent, 'aria-label="Inline logo"'), 'artifact inline SVG block preserves sanitized SVG content');
 $assert(! str_contains((string) ($artifactInlineSvg['serialized_blocks'] ?? ''), 'data:image/svg+xml,'), 'artifact safe inline SVG avoids data URI serialization');
@@ -1507,7 +1507,7 @@ public function match(DOMElement $element, PatternContext $context): ?array
     )
 )->toArray();
 $artifactNonEntryInlineSvgPage = $artifactNonEntryInlineSvg['source_reports']['materialization_plan']['pages'][1] ?? array();
-$assert(str_contains((string) ($artifactNonEntryInlineSvgPage['block_markup'] ?? ''), '<!-- wp:html'), 'non-entry artifact simple icon SVG is preserved faithfully as a core/html block, not a dynamic core/icon');
+$assert(str_contains((string) ($artifactNonEntryInlineSvgPage['block_markup'] ?? ''), '<!-- wp:icon'), 'non-entry artifact simple icon SVG is preserved as a native core/icon block');
 $assert(str_contains((string) ($artifactNonEntryInlineSvgPage['block_markup'] ?? ''), 'aria-label="About icon"') && str_contains((string) ($artifactNonEntryInlineSvgPage['block_markup'] ?? ''), 'viewBox="0 0 8 8"'), 'non-entry artifact faithful SVG preserves its accessible label and correct-case viewBox');
 $assert(array() === ($artifactNonEntryInlineSvg['source_reports']['materialization_plan']['assets'] ?? array()), 'non-entry artifact simple icon SVG does not materialize a generated image asset');
 
diff --git a/php-transformer/tests/fixtures/parity/html-background-icon-media-patterns.json b/php-transformer/tests/fixtures/parity/html-background-icon-media-patterns.json
index 18118657..f4cc038a 100644
--- a/php-transformer/tests/fixtures/parity/html-background-icon-media-patterns.json
+++ b/php-transformer/tests/fixtures/parity/html-background-icon-media-patterns.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-background-icon-media-patterns",
-  "description": "Converts generic background-image heroes into core media blocks and preserves icon-like SVG card media faithfully as core/html (verbatim svg with correct-case viewBox), without fallbacks.",
+  "description": "Converts generic background-image heroes into core media blocks and preserves icon-like SVG card media as core/icon (verbatim svg with correct-case viewBox), without fallbacks.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-background-icon-media-patterns.json",
@@ -21,7 +21,7 @@
     { "path": "blocks.0.innerBlocks.1.innerBlocks.0", "name": "core/heading", "attrs": { "content": "Care that meets you", "level": 1 } },
     { "path": "blocks.1", "name": "core/group", "attrs": { "className": "feature-card" } },
     { "path": "blocks.1.innerBlocks.0", "name": "core/group", "attrs": { "className": "feature-icon" } },
-    { "path": "blocks.1.innerBlocks.0.innerBlocks.0", "name": "core/html" },
+    { "path": "blocks.1.innerBlocks.0.innerBlocks.0", "name": "core/icon" },
     { "path": "blocks.1.innerBlocks.1", "name": "core/heading", "attrs": { "content": "Fast booking", "level": 3 } }
   ],
   "expected_fallbacks": [],
@@ -30,8 +30,8 @@
     { "path": "blocks", "assert": "count", "count": 2 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:image" },
-    { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:html" },
-    { "path": "blocks.1.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 24 24\"" },
+    { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:icon" },
+    { "path": "blocks.1.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 24 24\"" },
     { "path": "source_reports.conversion_report.metrics.fallback_count", "assert": "equals", "value": 0 }
   ]
 }
diff --git a/php-transformer/tests/fixtures/parity/html-flex-media-text-columns.json b/php-transformer/tests/fixtures/parity/html-flex-media-text-columns.json
index ba6e8a06..68167860 100644
--- a/php-transformer/tests/fixtures/parity/html-flex-media-text-columns.json
+++ b/php-transformer/tests/fixtures/parity/html-flex-media-text-columns.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-flex-media-text-columns",
-  "description": "Converts two-child flex media/text rows with direct illustrative SVG children as flex groups, preserving the SVG inline as a core/html block (WordPress blocks SVG uploads, so an externalized .svg asset would not render).",
+  "description": "Converts two-child flex media/text rows with direct illustrative SVG children as flex groups, preserving the SVG inline as a core/icon block.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-flex-media-text-columns.json",
@@ -17,7 +17,7 @@
   },
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "layout": { "type": "flex" } } },
-    { "path": "blocks.0.innerBlocks.0", "name": "core/html" },
+    { "path": "blocks.0.innerBlocks.0", "name": "core/icon" },
     { "path": "blocks.0.innerBlocks.1", "name": "core/group" },
     { "path": "blocks.0.innerBlocks.1.innerBlocks.0", "name": "core/heading", "attrs": { "content": "Paw Width", "level": 3 } },
     { "path": "blocks.0.innerBlocks.1.innerBlocks.1", "name": "core/paragraph", "attrs": { "content": "Measure the widest point while standing." } }
@@ -28,8 +28,8 @@
     { "path": "metrics.block_count", "assert": "equals", "value": 5 },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 2 },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\"" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "WIDTH" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\"" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "WIDTH" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "source_reports.conversion_report.metrics.fallback_count", "assert": "equals", "value": 0 }
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-artwork-preserved.json b/php-transformer/tests/fixtures/parity/html-inline-svg-artwork-preserved.json
index 11a6293e..6f782b1c 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-artwork-preserved.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-artwork-preserved.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-artwork-preserved",
-  "description": "Preserves a full inline SVG illustration (rect/circle/path/g/polygon/text plus a comment) as sanitized inline core/html when the source identifies it as artwork. Unsafe parts carried on the same SVG (an inline <script> and an event-handler attribute) are stripped while the artwork survives, so the graphic never collapses to an empty block.",
+  "description": "Preserves a full inline SVG illustration (rect/circle/path/g/polygon/text plus a comment) as sanitized inline core/icon when the source identifies it as artwork. Unsafe parts carried on the same SVG (an inline <script> and an event-handler attribute) are stripped while the artwork survives, so the graphic never collapses to an empty block.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-artwork-preserved.json",
@@ -17,24 +17,24 @@
   },
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "className": "album-art" } },
-    { "path": "blocks.0.innerBlocks.0", "name": "core/html" }
+    { "path": "blocks.0.innerBlocks.0", "name": "core/icon" }
   ],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 1 },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 600 600\" role=\"img\" aria-label=\"Mara Vale cover\">" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<!-- Background -->" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<rect width=\"600\" height=\"600\" fill=\"#1a1a2e\"></rect>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<circle cx=\"300\" cy=\"240\" r=\"160\" fill=\"#e94560\"></circle>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<path d=\"M100 400 L300 300 L500 400 Z\" fill=\"#0f3460\"></path>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<polygon points=\"50,50 100,50 75,90\" fill=\"#fff\"></polygon>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "Between the Fog and the Fire" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "data:image/svg+xml" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "<script" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "onclick" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "track()" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 600 600\" role=\"img\" aria-label=\"Mara Vale cover\">" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<!-- Background -->" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<rect width=\"600\" height=\"600\" fill=\"#1a1a2e\"></rect>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<circle cx=\"300\" cy=\"240\" r=\"160\" fill=\"#e94560\"></circle>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<path d=\"M100 400 L300 300 L500 400 Z\" fill=\"#0f3460\"></path>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<polygon points=\"50,50 100,50 75,90\" fill=\"#fff\"></polygon>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "Between the Fog and the Fire" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "data:image/svg+xml" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "<script" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "onclick" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "track()" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
   ]
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-benefit-icon-faithful.json b/php-transformer/tests/fixtures/parity/html-inline-svg-benefit-icon-faithful.json
index 9fe11b67..9211e134 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-benefit-icon-faithful.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-benefit-icon-faithful.json
@@ -1,11 +1,11 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-benefit-icon-faithful",
-  "description": "Imported feature/benefit inline SVGs are preserved faithfully as core/html so the verbatim <svg> element, its sizing class (e.g. benefit-icon), and its correct-case viewBox survive rendering. They are never routed through the dynamic core/icon block, which is keyed on a registry slug and discards inline SVG markup (rendering empty).",
+  "description": "Imported feature/benefit inline SVGs are preserved as core/icon so the verbatim <svg> element, its sizing class (e.g. benefit-icon), and its correct-case viewBox survive rendering.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-benefit-icon-faithful.json",
-    "notes": "Regression guard: core/icon discards arbitrary inline SVG (render_block_core_icon returns empty without a registry slug), so imported feature icons must use faithful core/html passthrough that keeps element + class + viewBox case."
+    "notes": "Regression guard: imported feature icons use core/icon with verbatim sanitized SVG markup so element + class + viewBox case survive."
   },
   "legacy_comparison": {
     "skip": true,
@@ -18,7 +18,7 @@
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "className": "features" } },
     { "path": "blocks.0.innerBlocks.0", "name": "core/group", "attrs": { "className": "feature" } },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/html" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/icon" },
     { "path": "blocks.0.innerBlocks.0.innerBlocks.1", "name": "core/heading", "attrs": { "content": "Fast", "level": 3 } }
   ],
   "expect": [
@@ -26,8 +26,8 @@
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "assets", "assert": "count", "count": 0 },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "class=\"benefit-icon\"" },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "viewBox=\"0 0 24 24\"" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "class=\"benefit-icon\"" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "viewBox=\"0 0 24 24\"" },
     { "path": "serialized_blocks", "assert": "contains", "value": "<svg class=\"benefit-icon\" viewBox=\"0 0 24 24\"" },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
   ]
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-decorative.json b/php-transformer/tests/fixtures/parity/html-inline-svg-decorative.json
index 4b4ea88d..ce3d2c65 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-decorative.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-decorative.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-decorative",
-  "description": "Consumes safe decorative inline SVG separators and preserves simple accessible icon SVGs faithfully as core/html (verbatim svg element, class, and correct-case viewBox) without fallback noise.",
+  "description": "Consumes safe decorative inline SVG separators and preserves simple accessible icon SVGs as core/icon (verbatim svg element, class, and correct-case viewBox) without fallback noise.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-decorative.json",
@@ -18,14 +18,14 @@
   "expected_blocks": [
     { "path": "blocks.0.innerBlocks.0", "name": "core/heading", "attrs": { "content": "Before", "level": 2 } },
     { "path": "blocks.0.innerBlocks.1", "name": "core/paragraph", "attrs": { "content": "After" } },
-    { "path": "blocks.0.innerBlocks.2", "name": "core/html" }
+    { "path": "blocks.0.innerBlocks.2", "name": "core/icon" }
   ],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 3 },
-    { "path": "blocks.0.innerBlocks.2.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 32 32\"" },
-    { "path": "blocks.0.innerBlocks.2.attrs.content", "assert": "contains", "value": "aria-label=\"Acme integration\"" },
+    { "path": "blocks.0.innerBlocks.2.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 32 32\"" },
+    { "path": "blocks.0.innerBlocks.2.attrs.svg", "assert": "contains", "value": "aria-label=\"Acme integration\"" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-diagram-preserved.json b/php-transformer/tests/fixtures/parity/html-inline-svg-diagram-preserved.json
index 17fa1884..63a402a6 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-diagram-preserved.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-diagram-preserved.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-diagram-preserved",
-  "description": "Preserves an aria-hidden inline SVG diagram built from the full set of safe structure/geometry elements (defs/linearGradient/stop, line/polyline/polygon/ellipse/circle/rect) plus HTML comments, faithfully as a core/html block. aria-hidden marks the diagram decorative for assistive tech but never makes the artwork disposable: the SVG passes the safe-decorative classification yet must still survive instead of collapsing to an empty block or a comments-only shell. Unsafe parts carried on the same SVG (an inline <script> and an event-handler attribute) are stripped while the artwork is kept.",
+  "description": "Preserves an aria-hidden inline SVG diagram built from the full set of safe structure/geometry elements (defs/linearGradient/stop, line/polyline/polygon/ellipse/circle/rect) plus HTML comments as a core/icon block. aria-hidden marks the diagram decorative for assistive tech but never makes the artwork disposable: the SVG passes the safe-decorative classification yet must still survive instead of collapsing to an empty block or a comments-only shell. Unsafe parts carried on the same SVG (an inline <script> and an event-handler attribute) are stripped while the artwork is kept.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-diagram-preserved.json",
@@ -17,25 +17,25 @@
   },
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "className": "system-diagram" } },
-    { "path": "blocks.0.innerBlocks.0", "name": "core/html" }
+    { "path": "blocks.0.innerBlocks.0", "name": "core/icon" }
   ],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 1 },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 400 300\" aria-hidden=\"true\">" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<linearGradient id=\"pipe-grad\"" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<stop offset=\"0%\" stop-color=\"#88c\"></stop>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<line x1=\"200\" y1=\"0\" x2=\"200\" y2=\"300\" stroke=\"#333\" stroke-width=\"6\"></line>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<polyline points=\"200,150 320,150 320,260\" fill=\"none\" stroke=\"#06c\" stroke-width=\"4\"></polyline>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<polygon points=\"40,40 100,40 70,92\" fill=\"url(#pipe-grad)\"></polygon>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<ellipse cx=\"120\" cy=\"210\" rx=\"44\" ry=\"22\" fill=\"#3a3\"></ellipse>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<circle cx=\"320\" cy=\"260\" r=\"8\" fill=\"#e94560\"></circle>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<rect width=\"24\" height=\"24\" fill=\"#1a1a2e\"></rect>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "<script" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "onclick" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "track()" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 400 300\" aria-hidden=\"true\">" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<linearGradient id=\"pipe-grad\"" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<stop offset=\"0%\" stop-color=\"#88c\"></stop>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<line x1=\"200\" y1=\"0\" x2=\"200\" y2=\"300\" stroke=\"#333\" stroke-width=\"6\"></line>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<polyline points=\"200,150 320,150 320,260\" fill=\"none\" stroke=\"#06c\" stroke-width=\"4\"></polyline>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<polygon points=\"40,40 100,40 70,92\" fill=\"url(#pipe-grad)\"></polygon>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<ellipse cx=\"120\" cy=\"210\" rx=\"44\" ry=\"22\" fill=\"#3a3\"></ellipse>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<circle cx=\"320\" cy=\"260\" r=\"8\" fill=\"#e94560\"></circle>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<rect width=\"24\" height=\"24\" fill=\"#1a1a2e\"></rect>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "<script" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "onclick" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "track()" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
   ]
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-fallback.json b/php-transformer/tests/fixtures/parity/html-inline-svg-fallback.json
index 85a4592c..7843ceed 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-fallback.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-fallback.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-fallback",
-  "description": "Preserves simple accessible inline SVG faithfully as a core/html block (verbatim svg, accessible label, correct-case viewBox) while preserving supported siblings.",
+  "description": "Preserves simple accessible inline SVG as a core/icon block (verbatim svg, accessible label, correct-case viewBox) while preserving supported siblings.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-fallback.json",
@@ -17,14 +17,14 @@
   },
   "expected_blocks": [
     { "path": "blocks.0.innerBlocks.0", "name": "core/heading", "attrs": { "content": "Icon row", "level": 2 } },
-    { "path": "blocks.0.innerBlocks.1", "name": "core/html" }
+    { "path": "blocks.0.innerBlocks.1", "name": "core/icon" }
   ],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
-    { "path": "blocks.0.innerBlocks.1.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 10 10\"" },
-    { "path": "blocks.0.innerBlocks.1.attrs.content", "assert": "contains", "value": "aria-label=\"Status\"" },
+    { "path": "blocks.0.innerBlocks.1.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 10 10\"" },
+    { "path": "blocks.0.innerBlocks.1.attrs.svg", "assert": "contains", "value": "aria-label=\"Status\"" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
   ]
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-local-use-symbol.json b/php-transformer/tests/fixtures/parity/html-inline-svg-local-use-symbol.json
index 522a821d..924dd2c1 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-local-use-symbol.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-local-use-symbol.json
@@ -29,7 +29,7 @@
     },
     {
       "path": "blocks.0.innerBlocks.0.innerBlocks.0",
-      "name": "core/html"
+      "name": "core/icon"
     }
   ],
   "expect": [
@@ -39,22 +39,22 @@
       "value": "success"
     },
     {
-      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content",
+      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg",
       "assert": "contains",
       "value": "<symbol id=\"valve\"><circle cx=\"6\" cy=\"6\" r=\"5\" fill=\"#e94560\"></circle></symbol>"
     },
     {
-      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content",
+      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg",
       "assert": "contains",
       "value": "<use href=\"#valve\" x=\"0\" y=\"0\"></use>"
     },
     {
-      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content",
+      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg",
       "assert": "contains",
       "value": "<use href=\"#valve\" x=\"24\" y=\"0\"></use>"
     },
     {
-      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content",
+      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg",
       "assert": "not_contains",
       "value": "icons.svg#gear"
     },
@@ -79,4 +79,4 @@
       "value": "svg"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-native-icon-sizing.json b/php-transformer/tests/fixtures/parity/html-inline-svg-native-icon-sizing.json
new file mode 100644
index 00000000..42b5ee48
--- /dev/null
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-native-icon-sizing.json
@@ -0,0 +1,42 @@
+{
+  "schema": "blocks-engine/php-transformer/parity-fixture/v1",
+  "name": "html-inline-svg-native-icon-sizing",
+  "description": "Converts safe inline SVG icons and illustrations to native core/icon while keeping the source SVG sizing hooks, and converts decorative SVGs inside button-like links to native core/button labels without core/html fallback blocks.",
+  "source_reference": {
+    "repo": "php-transformer",
+    "path": "tests/fixtures/parity/html-inline-svg-native-icon-sizing.json",
+    "notes": "Distilled coverage for decorative icon SVG, sized hero SVG with viewBox/class/style sizing, and SVG inside a button-like link."
+  },
+  "legacy_comparison": {
+    "skip": true,
+    "reason": "This upstream primitive fixture has no downstream legacy comparison."
+  },
+  "operation": "html_transformer.transform",
+  "input": {
+    "content": "<main><svg class=\"status-icon\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" aria-hidden=\"true\"><circle cx=\"12\" cy=\"12\" r=\"10\"></circle></svg><svg class=\"hero-flame-svg\" viewBox=\"0 0 100 160\" style=\"width:120px;height:auto\" role=\"img\" aria-label=\"Hero flame\"><defs><linearGradient id=\"flame-grad\" x1=\"50\" y1=\"0\" x2=\"50\" y2=\"160\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0%\" stop-color=\"#ff9060\"></stop><stop offset=\"100%\" stop-color=\"#e06012\"></stop></linearGradient></defs><path d=\"M50 0 C90 56 82 122 50 160 C18 122 10 56 50 0Z\" fill=\"url(#flame-grad)\"></path></svg><a class=\"icon-cta\" href=\"/reserve\"><svg width=\"16\" height=\"16\" viewBox=\"0 0 16 16\" aria-hidden=\"true\"><path d=\"M2 8h12\"></path></svg><span>Reserve</span></a></main>"
+  },
+  "expected_blocks": [
+    { "path": "blocks.0", "name": "core/group" },
+    { "path": "blocks.0.innerBlocks.0", "name": "core/icon" },
+    { "path": "blocks.0.innerBlocks.1", "name": "core/icon" },
+    { "path": "blocks.0.innerBlocks.2", "name": "core/buttons" },
+    { "path": "blocks.0.innerBlocks.2.innerBlocks.0", "name": "core/button", "attrs": { "className": "icon-cta", "text": "Reserve", "url": "/reserve" } }
+  ],
+  "expected_fallbacks": [],
+  "expect": [
+    { "path": "status", "assert": "equals", "value": "success" },
+    { "path": "fallbacks", "assert": "count", "count": 0 },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "width=\"24\" height=\"24\" viewBox=\"0 0 24 24\"" },
+    { "path": "blocks.0.innerBlocks.0.attrs.ariaHidden", "assert": "equals", "value": true },
+    { "path": "blocks.0.innerBlocks.1.attrs.svg", "assert": "contains", "value": "class=\"hero-flame-svg\"" },
+    { "path": "blocks.0.innerBlocks.1.attrs.svg", "assert": "contains", "value": "viewBox=\"0 0 100 160\"" },
+    { "path": "blocks.0.innerBlocks.1.attrs.svg", "assert": "contains", "value": "style=\"width:120px;height:auto\"" },
+    { "path": "blocks.0.innerBlocks.1.attrs.label", "assert": "equals", "value": "Hero flame" },
+    { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:icon" },
+    { "path": "serialized_blocks", "assert": "contains", "value": "<svg class=\"hero-flame-svg\" viewBox=\"0 0 100 160\" style=\"width:120px;height:auto\"" },
+    { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:button" },
+    { "path": "serialized_blocks", "assert": "not_contains", "value": "<!-- wp:html" },
+    { "path": "assets", "assert": "count", "count": 0 },
+    { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
+  ]
+}
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-unsafe.json b/php-transformer/tests/fixtures/parity/html-inline-svg-unsafe.json
index 05f311f1..b74c1e96 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-unsafe.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-unsafe.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-unsafe",
-  "description": "Sanitizes unsafe inline SVG in place — stripping scripts, event handlers, and javascript: URLs — while preserving the shape markup as a faithful core/html block instead of dropping the whole graphic.",
+  "description": "Sanitizes unsafe inline SVG in place — stripping scripts, event handlers, and javascript: URLs — while preserving the shape markup as a native core/icon block instead of dropping the whole graphic.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-unsafe.json",
@@ -16,20 +16,20 @@
     "content": "<svg viewBox=\"0 0 20 20\" onclick=\"alert(1)\"><script>alert(2)</script><a xlink:href=\"javascript:alert(3)\"><circle onmouseover=\"alert(4)\" cx=\"10\" cy=\"10\" r=\"8\"></circle></a></svg><p>After</p>"
   },
   "expected_blocks": [
-    { "path": "blocks.0", "name": "core/html" },
+    { "path": "blocks.0", "name": "core/icon" },
     { "path": "blocks.1", "name": "core/paragraph", "attrs": { "content": "After" } }
   ],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks", "assert": "count", "count": 2 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
-    { "path": "blocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\">" },
-    { "path": "blocks.0.attrs.content", "assert": "contains", "value": "<circle cx=\"10\" cy=\"10\" r=\"8\"></circle>" },
-    { "path": "blocks.0.attrs.content", "assert": "not_contains", "value": "<script" },
-    { "path": "blocks.0.attrs.content", "assert": "not_contains", "value": "onclick" },
-    { "path": "blocks.0.attrs.content", "assert": "not_contains", "value": "onmouseover" },
-    { "path": "blocks.0.attrs.content", "assert": "not_contains", "value": "javascript:" },
-    { "path": "blocks.0.attrs.content", "assert": "not_contains", "value": "alert(" },
+    { "path": "blocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\">" },
+    { "path": "blocks.0.attrs.svg", "assert": "contains", "value": "<circle cx=\"10\" cy=\"10\" r=\"8\"></circle>" },
+    { "path": "blocks.0.attrs.svg", "assert": "not_contains", "value": "<script" },
+    { "path": "blocks.0.attrs.svg", "assert": "not_contains", "value": "onclick" },
+    { "path": "blocks.0.attrs.svg", "assert": "not_contains", "value": "onmouseover" },
+    { "path": "blocks.0.attrs.svg", "assert": "not_contains", "value": "javascript:" },
+    { "path": "blocks.0.attrs.svg", "assert": "not_contains", "value": "alert(" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
   ]
diff --git a/php-transformer/tests/fixtures/parity/html-product-card-svg-price-grid.json b/php-transformer/tests/fixtures/parity/html-product-card-svg-price-grid.json
index ea686534..180fe26e 100644
--- a/php-transformer/tests/fixtures/parity/html-product-card-svg-price-grid.json
+++ b/php-transformer/tests/fixtures/parity/html-product-card-svg-price-grid.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-product-card-svg-price-grid",
-  "description": "Preserves product cards with illustrative inline SVG imagery as sanitized inline core/html blocks, product names, prices, and CTA buttons inside a card grid.",
+  "description": "Preserves product cards with illustrative inline SVG imagery as sanitized inline core/icon blocks, product names, prices, and CTA buttons inside a card grid.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-product-card-svg-price-grid.json",
@@ -18,7 +18,7 @@
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "className": "product-grid", "layout": { "type": "grid" } } },
     { "path": "blocks.0.innerBlocks.0", "name": "core/group", "attrs": { "className": "product-card" } },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/html" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/icon" },
     { "path": "blocks.0.innerBlocks.0.innerBlocks.1", "name": "core/heading", "attrs": { "className": "product-name", "content": "Ceramic Bowl", "level": 3 } },
     { "path": "blocks.0.innerBlocks.0.innerBlocks.2", "name": "core/paragraph", "attrs": { "className": "product-price", "content": "$42" } },
     { "path": "blocks.0.innerBlocks.0.innerBlocks.3", "name": "core/buttons" },
@@ -30,9 +30,9 @@
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 2 },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg class=\"product-image\" role=\"img\" aria-label=\"Ceramic bowl\" viewBox=\"0 0 10 10\">" },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<circle cx=\"5\" cy=\"5\" r=\"4\"></circle>" },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "data:image/svg+xml" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg class=\"product-image\" role=\"img\" aria-label=\"Ceramic bowl\" viewBox=\"0 0 10 10\">" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<circle cx=\"5\" cy=\"5\" r=\"4\"></circle>" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "data:image/svg+xml" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "serialized_blocks", "assert": "contains", "value": "product-price" },
     { "path": "source_reports.html.structure_signals.3.signals.price_like", "assert": "equals", "value": true },
diff --git a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json
index 4b3e6947..db99f046 100644
--- a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json
+++ b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-single-child-flex-svg-address",
-  "description": "Preserves single-child flex wrappers with safe illustrative inline SVG (kept inline as a core/html block, since WordPress blocks SVG uploads and an externalized .svg asset would not render) and readable address line breaks without unsupported fallbacks.",
+  "description": "Preserves single-child flex wrappers with safe illustrative inline SVG (kept inline as a core/icon block) and readable address line breaks without unsupported fallbacks.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-single-child-flex-svg-address.json",
@@ -18,15 +18,15 @@
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group" },
     { "path": "blocks.0.innerBlocks.0", "name": "core/group", "attrs": { "className": "illustration-frame", "layout": { "type": "flex", "justifyContent": "center" } } },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/html" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/icon" },
     { "path": "blocks.0.innerBlocks.1", "name": "core/paragraph", "attrs": { "className": "contact-card", "content": "214 Maple Street<br>Benton Harbor, MI<br><a href=\"tel:+12695550193\">(269) 555-0193</a>" } }
   ],
   "expected_fallbacks": [],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "fallbacks", "assert": "count", "count": 0 },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 40 20\"" },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "Storefront illustration" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 40 20\"" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "Storefront illustration" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "serialized_blocks", "assert": "contains", "value": "Storefront illustration" },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
diff --git a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json
index cc8bcab3..826c60c8 100644
--- a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json
+++ b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-single-child-flex-svg",
-  "description": "Converts a single illustrative SVG inside a flex centering wrapper without leaking failed column-probe fallbacks, preserving the SVG inline as a core/html block (WordPress blocks SVG uploads, so an externalized .svg asset would not render).",
+  "description": "Converts a single illustrative SVG inside a flex centering wrapper without leaking failed column-probe fallbacks, preserving the SVG inline as a core/icon block.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-single-child-flex-svg.json",
@@ -17,7 +17,7 @@
   },
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "layout": { "type": "flex", "justifyContent": "center" } } },
-    { "path": "blocks.0.innerBlocks.0", "name": "core/html" }
+    { "path": "blocks.0.innerBlocks.0", "name": "core/icon" }
   ],
   "expected_fallbacks": [],
   "expect": [
@@ -25,8 +25,8 @@
     { "path": "metrics.block_count", "assert": "equals", "value": 2 },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 1 },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\"" },
-    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "GIRTH" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\"" },
+    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "GIRTH" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "source_reports.conversion_report.metrics.fallback_count", "assert": "equals", "value": 0 }

From 9ebf30ffcffde5fa9efe00aa49e2f3c3669241f9 Mon Sep 17 00:00:00 2001
From: Chris Huber <chris.huber@a8c.com>
Date: Sat, 4 Jul 2026 09:31:36 -0400
Subject: [PATCH 2/2] fix(php-transformer): keep inline svg editor-valid

---
 .../src/HtmlToBlocks/BlockFactory.php         |  9 +--
 .../src/HtmlToBlocks/HtmlTransformer.php      | 71 ++++++++++++-------
 php-transformer/tests/contract/run.php        | 32 ++++-----
 .../html-background-icon-media-patterns.json  |  8 +--
 .../parity/html-flex-media-text-columns.json  |  8 +--
 .../html-inline-svg-artwork-preserved.json    | 26 +++----
 ...html-inline-svg-benefit-icon-faithful.json | 10 +--
 .../parity/html-inline-svg-decorative.json    |  8 +--
 .../html-inline-svg-diagram-preserved.json    | 28 ++++----
 .../parity/html-inline-svg-fallback.json      |  8 +--
 .../html-inline-svg-local-use-symbol.json     | 12 ++--
 .../html-inline-svg-native-icon-sizing.json   | 42 -----------
 .../html-inline-svg-sized-html-valid.json     | 38 ++++++++++
 .../parity/html-inline-svg-unsafe.json        | 18 ++---
 .../html-product-card-svg-price-grid.json     | 10 +--
 .../html-single-child-flex-svg-address.json   |  8 +--
 .../parity/html-single-child-flex-svg.json    |  8 +--
 17 files changed, 175 insertions(+), 169 deletions(-)
 delete mode 100644 php-transformer/tests/fixtures/parity/html-inline-svg-native-icon-sizing.json
 create mode 100644 php-transformer/tests/fixtures/parity/html-inline-svg-sized-html-valid.json

diff --git a/php-transformer/src/HtmlToBlocks/BlockFactory.php b/php-transformer/src/HtmlToBlocks/BlockFactory.php
index ddb06e56..51871f20 100644
--- a/php-transformer/src/HtmlToBlocks/BlockFactory.php
+++ b/php-transformer/src/HtmlToBlocks/BlockFactory.php
@@ -141,14 +141,7 @@ private function blockHtml(string $name, array $attrs, array $innerBlocks): stri
         }
 
         if ( 'core/icon' === $name ) {
-            $support = $this->styleSupport($attrs['style'] ?? null);
-            $iconAttrs = array(
-                'class'       => $this->mergeClassNames('wp-block-icon', $support['classes'], (string) ($attrs['className'] ?? '')),
-                'style'       => $support['style'],
-                'aria-label'  => (string) ($attrs['label'] ?? ''),
-                'aria-hidden' => ! empty($attrs['ariaHidden']) ? 'true' : '',
-            );
-            return '<div' . $this->htmlAttrs($iconAttrs) . '>' . ($attrs['svg'] ?? '') . '</div>';
+            return '';
         }
 
         if ( 'core/preformatted' === $name ) {
diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php
index 5e8cd72a..3cdd89ec 100644
--- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php
+++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php
@@ -1552,10 +1552,14 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca
                 }
             }
 
-            // Imported inline SVGs are represented as core/icon with the
-            // sanitized source <svg> stored verbatim in its svg attribute. This
-            // keeps the actual SVG element, sizing classes/attributes, and
-            // correct-case viewBox while avoiding core/html fallback blocks.
+            // Imported inline SVGs are preserved faithfully as raw markup
+            // (core/html via inlineSvgBlockFromElement). They are never routed
+            // through core/icon: that block is a dynamic block keyed on a
+            // registry slug (its `icon` attribute) and discards arbitrary inline
+            // SVG markup, so render_block_core_icon() returns empty output for
+            // imported SVGs. Faithful passthrough keeps the original element,
+            // its sizing class(es), and correct-case viewBox so the
+            // materialized source CSS can size it.
             if ( $this->isSafeDecorativeSvgElement($element) ) {
                 // Faithfully preserve any inline SVG that carries real drawable
                 // artwork — icons, diagrams, illustrations — even when it is
@@ -4243,38 +4247,51 @@ private function inlineSvgBlockFromElement(DOMElement $element): ?array
             return null;
         }
 
-        // Externalizing to an `assets/*.svg` file + core/image would be lost in
-        // WordPress, which blocks SVG uploads by default. core/icon is the
-        // native block in this runtime that can carry inline SVG markup, and the
-        // original outer SVG preserves viewBox/width/height/preserveAspectRatio,
-        // role/aria-label, and CSS sizing classes on the actual rendered <svg>.
-        return $this->createBlock('core/icon', $this->inlineSvgIconAttributes($element, $html), array(), $element);
+        // core/icon is dynamic and references registered icon names; it cannot
+        // carry arbitrary imported SVG markup. Keep illustrative/decorative SVGs
+        // inline as sanitized core/html, but make viewBox-only SVGs explicitly
+        // bounded so they do not render oversized if source CSS is unavailable.
+        return $this->createBlock('core/html', array( 'content' => $this->restoreSvgCasing($this->ensureInlineSvgSizing($html)) ), array(), $element);
     }
 
-    /**
-     * @return array<string, mixed>
-     */
-    private function inlineSvgIconAttributes(DOMElement $element, string $html): array
+    private function ensureInlineSvgSizing(string $html): string
     {
-        $attrs = $this->presentationAttributes($element);
-        $attrs['svg'] = $this->restoreSvgCasing($html);
+        if ( 1 !== preg_match('/<svg\b([^>]*)>/i', $html, $match, PREG_OFFSET_CAPTURE) ) {
+            return $html;
+        }
 
-        $label = trim($this->attr($element, 'aria-label'));
-        if ( '' === $label ) {
-            $title = $element->getElementsByTagName('title')->item(0);
-            if ( $title instanceof DOMElement ) {
-                $label = trim($title->textContent ?? '');
-            }
+        $attrs = $match[1][0];
+        if ( preg_match('/\s(?:width|height)\s*=/i', $attrs) || preg_match('/\sstyle\s*=\s*(["\'])(?:(?!\1).)*(?:width|height)\s*:/i', $attrs) ) {
+            return $html;
         }
-        if ( '' !== $label ) {
-            $attrs['label'] = $label;
+
+        if ( 1 !== preg_match('/\sviewbox\s*=\s*(["\'])([^"\']+)\1/i', $attrs, $viewBoxMatch) ) {
+            return $html;
         }
 
-        if ( 'true' === strtolower(trim($this->attr($element, 'aria-hidden'))) || in_array(strtolower(trim($this->attr($element, 'role'))), array( 'presentation', 'none' ), true) ) {
-            $attrs['ariaHidden'] = true;
+        $parts = preg_split('/[\s,]+/', trim($viewBoxMatch[2])) ?: array();
+        if ( count($parts) < 4 || ! is_numeric($parts[2]) || ! is_numeric($parts[3]) ) {
+            return $html;
         }
 
-        return $attrs;
+        $width = $this->normalizedSvgDimension((float) $parts[2]);
+        $height = $this->normalizedSvgDimension((float) $parts[3]);
+        if ( '' === $width || '' === $height ) {
+            return $html;
+        }
+
+        $insertAt = $match[0][1] + strlen($match[0][0]) - 1;
+        return substr($html, 0, $insertAt) . ' width="' . $width . '" height="' . $height . '"' . substr($html, $insertAt);
+    }
+
+    private function normalizedSvgDimension(float $value): string
+    {
+        if ( $value <= 0 ) {
+            return '';
+        }
+
+        $formatted = rtrim(rtrim(sprintf('%.4F', $value), '0'), '.');
+        return '' === $formatted ? '' : $formatted;
     }
 
     /**
diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php
index b62b9485..3306df7e 100644
--- a/php-transformer/tests/contract/run.php
+++ b/php-transformer/tests/contract/run.php
@@ -498,8 +498,8 @@ public function match(DOMElement $element, PatternContext $context): ?array
     '<main><svg class="album-art" viewBox="0 0 100 100" role="img" aria-label="Album art"><rect width="100" height="100" fill="#111"/><circle cx="50" cy="50" r="30" fill="#c4581a"/></svg></main>'
 )->toArray();
 $inlineSvgMarkup = (string) ($inlineSvgArtwork['serialized_blocks'] ?? '');
-$assert('core/icon' === ($inlineSvgArtwork['blocks'][0]['blockName'] ?? ''), 'meaningful inline SVG artwork materializes as a native core/icon block');
-$assert(str_contains($inlineSvgMarkup, '<!-- wp:icon'), 'meaningful inline SVG artwork serializes as core/icon');
+$assert('core/html' === ($inlineSvgArtwork['blocks'][0]['blockName'] ?? ''), 'meaningful inline SVG artwork materializes as sanitized inline HTML');
+$assert(str_contains($inlineSvgMarkup, '<!-- wp:html'), 'meaningful inline SVG artwork serializes as core/html');
 $assert(str_contains($inlineSvgMarkup, '<svg class="album-art"'), 'meaningful inline SVG artwork preserves the SVG element and class');
 $assert(str_contains($inlineSvgMarkup, 'aria-label="Album art"'), 'meaningful inline SVG artwork preserves accessible label');
 $assert(! str_contains($inlineSvgMarkup, 'data:image/svg+xml'), 'meaningful inline SVG artwork avoids unreliable data image URLs');
@@ -805,16 +805,16 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $assert('success' === ($safeInlineSvg['status'] ?? ''), 'safe inline SVG does not trip strict fallback gates', (string) ($safeInlineSvg['status'] ?? ''));
 $assert(array() === ($safeInlineSvg['fallbacks'] ?? array()), 'safe decorative inline SVG is consumed instead of recorded as fallback metadata');
 $assert('core/group' === ($safeInlineSvg['blocks'][0]['blockName'] ?? ''), 'decorative inline SVG preserves its CSS-addressable wrapper when present');
-$assert('core/icon' === ($safeInlineSvg['blocks'][0]['innerBlocks'][0]['innerBlocks'][0]['blockName'] ?? ''), 'icon-context decorative SVG is preserved as a native core/icon block');
-$assert(str_contains($safeInlineSvgSerialized, '<!-- wp:icon'), 'icon-context inline SVG is preserved through core/icon so the verbatim <svg> element survives rendering');
+$assert('core/html' === ($safeInlineSvg['blocks'][0]['innerBlocks'][0]['innerBlocks'][0]['blockName'] ?? ''), 'icon-context decorative SVG is preserved faithfully as a core/html block, not a dynamic core/icon (which discards inline SVG markup and renders empty)');
+$assert(str_contains($safeInlineSvgSerialized, '<!-- wp:html'), 'icon-context inline SVG is preserved through a faithful core/html block so the verbatim <svg> element survives rendering');
 $assert(! str_contains($safeInlineSvgSerialized, 'data:image/svg+xml,'), 'decorative inline SVG avoids image data URI noise');
 $assert(str_contains($safeInlineSvgSerialized, '<svg viewBox="0 0 16 16"'), 'decorative icon SVG markup is preserved verbatim with correct-case viewBox');
 
 $safeInlineSvgAsset = ( new HtmlTransformer() )->transform(
     '<svg role="img" aria-label="Status badge" viewBox="0 0 10 10"><title>Status badge</title><circle cx="5" cy="5" r="4"></circle></svg>'
 )->toArray();
-$safeInlineSvgAssetContent = (string) ($safeInlineSvgAsset['blocks'][0]['attrs']['svg'] ?? '');
-$assert('core/icon' === ($safeInlineSvgAsset['blocks'][0]['blockName'] ?? ''), 'simple accessible inline SVG is preserved as a native core/icon block');
+$safeInlineSvgAssetContent = (string) ($safeInlineSvgAsset['blocks'][0]['attrs']['content'] ?? '');
+$assert('core/html' === ($safeInlineSvgAsset['blocks'][0]['blockName'] ?? ''), 'simple accessible inline SVG is preserved faithfully as a core/html block, not a dynamic core/icon');
 $assert(str_contains($safeInlineSvgAssetContent, 'aria-label="Status badge"') && str_contains($safeInlineSvgAssetContent, 'viewBox="0 0 10 10"'), 'safe accessible inline SVG preserves its accessible label and correct-case viewBox in faithful markup');
 $assert(array() === ($safeInlineSvgAsset['assets'] ?? array()), 'safe accessible inline SVG icon does not generate an image asset');
 $assert(! str_contains((string) ($safeInlineSvgAsset['serialized_blocks'] ?? ''), 'data:image/svg+xml,'), 'safe accessible inline SVG avoids data URI serialization');
@@ -822,8 +822,8 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $complexSvgAsset = ( new HtmlTransformer() )->transform(
     '<svg role="img" aria-label="Site illustration" viewBox="0 0 400 200"><title>Site illustration</title><path d="M0 0h400v200H0z"></path></svg>'
 )->toArray();
-$complexSvgContent = (string) ($complexSvgAsset['blocks'][0]['attrs']['svg'] ?? '');
-$assert('core/icon' === ($complexSvgAsset['blocks'][0]['blockName'] ?? ''), 'large illustrative inline SVG is preserved inline as a native core/icon block');
+$complexSvgContent = (string) ($complexSvgAsset['blocks'][0]['attrs']['content'] ?? '');
+$assert('core/html' === ($complexSvgAsset['blocks'][0]['blockName'] ?? ''), 'large illustrative inline SVG is preserved inline as a core/html block (WordPress blocks SVG uploads, so an externalized .svg asset would not render)');
 $assert(array() === ($complexSvgAsset['assets'] ?? array()), 'inline illustrative SVG is not externalized to a generated .svg image asset');
 $assert(str_contains($complexSvgContent, '<svg') && str_contains($complexSvgContent, 'viewBox="0 0 400 200"'), 'inline illustrative SVG preserves its viewBox casing so it scales correctly');
 $assert(str_contains($complexSvgContent, 'role="img"') && str_contains($complexSvgContent, 'aria-label="Site illustration"'), 'inline illustrative SVG preserves accessibility attributes');
@@ -841,8 +841,8 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $assert(str_contains((string) ($texClassBlocks[1]['attrs']['content'] ?? ''), 'a^2 + b^2 = c^2'), 'TeX-delimited math preserves expression content');
 
 $unsafeInlineSvg = ( new HtmlTransformer() )->transform('<main><svg onload="alert(1)"><path d="M0 0h1v1z"></path></svg></main>')->toArray();
-$unsafeInlineSvgContent = (string) ($unsafeInlineSvg['blocks'][0]['attrs']['svg'] ?? '');
-$assert('core/icon' === ($unsafeInlineSvg['blocks'][0]['blockName'] ?? ''), 'unsafe inline SVG is sanitized and preserved as a native core/icon block instead of being dropped');
+$unsafeInlineSvgContent = (string) ($unsafeInlineSvg['blocks'][0]['attrs']['content'] ?? '');
+$assert('core/html' === ($unsafeInlineSvg['blocks'][0]['blockName'] ?? ''), 'unsafe inline SVG is sanitized and preserved as a core/html block instead of being dropped');
 $assert(array() === ($unsafeInlineSvg['fallbacks'] ?? array()), 'inline SVG with stripped unsafe parts keeps its artwork and emits no fallback diagnostic');
 $assert(str_contains($unsafeInlineSvgContent, '<svg') && str_contains($unsafeInlineSvgContent, '<path'), 'sanitized inline SVG keeps its shape markup');
 $assert(! str_contains($unsafeInlineSvgContent, 'onload'), 'sanitized inline SVG strips event-handler attributes while keeping the shapes');
@@ -1191,7 +1191,7 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $assert('runtime_island_preserved' === ($preservedRuntimeDiagnostics[0]['diagnostic_class'] ?? ''), 'preserved_runtime_island diagnostic exposes runtime-island diagnostic class');
 $assert('accepted_runtime_preservation' === ($preservedRuntimeDiagnostics[0]['preservation_status'] ?? ''), 'preserved_runtime_island diagnostic exposes accepted preservation status');
 $assertNormalizedFallbackDiagnostic($diagnosticsByCode['html_iframe_embed_fallback'] ?? array(), 'html_iframe_embed_fallback', 'warning', 'third_party_embed_runtime', 'embed');
-$assert(! isset($diagnosticsByCode['html_inline_svg_fallback']), 'safe inline SVGs convert to core/icon blocks instead of fallback diagnostics');
+$assert(! isset($diagnosticsByCode['html_inline_svg_fallback']), 'safe inline SVGs convert to inline core/html blocks instead of fallback diagnostics');
 $assert(! isset($diagnosticsByCode['html_canvas_runtime_fallback']), 'non-runtime canvas does not emit runtime canvas fallback diagnostics');
 
 $coffeeFixturePath = dirname(__DIR__, 3) . '/fixtures/websites/2-onepager-coffee/index.html';
@@ -1356,8 +1356,8 @@ public function match(DOMElement $element, PatternContext $context): ?array
 $unsafeDecorativeSvg = ( new HtmlTransformer() )->transform(
     '<main><svg aria-hidden="true" viewBox="0 0 10 10"><script>alert(1)</script><circle onclick="alert(1)" cx="5" cy="5" r="5"></circle></svg></main>'
 )->toArray();
-$unsafeDecorativeContent = (string) ($unsafeDecorativeSvg['blocks'][0]['attrs']['svg'] ?? '');
-$assert('core/icon' === ($unsafeDecorativeSvg['blocks'][0]['blockName'] ?? ''), 'unsafe decorative inline SVG is sanitized and preserved as a native core/icon block rather than dropped');
+$unsafeDecorativeContent = (string) ($unsafeDecorativeSvg['blocks'][0]['attrs']['content'] ?? '');
+$assert('core/html' === ($unsafeDecorativeSvg['blocks'][0]['blockName'] ?? ''), 'unsafe decorative inline SVG is sanitized and preserved as a core/html block rather than dropped');
 $assert(array() === ($unsafeDecorativeSvg['source_reports']['conversion_report']['fallback_diagnostics'] ?? array()), 'sanitized decorative inline SVG keeps its artwork and emits no fallback diagnostic');
 $assert(str_contains($unsafeDecorativeContent, '<circle'), 'unsafe decorative inline SVG keeps its shape markup after sanitization');
 $assert(! str_contains($unsafeDecorativeContent, '<script'), 'unsafe decorative inline SVG strips scripts while keeping the shapes');
@@ -1490,9 +1490,9 @@ public function match(DOMElement $element, PatternContext $context): ?array
         'generated_html' => '<svg role="img" aria-label="Inline logo" viewBox="0 0 12 12"><title>Inline logo</title><path d="M0 0h12v12H0z"></path></svg>',
     )
 )->toArray();
-$artifactInlineSvgContent = (string) ($artifactInlineSvg['blocks'][0]['attrs']['svg'] ?? '');
+$artifactInlineSvgContent = (string) ($artifactInlineSvg['blocks'][0]['attrs']['content'] ?? '');
 $artifactInlineSvgAssets = $artifactInlineSvg['source_reports']['materialization_plan']['assets'] ?? array();
-$assert('core/icon' === ($artifactInlineSvg['blocks'][0]['blockName'] ?? ''), 'artifact safe inline SVG is preserved inline as a native core/icon block');
+$assert('core/html' === ($artifactInlineSvg['blocks'][0]['blockName'] ?? ''), 'artifact safe inline SVG is preserved inline as a core/html block (WordPress blocks SVG uploads, so an externalized .svg asset would not render)');
 $assert(array() === $artifactInlineSvgAssets, 'artifact safe inline SVG is not externalized to a generated .svg image asset');
 $assert(str_contains($artifactInlineSvgContent, 'aria-label="Inline logo"'), 'artifact inline SVG block preserves sanitized SVG content');
 $assert(! str_contains((string) ($artifactInlineSvg['serialized_blocks'] ?? ''), 'data:image/svg+xml,'), 'artifact safe inline SVG avoids data URI serialization');
@@ -1507,7 +1507,7 @@ public function match(DOMElement $element, PatternContext $context): ?array
     )
 )->toArray();
 $artifactNonEntryInlineSvgPage = $artifactNonEntryInlineSvg['source_reports']['materialization_plan']['pages'][1] ?? array();
-$assert(str_contains((string) ($artifactNonEntryInlineSvgPage['block_markup'] ?? ''), '<!-- wp:icon'), 'non-entry artifact simple icon SVG is preserved as a native core/icon block');
+$assert(str_contains((string) ($artifactNonEntryInlineSvgPage['block_markup'] ?? ''), '<!-- wp:html'), 'non-entry artifact simple icon SVG is preserved faithfully as a core/html block, not a dynamic core/icon');
 $assert(str_contains((string) ($artifactNonEntryInlineSvgPage['block_markup'] ?? ''), 'aria-label="About icon"') && str_contains((string) ($artifactNonEntryInlineSvgPage['block_markup'] ?? ''), 'viewBox="0 0 8 8"'), 'non-entry artifact faithful SVG preserves its accessible label and correct-case viewBox');
 $assert(array() === ($artifactNonEntryInlineSvg['source_reports']['materialization_plan']['assets'] ?? array()), 'non-entry artifact simple icon SVG does not materialize a generated image asset');
 
diff --git a/php-transformer/tests/fixtures/parity/html-background-icon-media-patterns.json b/php-transformer/tests/fixtures/parity/html-background-icon-media-patterns.json
index f4cc038a..18118657 100644
--- a/php-transformer/tests/fixtures/parity/html-background-icon-media-patterns.json
+++ b/php-transformer/tests/fixtures/parity/html-background-icon-media-patterns.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-background-icon-media-patterns",
-  "description": "Converts generic background-image heroes into core media blocks and preserves icon-like SVG card media as core/icon (verbatim svg with correct-case viewBox), without fallbacks.",
+  "description": "Converts generic background-image heroes into core media blocks and preserves icon-like SVG card media faithfully as core/html (verbatim svg with correct-case viewBox), without fallbacks.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-background-icon-media-patterns.json",
@@ -21,7 +21,7 @@
     { "path": "blocks.0.innerBlocks.1.innerBlocks.0", "name": "core/heading", "attrs": { "content": "Care that meets you", "level": 1 } },
     { "path": "blocks.1", "name": "core/group", "attrs": { "className": "feature-card" } },
     { "path": "blocks.1.innerBlocks.0", "name": "core/group", "attrs": { "className": "feature-icon" } },
-    { "path": "blocks.1.innerBlocks.0.innerBlocks.0", "name": "core/icon" },
+    { "path": "blocks.1.innerBlocks.0.innerBlocks.0", "name": "core/html" },
     { "path": "blocks.1.innerBlocks.1", "name": "core/heading", "attrs": { "content": "Fast booking", "level": 3 } }
   ],
   "expected_fallbacks": [],
@@ -30,8 +30,8 @@
     { "path": "blocks", "assert": "count", "count": 2 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:image" },
-    { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:icon" },
-    { "path": "blocks.1.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 24 24\"" },
+    { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:html" },
+    { "path": "blocks.1.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 24 24\"" },
     { "path": "source_reports.conversion_report.metrics.fallback_count", "assert": "equals", "value": 0 }
   ]
 }
diff --git a/php-transformer/tests/fixtures/parity/html-flex-media-text-columns.json b/php-transformer/tests/fixtures/parity/html-flex-media-text-columns.json
index 68167860..ba6e8a06 100644
--- a/php-transformer/tests/fixtures/parity/html-flex-media-text-columns.json
+++ b/php-transformer/tests/fixtures/parity/html-flex-media-text-columns.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-flex-media-text-columns",
-  "description": "Converts two-child flex media/text rows with direct illustrative SVG children as flex groups, preserving the SVG inline as a core/icon block.",
+  "description": "Converts two-child flex media/text rows with direct illustrative SVG children as flex groups, preserving the SVG inline as a core/html block (WordPress blocks SVG uploads, so an externalized .svg asset would not render).",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-flex-media-text-columns.json",
@@ -17,7 +17,7 @@
   },
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "layout": { "type": "flex" } } },
-    { "path": "blocks.0.innerBlocks.0", "name": "core/icon" },
+    { "path": "blocks.0.innerBlocks.0", "name": "core/html" },
     { "path": "blocks.0.innerBlocks.1", "name": "core/group" },
     { "path": "blocks.0.innerBlocks.1.innerBlocks.0", "name": "core/heading", "attrs": { "content": "Paw Width", "level": 3 } },
     { "path": "blocks.0.innerBlocks.1.innerBlocks.1", "name": "core/paragraph", "attrs": { "content": "Measure the widest point while standing." } }
@@ -28,8 +28,8 @@
     { "path": "metrics.block_count", "assert": "equals", "value": 5 },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 2 },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\"" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "WIDTH" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\"" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "WIDTH" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "source_reports.conversion_report.metrics.fallback_count", "assert": "equals", "value": 0 }
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-artwork-preserved.json b/php-transformer/tests/fixtures/parity/html-inline-svg-artwork-preserved.json
index 6f782b1c..cace47dd 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-artwork-preserved.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-artwork-preserved.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-artwork-preserved",
-  "description": "Preserves a full inline SVG illustration (rect/circle/path/g/polygon/text plus a comment) as sanitized inline core/icon when the source identifies it as artwork. Unsafe parts carried on the same SVG (an inline <script> and an event-handler attribute) are stripped while the artwork survives, so the graphic never collapses to an empty block.",
+  "description": "Preserves a full inline SVG illustration (rect/circle/path/g/polygon/text plus a comment) as sanitized inline core/html when the source identifies it as artwork. Unsafe parts carried on the same SVG (an inline <script> and an event-handler attribute) are stripped while the artwork survives, so the graphic never collapses to an empty block.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-artwork-preserved.json",
@@ -17,24 +17,24 @@
   },
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "className": "album-art" } },
-    { "path": "blocks.0.innerBlocks.0", "name": "core/icon" }
+    { "path": "blocks.0.innerBlocks.0", "name": "core/html" }
   ],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 1 },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 600 600\" role=\"img\" aria-label=\"Mara Vale cover\">" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<!-- Background -->" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<rect width=\"600\" height=\"600\" fill=\"#1a1a2e\"></rect>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<circle cx=\"300\" cy=\"240\" r=\"160\" fill=\"#e94560\"></circle>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<path d=\"M100 400 L300 300 L500 400 Z\" fill=\"#0f3460\"></path>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<polygon points=\"50,50 100,50 75,90\" fill=\"#fff\"></polygon>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "Between the Fog and the Fire" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "data:image/svg+xml" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "<script" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "onclick" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "track()" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 600 600\" role=\"img\" aria-label=\"Mara Vale cover\" width=\"600\" height=\"600\">" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<!-- Background -->" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<rect width=\"600\" height=\"600\" fill=\"#1a1a2e\"></rect>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<circle cx=\"300\" cy=\"240\" r=\"160\" fill=\"#e94560\"></circle>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<path d=\"M100 400 L300 300 L500 400 Z\" fill=\"#0f3460\"></path>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<polygon points=\"50,50 100,50 75,90\" fill=\"#fff\"></polygon>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "Between the Fog and the Fire" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "data:image/svg+xml" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "<script" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "onclick" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "track()" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
   ]
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-benefit-icon-faithful.json b/php-transformer/tests/fixtures/parity/html-inline-svg-benefit-icon-faithful.json
index 9211e134..9fe11b67 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-benefit-icon-faithful.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-benefit-icon-faithful.json
@@ -1,11 +1,11 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-benefit-icon-faithful",
-  "description": "Imported feature/benefit inline SVGs are preserved as core/icon so the verbatim <svg> element, its sizing class (e.g. benefit-icon), and its correct-case viewBox survive rendering.",
+  "description": "Imported feature/benefit inline SVGs are preserved faithfully as core/html so the verbatim <svg> element, its sizing class (e.g. benefit-icon), and its correct-case viewBox survive rendering. They are never routed through the dynamic core/icon block, which is keyed on a registry slug and discards inline SVG markup (rendering empty).",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-benefit-icon-faithful.json",
-    "notes": "Regression guard: imported feature icons use core/icon with verbatim sanitized SVG markup so element + class + viewBox case survive."
+    "notes": "Regression guard: core/icon discards arbitrary inline SVG (render_block_core_icon returns empty without a registry slug), so imported feature icons must use faithful core/html passthrough that keeps element + class + viewBox case."
   },
   "legacy_comparison": {
     "skip": true,
@@ -18,7 +18,7 @@
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "className": "features" } },
     { "path": "blocks.0.innerBlocks.0", "name": "core/group", "attrs": { "className": "feature" } },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/icon" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/html" },
     { "path": "blocks.0.innerBlocks.0.innerBlocks.1", "name": "core/heading", "attrs": { "content": "Fast", "level": 3 } }
   ],
   "expect": [
@@ -26,8 +26,8 @@
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "assets", "assert": "count", "count": 0 },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "class=\"benefit-icon\"" },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "viewBox=\"0 0 24 24\"" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "class=\"benefit-icon\"" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "viewBox=\"0 0 24 24\"" },
     { "path": "serialized_blocks", "assert": "contains", "value": "<svg class=\"benefit-icon\" viewBox=\"0 0 24 24\"" },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
   ]
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-decorative.json b/php-transformer/tests/fixtures/parity/html-inline-svg-decorative.json
index ce3d2c65..4b4ea88d 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-decorative.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-decorative.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-decorative",
-  "description": "Consumes safe decorative inline SVG separators and preserves simple accessible icon SVGs as core/icon (verbatim svg element, class, and correct-case viewBox) without fallback noise.",
+  "description": "Consumes safe decorative inline SVG separators and preserves simple accessible icon SVGs faithfully as core/html (verbatim svg element, class, and correct-case viewBox) without fallback noise.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-decorative.json",
@@ -18,14 +18,14 @@
   "expected_blocks": [
     { "path": "blocks.0.innerBlocks.0", "name": "core/heading", "attrs": { "content": "Before", "level": 2 } },
     { "path": "blocks.0.innerBlocks.1", "name": "core/paragraph", "attrs": { "content": "After" } },
-    { "path": "blocks.0.innerBlocks.2", "name": "core/icon" }
+    { "path": "blocks.0.innerBlocks.2", "name": "core/html" }
   ],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 3 },
-    { "path": "blocks.0.innerBlocks.2.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 32 32\"" },
-    { "path": "blocks.0.innerBlocks.2.attrs.svg", "assert": "contains", "value": "aria-label=\"Acme integration\"" },
+    { "path": "blocks.0.innerBlocks.2.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 32 32\"" },
+    { "path": "blocks.0.innerBlocks.2.attrs.content", "assert": "contains", "value": "aria-label=\"Acme integration\"" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-diagram-preserved.json b/php-transformer/tests/fixtures/parity/html-inline-svg-diagram-preserved.json
index 63a402a6..7b32e0bf 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-diagram-preserved.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-diagram-preserved.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-diagram-preserved",
-  "description": "Preserves an aria-hidden inline SVG diagram built from the full set of safe structure/geometry elements (defs/linearGradient/stop, line/polyline/polygon/ellipse/circle/rect) plus HTML comments as a core/icon block. aria-hidden marks the diagram decorative for assistive tech but never makes the artwork disposable: the SVG passes the safe-decorative classification yet must still survive instead of collapsing to an empty block or a comments-only shell. Unsafe parts carried on the same SVG (an inline <script> and an event-handler attribute) are stripped while the artwork is kept.",
+  "description": "Preserves an aria-hidden inline SVG diagram built from the full set of safe structure/geometry elements (defs/linearGradient/stop, line/polyline/polygon/ellipse/circle/rect) plus HTML comments, faithfully as a core/html block. aria-hidden marks the diagram decorative for assistive tech but never makes the artwork disposable: the SVG passes the safe-decorative classification yet must still survive instead of collapsing to an empty block or a comments-only shell. Unsafe parts carried on the same SVG (an inline <script> and an event-handler attribute) are stripped while the artwork is kept.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-diagram-preserved.json",
@@ -17,25 +17,25 @@
   },
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "className": "system-diagram" } },
-    { "path": "blocks.0.innerBlocks.0", "name": "core/icon" }
+    { "path": "blocks.0.innerBlocks.0", "name": "core/html" }
   ],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 1 },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 400 300\" aria-hidden=\"true\">" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<linearGradient id=\"pipe-grad\"" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<stop offset=\"0%\" stop-color=\"#88c\"></stop>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<line x1=\"200\" y1=\"0\" x2=\"200\" y2=\"300\" stroke=\"#333\" stroke-width=\"6\"></line>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<polyline points=\"200,150 320,150 320,260\" fill=\"none\" stroke=\"#06c\" stroke-width=\"4\"></polyline>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<polygon points=\"40,40 100,40 70,92\" fill=\"url(#pipe-grad)\"></polygon>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<ellipse cx=\"120\" cy=\"210\" rx=\"44\" ry=\"22\" fill=\"#3a3\"></ellipse>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<circle cx=\"320\" cy=\"260\" r=\"8\" fill=\"#e94560\"></circle>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<rect width=\"24\" height=\"24\" fill=\"#1a1a2e\"></rect>" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "<script" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "onclick" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "track()" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 400 300\" aria-hidden=\"true\" width=\"400\" height=\"300\">" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<linearGradient id=\"pipe-grad\"" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<stop offset=\"0%\" stop-color=\"#88c\"></stop>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<line x1=\"200\" y1=\"0\" x2=\"200\" y2=\"300\" stroke=\"#333\" stroke-width=\"6\"></line>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<polyline points=\"200,150 320,150 320,260\" fill=\"none\" stroke=\"#06c\" stroke-width=\"4\"></polyline>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<polygon points=\"40,40 100,40 70,92\" fill=\"url(#pipe-grad)\"></polygon>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<ellipse cx=\"120\" cy=\"210\" rx=\"44\" ry=\"22\" fill=\"#3a3\"></ellipse>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<circle cx=\"320\" cy=\"260\" r=\"8\" fill=\"#e94560\"></circle>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<rect width=\"24\" height=\"24\" fill=\"#1a1a2e\"></rect>" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "<script" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "onclick" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "track()" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
   ]
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-fallback.json b/php-transformer/tests/fixtures/parity/html-inline-svg-fallback.json
index 7843ceed..85a4592c 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-fallback.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-fallback.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-fallback",
-  "description": "Preserves simple accessible inline SVG as a core/icon block (verbatim svg, accessible label, correct-case viewBox) while preserving supported siblings.",
+  "description": "Preserves simple accessible inline SVG faithfully as a core/html block (verbatim svg, accessible label, correct-case viewBox) while preserving supported siblings.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-fallback.json",
@@ -17,14 +17,14 @@
   },
   "expected_blocks": [
     { "path": "blocks.0.innerBlocks.0", "name": "core/heading", "attrs": { "content": "Icon row", "level": 2 } },
-    { "path": "blocks.0.innerBlocks.1", "name": "core/icon" }
+    { "path": "blocks.0.innerBlocks.1", "name": "core/html" }
   ],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
-    { "path": "blocks.0.innerBlocks.1.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 10 10\"" },
-    { "path": "blocks.0.innerBlocks.1.attrs.svg", "assert": "contains", "value": "aria-label=\"Status\"" },
+    { "path": "blocks.0.innerBlocks.1.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 10 10\"" },
+    { "path": "blocks.0.innerBlocks.1.attrs.content", "assert": "contains", "value": "aria-label=\"Status\"" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
   ]
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-local-use-symbol.json b/php-transformer/tests/fixtures/parity/html-inline-svg-local-use-symbol.json
index 924dd2c1..522a821d 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-local-use-symbol.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-local-use-symbol.json
@@ -29,7 +29,7 @@
     },
     {
       "path": "blocks.0.innerBlocks.0.innerBlocks.0",
-      "name": "core/icon"
+      "name": "core/html"
     }
   ],
   "expect": [
@@ -39,22 +39,22 @@
       "value": "success"
     },
     {
-      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg",
+      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content",
       "assert": "contains",
       "value": "<symbol id=\"valve\"><circle cx=\"6\" cy=\"6\" r=\"5\" fill=\"#e94560\"></circle></symbol>"
     },
     {
-      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg",
+      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content",
       "assert": "contains",
       "value": "<use href=\"#valve\" x=\"0\" y=\"0\"></use>"
     },
     {
-      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg",
+      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content",
       "assert": "contains",
       "value": "<use href=\"#valve\" x=\"24\" y=\"0\"></use>"
     },
     {
-      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg",
+      "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content",
       "assert": "not_contains",
       "value": "icons.svg#gear"
     },
@@ -79,4 +79,4 @@
       "value": "svg"
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-native-icon-sizing.json b/php-transformer/tests/fixtures/parity/html-inline-svg-native-icon-sizing.json
deleted file mode 100644
index 42b5ee48..00000000
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-native-icon-sizing.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  "schema": "blocks-engine/php-transformer/parity-fixture/v1",
-  "name": "html-inline-svg-native-icon-sizing",
-  "description": "Converts safe inline SVG icons and illustrations to native core/icon while keeping the source SVG sizing hooks, and converts decorative SVGs inside button-like links to native core/button labels without core/html fallback blocks.",
-  "source_reference": {
-    "repo": "php-transformer",
-    "path": "tests/fixtures/parity/html-inline-svg-native-icon-sizing.json",
-    "notes": "Distilled coverage for decorative icon SVG, sized hero SVG with viewBox/class/style sizing, and SVG inside a button-like link."
-  },
-  "legacy_comparison": {
-    "skip": true,
-    "reason": "This upstream primitive fixture has no downstream legacy comparison."
-  },
-  "operation": "html_transformer.transform",
-  "input": {
-    "content": "<main><svg class=\"status-icon\" width=\"24\" height=\"24\" viewBox=\"0 0 24 24\" aria-hidden=\"true\"><circle cx=\"12\" cy=\"12\" r=\"10\"></circle></svg><svg class=\"hero-flame-svg\" viewBox=\"0 0 100 160\" style=\"width:120px;height:auto\" role=\"img\" aria-label=\"Hero flame\"><defs><linearGradient id=\"flame-grad\" x1=\"50\" y1=\"0\" x2=\"50\" y2=\"160\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0%\" stop-color=\"#ff9060\"></stop><stop offset=\"100%\" stop-color=\"#e06012\"></stop></linearGradient></defs><path d=\"M50 0 C90 56 82 122 50 160 C18 122 10 56 50 0Z\" fill=\"url(#flame-grad)\"></path></svg><a class=\"icon-cta\" href=\"/reserve\"><svg width=\"16\" height=\"16\" viewBox=\"0 0 16 16\" aria-hidden=\"true\"><path d=\"M2 8h12\"></path></svg><span>Reserve</span></a></main>"
-  },
-  "expected_blocks": [
-    { "path": "blocks.0", "name": "core/group" },
-    { "path": "blocks.0.innerBlocks.0", "name": "core/icon" },
-    { "path": "blocks.0.innerBlocks.1", "name": "core/icon" },
-    { "path": "blocks.0.innerBlocks.2", "name": "core/buttons" },
-    { "path": "blocks.0.innerBlocks.2.innerBlocks.0", "name": "core/button", "attrs": { "className": "icon-cta", "text": "Reserve", "url": "/reserve" } }
-  ],
-  "expected_fallbacks": [],
-  "expect": [
-    { "path": "status", "assert": "equals", "value": "success" },
-    { "path": "fallbacks", "assert": "count", "count": 0 },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "width=\"24\" height=\"24\" viewBox=\"0 0 24 24\"" },
-    { "path": "blocks.0.innerBlocks.0.attrs.ariaHidden", "assert": "equals", "value": true },
-    { "path": "blocks.0.innerBlocks.1.attrs.svg", "assert": "contains", "value": "class=\"hero-flame-svg\"" },
-    { "path": "blocks.0.innerBlocks.1.attrs.svg", "assert": "contains", "value": "viewBox=\"0 0 100 160\"" },
-    { "path": "blocks.0.innerBlocks.1.attrs.svg", "assert": "contains", "value": "style=\"width:120px;height:auto\"" },
-    { "path": "blocks.0.innerBlocks.1.attrs.label", "assert": "equals", "value": "Hero flame" },
-    { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:icon" },
-    { "path": "serialized_blocks", "assert": "contains", "value": "<svg class=\"hero-flame-svg\" viewBox=\"0 0 100 160\" style=\"width:120px;height:auto\"" },
-    { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:button" },
-    { "path": "serialized_blocks", "assert": "not_contains", "value": "<!-- wp:html" },
-    { "path": "assets", "assert": "count", "count": 0 },
-    { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
-  ]
-}
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-sized-html-valid.json b/php-transformer/tests/fixtures/parity/html-inline-svg-sized-html-valid.json
new file mode 100644
index 00000000..1b924b9a
--- /dev/null
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-sized-html-valid.json
@@ -0,0 +1,38 @@
+{
+  "schema": "blocks-engine/php-transformer/parity-fixture/v1",
+  "name": "html-inline-svg-sized-html-valid",
+  "description": "Preserves arbitrary safe inline SVG as sanitized core/html with explicit intrinsic sizing derived from viewBox, while decorative SVGs inside button-like links are stripped from native core/button labels.",
+  "source_reference": {
+    "repo": "php-transformer",
+    "path": "tests/fixtures/parity/html-inline-svg-sized-html-valid.json",
+    "notes": "Distilled coverage for viewBox-only decorative SVG, sized hero SVG, and SVG inside a button-like link after core/icon was proven dynamic/registry-bound in WordPress."
+  },
+  "legacy_comparison": {
+    "skip": true,
+    "reason": "This upstream primitive fixture has no downstream legacy comparison."
+  },
+  "operation": "html_transformer.transform",
+  "input": {
+    "content": "<main><svg class=\"status-icon\" viewBox=\"0 0 24 24\" aria-hidden=\"true\"><circle cx=\"12\" cy=\"12\" r=\"10\"></circle></svg><svg class=\"hero-flame-svg\" viewBox=\"0 0 100 160\" role=\"img\" aria-label=\"Hero flame\"><defs><linearGradient id=\"flame-grad\" x1=\"50\" y1=\"0\" x2=\"50\" y2=\"160\" gradientUnits=\"userSpaceOnUse\"><stop offset=\"0%\" stop-color=\"#ff9060\"></stop><stop offset=\"100%\" stop-color=\"#e06012\"></stop></linearGradient></defs><path d=\"M50 0 C90 56 82 122 50 160 C18 122 10 56 50 0Z\" fill=\"url(#flame-grad)\"></path></svg><a class=\"icon-cta\" href=\"/reserve\"><svg width=\"16\" height=\"16\" viewBox=\"0 0 16 16\" aria-hidden=\"true\"><path d=\"M2 8h12\"></path></svg><span>Reserve</span></a></main>"
+  },
+  "expected_blocks": [
+    { "path": "blocks.0", "name": "core/group" },
+    { "path": "blocks.0.innerBlocks.0", "name": "core/html" },
+    { "path": "blocks.0.innerBlocks.1", "name": "core/html" },
+    { "path": "blocks.0.innerBlocks.2", "name": "core/buttons" },
+    { "path": "blocks.0.innerBlocks.2.innerBlocks.0", "name": "core/button", "attrs": { "className": "icon-cta", "text": "Reserve", "url": "/reserve" } }
+  ],
+  "expected_fallbacks": [],
+  "expect": [
+    { "path": "status", "assert": "equals", "value": "success" },
+    { "path": "fallbacks", "assert": "count", "count": 0 },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg class=\"status-icon\" viewBox=\"0 0 24 24\" aria-hidden=\"true\" width=\"24\" height=\"24\">" },
+    { "path": "blocks.0.innerBlocks.1.attrs.content", "assert": "contains", "value": "<svg class=\"hero-flame-svg\" viewBox=\"0 0 100 160\" role=\"img\" aria-label=\"Hero flame\" width=\"100\" height=\"160\">" },
+    { "path": "blocks.0.innerBlocks.1.attrs.content", "assert": "contains", "value": "<linearGradient id=\"flame-grad\"" },
+    { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:html" },
+    { "path": "serialized_blocks", "assert": "contains", "value": "<!-- wp:button" },
+    { "path": "serialized_blocks", "assert": "not_contains", "value": "<!-- wp:icon" },
+    { "path": "assets", "assert": "count", "count": 0 },
+    { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
+  ]
+}
diff --git a/php-transformer/tests/fixtures/parity/html-inline-svg-unsafe.json b/php-transformer/tests/fixtures/parity/html-inline-svg-unsafe.json
index b74c1e96..3a3bdb27 100644
--- a/php-transformer/tests/fixtures/parity/html-inline-svg-unsafe.json
+++ b/php-transformer/tests/fixtures/parity/html-inline-svg-unsafe.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-inline-svg-unsafe",
-  "description": "Sanitizes unsafe inline SVG in place — stripping scripts, event handlers, and javascript: URLs — while preserving the shape markup as a native core/icon block instead of dropping the whole graphic.",
+  "description": "Sanitizes unsafe inline SVG in place — stripping scripts, event handlers, and javascript: URLs — while preserving the shape markup as a faithful core/html block instead of dropping the whole graphic.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-inline-svg-unsafe.json",
@@ -16,20 +16,20 @@
     "content": "<svg viewBox=\"0 0 20 20\" onclick=\"alert(1)\"><script>alert(2)</script><a xlink:href=\"javascript:alert(3)\"><circle onmouseover=\"alert(4)\" cx=\"10\" cy=\"10\" r=\"8\"></circle></a></svg><p>After</p>"
   },
   "expected_blocks": [
-    { "path": "blocks.0", "name": "core/icon" },
+    { "path": "blocks.0", "name": "core/html" },
     { "path": "blocks.1", "name": "core/paragraph", "attrs": { "content": "After" } }
   ],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks", "assert": "count", "count": 2 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
-    { "path": "blocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\">" },
-    { "path": "blocks.0.attrs.svg", "assert": "contains", "value": "<circle cx=\"10\" cy=\"10\" r=\"8\"></circle>" },
-    { "path": "blocks.0.attrs.svg", "assert": "not_contains", "value": "<script" },
-    { "path": "blocks.0.attrs.svg", "assert": "not_contains", "value": "onclick" },
-    { "path": "blocks.0.attrs.svg", "assert": "not_contains", "value": "onmouseover" },
-    { "path": "blocks.0.attrs.svg", "assert": "not_contains", "value": "javascript:" },
-    { "path": "blocks.0.attrs.svg", "assert": "not_contains", "value": "alert(" },
+    { "path": "blocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\" width=\"20\" height=\"20\">" },
+    { "path": "blocks.0.attrs.content", "assert": "contains", "value": "<circle cx=\"10\" cy=\"10\" r=\"8\"></circle>" },
+    { "path": "blocks.0.attrs.content", "assert": "not_contains", "value": "<script" },
+    { "path": "blocks.0.attrs.content", "assert": "not_contains", "value": "onclick" },
+    { "path": "blocks.0.attrs.content", "assert": "not_contains", "value": "onmouseover" },
+    { "path": "blocks.0.attrs.content", "assert": "not_contains", "value": "javascript:" },
+    { "path": "blocks.0.attrs.content", "assert": "not_contains", "value": "alert(" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
   ]
diff --git a/php-transformer/tests/fixtures/parity/html-product-card-svg-price-grid.json b/php-transformer/tests/fixtures/parity/html-product-card-svg-price-grid.json
index 180fe26e..52cd3ed6 100644
--- a/php-transformer/tests/fixtures/parity/html-product-card-svg-price-grid.json
+++ b/php-transformer/tests/fixtures/parity/html-product-card-svg-price-grid.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-product-card-svg-price-grid",
-  "description": "Preserves product cards with illustrative inline SVG imagery as sanitized inline core/icon blocks, product names, prices, and CTA buttons inside a card grid.",
+  "description": "Preserves product cards with illustrative inline SVG imagery as sanitized inline core/html blocks, product names, prices, and CTA buttons inside a card grid.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-product-card-svg-price-grid.json",
@@ -18,7 +18,7 @@
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "className": "product-grid", "layout": { "type": "grid" } } },
     { "path": "blocks.0.innerBlocks.0", "name": "core/group", "attrs": { "className": "product-card" } },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/icon" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/html" },
     { "path": "blocks.0.innerBlocks.0.innerBlocks.1", "name": "core/heading", "attrs": { "className": "product-name", "content": "Ceramic Bowl", "level": 3 } },
     { "path": "blocks.0.innerBlocks.0.innerBlocks.2", "name": "core/paragraph", "attrs": { "className": "product-price", "content": "$42" } },
     { "path": "blocks.0.innerBlocks.0.innerBlocks.3", "name": "core/buttons" },
@@ -30,9 +30,9 @@
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 2 },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg class=\"product-image\" role=\"img\" aria-label=\"Ceramic bowl\" viewBox=\"0 0 10 10\">" },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<circle cx=\"5\" cy=\"5\" r=\"4\"></circle>" },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "not_contains", "value": "data:image/svg+xml" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg class=\"product-image\" role=\"img\" aria-label=\"Ceramic bowl\" viewBox=\"0 0 10 10\" width=\"10\" height=\"10\">" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<circle cx=\"5\" cy=\"5\" r=\"4\"></circle>" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "not_contains", "value": "data:image/svg+xml" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "serialized_blocks", "assert": "contains", "value": "product-price" },
     { "path": "source_reports.html.structure_signals.3.signals.price_like", "assert": "equals", "value": true },
diff --git a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json
index db99f046..4b3e6947 100644
--- a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json
+++ b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-single-child-flex-svg-address",
-  "description": "Preserves single-child flex wrappers with safe illustrative inline SVG (kept inline as a core/icon block) and readable address line breaks without unsupported fallbacks.",
+  "description": "Preserves single-child flex wrappers with safe illustrative inline SVG (kept inline as a core/html block, since WordPress blocks SVG uploads and an externalized .svg asset would not render) and readable address line breaks without unsupported fallbacks.",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-single-child-flex-svg-address.json",
@@ -18,15 +18,15 @@
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group" },
     { "path": "blocks.0.innerBlocks.0", "name": "core/group", "attrs": { "className": "illustration-frame", "layout": { "type": "flex", "justifyContent": "center" } } },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/icon" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/html" },
     { "path": "blocks.0.innerBlocks.1", "name": "core/paragraph", "attrs": { "className": "contact-card", "content": "214 Maple Street<br>Benton Harbor, MI<br><a href=\"tel:+12695550193\">(269) 555-0193</a>" } }
   ],
   "expected_fallbacks": [],
   "expect": [
     { "path": "status", "assert": "equals", "value": "success" },
     { "path": "fallbacks", "assert": "count", "count": 0 },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 40 20\"" },
-    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "Storefront illustration" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 40 20\"" },
+    { "path": "blocks.0.innerBlocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "Storefront illustration" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "serialized_blocks", "assert": "contains", "value": "Storefront illustration" },
     { "path": "coverage.0.fallback_count", "assert": "equals", "value": 0 }
diff --git a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json
index 826c60c8..cc8bcab3 100644
--- a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json
+++ b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json
@@ -1,7 +1,7 @@
 {
   "schema": "blocks-engine/php-transformer/parity-fixture/v1",
   "name": "html-single-child-flex-svg",
-  "description": "Converts a single illustrative SVG inside a flex centering wrapper without leaking failed column-probe fallbacks, preserving the SVG inline as a core/icon block.",
+  "description": "Converts a single illustrative SVG inside a flex centering wrapper without leaking failed column-probe fallbacks, preserving the SVG inline as a core/html block (WordPress blocks SVG uploads, so an externalized .svg asset would not render).",
   "source_reference": {
     "repo": "php-transformer",
     "path": "tests/fixtures/parity/html-single-child-flex-svg.json",
@@ -17,7 +17,7 @@
   },
   "expected_blocks": [
     { "path": "blocks.0", "name": "core/group", "attrs": { "layout": { "type": "flex", "justifyContent": "center" } } },
-    { "path": "blocks.0.innerBlocks.0", "name": "core/icon" }
+    { "path": "blocks.0.innerBlocks.0", "name": "core/html" }
   ],
   "expected_fallbacks": [],
   "expect": [
@@ -25,8 +25,8 @@
     { "path": "metrics.block_count", "assert": "equals", "value": 2 },
     { "path": "blocks", "assert": "count", "count": 1 },
     { "path": "blocks.0.innerBlocks", "assert": "count", "count": 1 },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\"" },
-    { "path": "blocks.0.innerBlocks.0.attrs.svg", "assert": "contains", "value": "GIRTH" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "<svg viewBox=\"0 0 20 20\"" },
+    { "path": "blocks.0.innerBlocks.0.attrs.content", "assert": "contains", "value": "GIRTH" },
     { "path": "assets", "assert": "count", "count": 0 },
     { "path": "fallbacks", "assert": "count", "count": 0 },
     { "path": "source_reports.conversion_report.metrics.fallback_count", "assert": "equals", "value": 0 }