diff --git a/e2etests-cli/main_test.go b/e2etests-cli/main_test.go
index 8d2913f6e9..e441646192 100644
--- a/e2etests-cli/main_test.go
+++ b/e2etests-cli/main_test.go
@@ -21,6 +21,7 @@ import (
 	"oss.terrastruct.com/util-go/xos"
 
 	"oss.terrastruct.com/d2/d2cli"
+	"oss.terrastruct.com/d2/lib/compression"
 	"oss.terrastruct.com/d2/lib/pptx"
 	"oss.terrastruct.com/d2/lib/xgif"
 )
@@ -1085,6 +1086,7 @@ vars: {
 				err := runTestMain(t, ctx, dir, env, filepath.Join(dir, "hello-world.d2"))
 				assert.Success(t, err)
 				svg := readFile(t, dir, "hello-world.svg")
+				svg = compression.UnzipEmbeddedSVGImages(svg)
 				assert.Testdata(t, ".svg", svg)
 			},
 		},
diff --git a/e2etests-cli/testdata/TestCLI_E2E/chain_icon_import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/chain_icon_import.exp.svg
index 12ac9ed9e7..354673b425 100644
--- a/e2etests-cli/testdata/TestCLI_E2E/chain_icon_import.exp.svg
+++ b/e2etests-cli/testdata/TestCLI_E2E/chain_icon_import.exp.svg
@@ -89,7 +89,7 @@
 		.d2-574527389 .color-AA4{color:#EDF0FD;}
 		.d2-574527389 .color-AA5{color:#F7F8FE;}
 		.d2-574527389 .color-AB4{color:#EDF0FD;}
-		.d2-574527389 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-574527389);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-574527389);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-574527389);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-574527389);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-574527389);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-574527389);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-574527389);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g class="aGVsbG8= Ecs"><g class="shape" ><ellipse rx="67.000000" ry="67.000000" cx="67.000000" cy="67.000000" stroke="#0D32B2" fill="#F7F8FE" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="data:image/svg+xml;base64,H4sIAAAAAAAA/3VU72/aMBD9VyL3yyo5Ts4/krgFpG6apklUldaWD/1SZcGBaG6CEhfaTf3fdw4gCG0FWObune/de05G3XoRvDzZuhuTpXOriyjabDZsI1jTLiIex3GECLKFXLzYqv7zERC01lGfJcG6MpuvzcuYxEEcpAq/ZDKam7KbjDr3as2EFbYL4V9ZWXvx3NovZzdtXi/MjzafV6Z255dvPYJvEWdlWV6+jaJt7Qh7mLzdY4NqPibDcuQKYwIqY7EiwSvuQwDBpMAEP0rgXiRMpSRY7Crv8JyubNqnMXF+a3NnvkCaYG0AnLM4Ow/axvloCEKdHyrv68qhgM+daW9XeWFu6vvOED9vswqasuyMQzlI4P+HRWObdkzOikwB/CbRCQxOYKWOPSYaDo6BraSucijL1VP+t6nD7zbvXFWE35ra5Yhvw1vTrqvCjKItbrToFftlStOauvAcW1Mcy/h40HGeuzys8yezzwWHXIGdcOLeSRJsqrlbjgk6HSxNtVi6fh/t2/0smvrxznTDM3006KOT0Sp3y+MzOSLH5FqkjGuaSCZlDhRojB8ImRIhAzkFSRUwyHJgcUL75Qig+YwLlrzL0l12KiTTgkLM0sPZiFMp074S4AqLFO2XbVIklEsbYolMaTKTgmlpAViKHFkG/iwBYXJ8HI2txmZU+S7vifjUYDCmwYYcOWFjfnU46EiJh2tQTFGpmZI+ngmacLyjVKVeD6FsmIWSJTAVGRMY4yzzKoCfDva9kIem8ZRLKhXjPD+ZdachzLhm8niiXdz2IoTJDB8tkaImmgI8eMs/sTJBPPbSnoig/TJ0U8UUBQVxajRyEDHyngqN6rM4/ZQqOpGoAVWOcTpwY5oAxUc5ezfw1g2YSbT/owuFTuF96CXcFewnerhG1dEPXJTNKCo/Q57+nmh886w1zjRV2DVDS4ZCYr9esmix++GrdvIfNfQXfZIFAAA=" x="43.500000" y="43.500000" width="47" height="47" /><text x="67.000000" y="41.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">hello</text></g><mask id="d2-574527389" maskUnits="userSpaceOnUse" x="-101" y="-101" width="336" height="336">
+		.d2-574527389 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-574527389);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-574527389);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-574527389);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-574527389);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-574527389);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-574527389);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-574527389);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-574527389);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]></style><g class="aGVsbG8= Ecs"><g class="shape" ><ellipse rx="67.000000" ry="67.000000" cx="67.000000" cy="67.000000" stroke="#0D32B2" fill="#F7F8FE" class="shape stroke-B1 fill-B6" style="stroke-width:2;" /></g><image href="data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNzUgNzUiPjxkZWZzPjxzdHlsZT4uY2xzLTF7ZmlsbDp1cmwoI09yYW5nZUdyYWRpZW50KTt9LmNscy0ye2ZpbGw6I2ZmZjt9PC9zdHlsZT48bGluZWFyR3JhZGllbnQgaWQ9Ik9yYW5nZUdyYWRpZW50IiB4MT0iMTU4LjA1IiB5MT0iLTExMy40MyIgeDI9IjE1OC4wNSIgeTI9IjM2LjU3IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDE3Ni40MyAxMjIuMDgpIHJvdGF0ZSgtMTM1KSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPjxzdG9wIG9mZnNldD0iMCIgc3RvcC1jb2xvcj0iI2M4NTExYiIvPjxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iI2Y5MCIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjx0aXRsZT5BbWF6b24tRWxhc3RpYy1Db250YWluZXItU2VydmljZTwvdGl0bGU+PGcgaWQ9IlJlZmVyZW5jZSI+PHJlY3QgaWQ9Ik9yYW5nZV9HcmFkaWVudCIgZGF0YS1uYW1lPSJPcmFuZ2UgR3JhZGllbnQiIGNsYXNzPSJjbHMtMSIgd2lkdGg9Ijc1IiBoZWlnaHQ9Ijc1Ii8+PGcgaWQ9Ikljb25fVGVzdCIgZGF0YS1uYW1lPSJJY29uIFRlc3QiPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTM3LjI5LDY0LjQ0YTEsMSwwLDAsMS0uNTMtLjE0TDE0LDUxLjE4YTEuMDYsMS4wNiwwLDAsMS0uNTMtLjkyVjIzLjY4YTEuMDYsMS4wNiwwLDAsMSwuNTMtLjkyTDM0LjkzLDEwLjdhMSwxLDAsMCwxLDEuNTcuOVYyMy4xMUExLjA1LDEuMDUsMCwwLDEsMzYsMjRsLTEwLjQ3LDZWNDMuOTRsMTEuNzksNi44MSwxMC4zMS02YTEsMSwwLDAsMSwxLDBsOS45Miw1LjdhMS4wNiwxLjA2LDAsMCwxLC41My45MiwxLDEsMCwwLDEtLjUzLjkxbC0yMC43NSwxMkExLDEsMCwwLDEsMzcuMjksNjQuNDRaTTE1LjUsNDkuNTQsMzcuODMsNjIuNDMsNTcsNTEuMzVsLTgtNC42MUwzOC4zNyw1Mi44OGExLjExLDEuMTEsMCwwLDEtMS4wOSwwTDI0LDQ1LjIyYTEuMDUsMS4wNSwwLDAsMS0uNTMtLjkxVjI5LjQ2YTEsMSwwLDAsMSwuNTMtLjkxbDEwLjQ3LTZWMTMuMzdsLTE5LDExWiIvPjxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTYwLjQ0LDQ5YTEuMTMsMS4xMywwLDAsMS0uNTMtLjE0TDUwLDQzLjEzYTEsMSwwLDAsMS0uNTMtLjkxVjMwLjExTDM5LDI0LjA3YTEuMDUsMS4wNSwwLDAsMS0uNTMtLjkxVjExLjY1YTEsMSwwLDAsMSwuNTItLjksMSwxLDAsMCwxLDEsMEw2MSwyMi44MmExLjA1LDEuMDUsMCwwLDEsLjUzLjkxVjQ3LjlhMS4wNiwxLjA2LDAsMCwxLS41My45MkExLjEsMS4xLDAsMCwxLDYwLjQ0LDQ5Wk01MS41LDQxLjU1bDgsNC42VjI0LjRsLTE5LTExdjkuMTNMNTEsMjguNjFhMSwxLDAsMCwxLC41My45MVoiLz48L2c+PC9nPjwvc3ZnPg==" x="43.500000" y="43.500000" width="47" height="47" /><text x="67.000000" y="41.000000" fill="#0A0F25" class="text-bold fill-N1" style="text-anchor:middle;font-size:16px">hello</text></g><mask id="d2-574527389" maskUnits="userSpaceOnUse" x="-101" y="-101" width="336" height="336">
 <rect x="-101" y="-101" width="336" height="336" fill="white"></rect>
 
 </mask></svg></svg>