diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go
index 60956b37e..19ce430f4 100644
--- a/d2renderers/d2svg/d2svg.go
+++ b/d2renderers/d2svg/d2svg.go
@@ -817,8 +817,12 @@ func drawShape(writer io.Writer, targetShape d2target.Shape, sketchRunner *d2ske
 					}
 					fmt.Fprint(writer, out)
 				} else {
-					fmt.Fprintf(writer, `<rect x="%d" y="%d" width="%d" height="%d" style="%s" />`,
-						targetShape.Pos.X, targetShape.Pos.Y, targetShape.Width, targetShape.Height, style)
+					rx := ""
+					if targetShape.BorderRadius != 0 {
+						rx = fmt.Sprintf(` rx="%d"`, targetShape.BorderRadius)
+					}
+					fmt.Fprintf(writer, `<rect x="%d" y="%d" width="%d" height="%d" style="%s"%s />`,
+						targetShape.Pos.X, targetShape.Pos.Y, targetShape.Width, targetShape.Height, style, rx)
 				}
 			} else {
 				if targetShape.Multiple {
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg
index 5ced08a2f..de2730b09 100644
--- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg
@@ -39,7 +39,7 @@ width="380" height="824" viewBox="-140 -108 380 824"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="a"><g class="shape" ><rect x="24" y="0" width="53" height="66" style="fill:#F7F8FE;stroke:#2bc3d8;stroke-width:8;rx:10;" /></g><text class="text-bold" x="50.500000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a</text></g><g id="b"><g class="shape" ><rect x="24" y="542" width="53" height="66" style="fill:#F7F8FE;stroke:#0db254;stroke-width:8;" /></g><text class="text-bold" x="50.500000" y="580.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">b</text></g><g id="c"><g class="shape" ><path d="M 69 431 L 69 366 L 122 366 L 122 431 C 113 417 104 417 96 431 C 87 446 78 446 69 431 Z" style="fill:#EDF0FD;stroke:#b2350d;stroke-width:7;"/></g><text class="text-bold" x="95.500000" y="399.610964" style="text-anchor:middle;font-size:16px;fill:#0A0F25">c</text></g><g id="Oval"><g class="shape" ><ellipse class="shape" cx="50.000000" cy="216.000000" rx="50.000000" ry="50.000000" style="fill:#F7F8FE;stroke:#a1a4af;stroke-width:6;" /></g></g><g id="(a &lt;-&gt; b)[0]"><marker id="mk-3196466557" markerWidth="30.000000" markerHeight="30.000000" refX="9.000000" refY="15.000000" viewBox="0.000000 0.000000 30.000000 30.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,15.000000 30.000000,0.000000 22.500000,15.000000 30.000000,30.000000" /> </marker><marker id="mk-1326875639" markerWidth="30.000000" markerHeight="36.000000" refX="21.000000" refY="18.000000" viewBox="0.000000 0.000000 30.000000 36.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,0.000000 30.000000,18.000000 0.000000,36.000000" /> </marker><path d="M 13.943485 66.252119 C -27.300000 104.287778 -40.000000 136.000000 -40.000000 166.000000 C -40.000000 196.000000 -40.000000 236.000000 -40.000000 266.000000 C -40.000000 296.000000 -40.000000 333.600000 -40.000000 360.000000 C -40.000000 386.400000 -27.300000 503.712222 13.943485 541.747881" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:6;stroke-dasharray:24.000000,22.141176;" marker-start="url(#mk-3196466557)" marker-end="url(#mk-1326875639)" mask="url(#2863877074)"/></g><g id="(c -&gt; b)[0]"><marker id="mk-2307423140" markerWidth="35.000000" markerHeight="42.000000" refX="24.500000" refY="21.000000" viewBox="0.000000 0.000000 35.000000 42.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#20222a" stroke-width="7" points="0.000000,0.000000 35.000000,21.000000 0.000000,42.000000" /> </marker><path d="M 95.000000 440.000000 C 95.000000 480.200000 89.600000 502.000000 74.889659 529.241372" class="connection" style="fill:none;stroke:#20222a;stroke-width:7;" marker-end="url(#mk-2307423140)" mask="url(#2863877074)"/></g><g id="(a &lt;-&gt; Oval)[0]"><marker id="mk-2920934274" markerWidth="72.600000" markerHeight="54.000000" refX="11.850000" refY="27.000000" viewBox="0.000000 0.000000 72.600000 54.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="white" stroke="#0D32B2" stroke-width="6" points="8.250000,27.000000 39.600000,6.750000 72.600000,27.000000 39.600000,47.250000" /> </marker><marker id="mk-4034884378" markerWidth="66.000000" markerHeight="42.000000" refX="57.000000" refY="21.000000" viewBox="0.000000 0.000000 66.000000 42.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,21.000000 33.000000,0.000000 66.000000,21.000000 33.000000,42.000000" /> </marker><path d="M 50.000000 79.000000 C 50.000000 106.000000 50.000000 126.000000 50.000000 154.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:6;" marker-start="url(#mk-2920934274)" marker-end="url(#mk-4034884378)" mask="url(#2863877074)"/><text class="text-italic" x="66.000000" y="158.000000" style="text-anchor:middle;font-size:16px;fill:black">*</text></g><g id="(c -- a)[0]"><path d="M 117.229469 359.789482 C 134.800000 326.000000 140.000000 296.000000 140.000000 266.000000 C 140.000000 236.000000 127.400000 104.400000 82.517737 63.079821" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:7;" mask="url(#2863877074)"/></g><g id="(Oval &lt;-&gt; c)[0]"><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 50.000000 272.000000 C 50.000000 306.000000 55.200000 326.000000 73.001207 360.233091" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#2863877074)"/></g><mask id="2863877074" maskUnits="userSpaceOnUse" x="-100" y="-100" width="380" height="824">
+]]></script><g id="a"><g class="shape" ><rect x="24" y="0" width="53" height="66" style="fill:#F7F8FE;stroke:#2bc3d8;stroke-width:8;rx:10;" rx="10" /></g><text class="text-bold" x="50.500000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a</text></g><g id="b"><g class="shape" ><rect x="24" y="542" width="53" height="66" style="fill:#F7F8FE;stroke:#0db254;stroke-width:8;" /></g><text class="text-bold" x="50.500000" y="580.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">b</text></g><g id="c"><g class="shape" ><path d="M 69 431 L 69 366 L 122 366 L 122 431 C 113 417 104 417 96 431 C 87 446 78 446 69 431 Z" style="fill:#EDF0FD;stroke:#b2350d;stroke-width:7;"/></g><text class="text-bold" x="95.500000" y="399.610964" style="text-anchor:middle;font-size:16px;fill:#0A0F25">c</text></g><g id="Oval"><g class="shape" ><ellipse class="shape" cx="50.000000" cy="216.000000" rx="50.000000" ry="50.000000" style="fill:#F7F8FE;stroke:#a1a4af;stroke-width:6;" /></g></g><g id="(a &lt;-&gt; b)[0]"><marker id="mk-3196466557" markerWidth="30.000000" markerHeight="30.000000" refX="9.000000" refY="15.000000" viewBox="0.000000 0.000000 30.000000 30.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,15.000000 30.000000,0.000000 22.500000,15.000000 30.000000,30.000000" /> </marker><marker id="mk-1326875639" markerWidth="30.000000" markerHeight="36.000000" refX="21.000000" refY="18.000000" viewBox="0.000000 0.000000 30.000000 36.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,0.000000 30.000000,18.000000 0.000000,36.000000" /> </marker><path d="M 13.943485 66.252119 C -27.300000 104.287778 -40.000000 136.000000 -40.000000 166.000000 C -40.000000 196.000000 -40.000000 236.000000 -40.000000 266.000000 C -40.000000 296.000000 -40.000000 333.600000 -40.000000 360.000000 C -40.000000 386.400000 -27.300000 503.712222 13.943485 541.747881" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:6;stroke-dasharray:24.000000,22.141176;" marker-start="url(#mk-3196466557)" marker-end="url(#mk-1326875639)" mask="url(#2863877074)"/></g><g id="(c -&gt; b)[0]"><marker id="mk-2307423140" markerWidth="35.000000" markerHeight="42.000000" refX="24.500000" refY="21.000000" viewBox="0.000000 0.000000 35.000000 42.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#20222a" stroke-width="7" points="0.000000,0.000000 35.000000,21.000000 0.000000,42.000000" /> </marker><path d="M 95.000000 440.000000 C 95.000000 480.200000 89.600000 502.000000 74.889659 529.241372" class="connection" style="fill:none;stroke:#20222a;stroke-width:7;" marker-end="url(#mk-2307423140)" mask="url(#2863877074)"/></g><g id="(a &lt;-&gt; Oval)[0]"><marker id="mk-2920934274" markerWidth="72.600000" markerHeight="54.000000" refX="11.850000" refY="27.000000" viewBox="0.000000 0.000000 72.600000 54.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="white" stroke="#0D32B2" stroke-width="6" points="8.250000,27.000000 39.600000,6.750000 72.600000,27.000000 39.600000,47.250000" /> </marker><marker id="mk-4034884378" markerWidth="66.000000" markerHeight="42.000000" refX="57.000000" refY="21.000000" viewBox="0.000000 0.000000 66.000000 42.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,21.000000 33.000000,0.000000 66.000000,21.000000 33.000000,42.000000" /> </marker><path d="M 50.000000 79.000000 C 50.000000 106.000000 50.000000 126.000000 50.000000 154.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:6;" marker-start="url(#mk-2920934274)" marker-end="url(#mk-4034884378)" mask="url(#2863877074)"/><text class="text-italic" x="66.000000" y="158.000000" style="text-anchor:middle;font-size:16px;fill:black">*</text></g><g id="(c -- a)[0]"><path d="M 117.229469 359.789482 C 134.800000 326.000000 140.000000 296.000000 140.000000 266.000000 C 140.000000 236.000000 127.400000 104.400000 82.517737 63.079821" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:7;" mask="url(#2863877074)"/></g><g id="(Oval &lt;-&gt; c)[0]"><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 50.000000 272.000000 C 50.000000 306.000000 55.200000 326.000000 73.001207 360.233091" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#2863877074)"/></g><mask id="2863877074" maskUnits="userSpaceOnUse" x="-100" y="-100" width="380" height="824">
 <rect x="-100" y="-100" width="380" height="824" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg
index 7bb08359b..f82bb9d7b 100644
--- a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg
@@ -39,7 +39,7 @@ width="345" height="814" viewBox="-88 -96 345 814"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="a"><g class="shape" ><rect x="93" y="12" width="53" height="66" style="fill:#F7F8FE;stroke:#2bc3d8;stroke-width:8;rx:10;" /></g><text class="text-bold" x="119.500000" y="50.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a</text></g><g id="b"><g class="shape" ><rect x="88" y="544" width="53" height="66" style="fill:#F7F8FE;stroke:#0db254;stroke-width:8;" /></g><text class="text-bold" x="114.500000" y="582.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">b</text></g><g id="c"><g class="shape" ><path d="M 97 453 L 97 388 L 150 388 L 150 453 C 141 439 132 439 124 453 C 115 468 106 468 97 453 Z" style="fill:#EDF0FD;stroke:#b2350d;stroke-width:7;"/></g><text class="text-bold" x="123.500000" y="421.610964" style="text-anchor:middle;font-size:16px;fill:#0A0F25">c</text></g><g id="Oval"><g class="shape" ><ellipse class="shape" cx="73.000000" cy="258.000000" rx="50.000000" ry="50.000000" style="fill:#F7F8FE;stroke:#a1a4af;stroke-width:6;" /></g></g><g id="(a &lt;-&gt; b)[0]"><marker id="mk-3196466557" markerWidth="30.000000" markerHeight="30.000000" refX="9.000000" refY="15.000000" viewBox="0.000000 0.000000 30.000000 30.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,15.000000 30.000000,0.000000 22.500000,15.000000 30.000000,30.000000" /> </marker><marker id="mk-1326875639" markerWidth="30.000000" markerHeight="36.000000" refX="21.000000" refY="18.000000" viewBox="0.000000 0.000000 30.000000 36.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,0.000000 30.000000,18.000000 0.000000,36.000000" /> </marker><path d="M 106.500000 91.000000 L 106.500000 108.000000 S 106.500000 118.000000 96.500000 118.000000 L 22.000000 118.000000 S 12.000000 118.000000 12.000000 128.000000 L 12.000000 494.000000 S 12.000000 504.000000 22.000000 504.000000 L 96.500000 504.000000 S 106.500000 504.000000 106.500000 514.000000 L 106.500000 531.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:6;stroke-dasharray:24.000000,22.141176;" marker-start="url(#mk-3196466557)" marker-end="url(#mk-1326875639)" mask="url(#3534707844)"/></g><g id="(c -&gt; b)[0]"><marker id="mk-2307423140" markerWidth="35.000000" markerHeight="42.000000" refX="24.500000" refY="21.000000" viewBox="0.000000 0.000000 35.000000 42.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#20222a" stroke-width="7" points="0.000000,0.000000 35.000000,21.000000 0.000000,42.000000" /> </marker><path d="M 124.012820 459.999988 L 124.140110 529.500024" class="connection" style="fill:none;stroke:#20222a;stroke-width:7;" marker-end="url(#mk-2307423140)" mask="url(#3534707844)"/></g><g id="(a &lt;-&gt; Oval)[0]"><marker id="mk-2920934274" markerWidth="72.600000" markerHeight="54.000000" refX="11.850000" refY="27.000000" viewBox="0.000000 0.000000 72.600000 54.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="white" stroke="#0D32B2" stroke-width="6" points="8.250000,27.000000 39.600000,6.750000 72.600000,27.000000 39.600000,47.250000" /> </marker><marker id="mk-4034884378" markerWidth="66.000000" markerHeight="42.000000" refX="57.000000" refY="21.000000" viewBox="0.000000 0.000000 66.000000 42.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,21.000000 33.000000,0.000000 66.000000,21.000000 33.000000,42.000000" /> </marker><path d="M 119.750000 91.000000 L 119.750000 158.000000 S 119.750000 168.000000 109.750000 168.000000 L 83.000000 168.000000 S 73.000000 168.000000 73.000000 178.000000 L 73.000000 196.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:6;" marker-start="url(#mk-2920934274)" marker-end="url(#mk-4034884378)" mask="url(#3534707844)"/><text class="text-italic" x="89.000000" y="200.000000" style="text-anchor:middle;font-size:16px;fill:black">*</text></g><g id="(c -- a)[0]"><path d="M 133.000000 381.000000 L 133.000000 85.500000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:7;" mask="url(#3534707844)"/></g><g id="(Oval &lt;-&gt; c)[0]"><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 73.000000 314.000000 L 73.000000 338.000000 S 73.000000 348.000000 83.000000 348.000000 L 105.333333 348.000000 S 115.333333 348.000000 115.250003 357.999653 L 115.054165 381.500226" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#3534707844)"/></g><mask id="3534707844" maskUnits="userSpaceOnUse" x="-100" y="-100" width="345" height="814">
+]]></script><g id="a"><g class="shape" ><rect x="93" y="12" width="53" height="66" style="fill:#F7F8FE;stroke:#2bc3d8;stroke-width:8;rx:10;" rx="10" /></g><text class="text-bold" x="119.500000" y="50.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">a</text></g><g id="b"><g class="shape" ><rect x="88" y="544" width="53" height="66" style="fill:#F7F8FE;stroke:#0db254;stroke-width:8;" /></g><text class="text-bold" x="114.500000" y="582.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">b</text></g><g id="c"><g class="shape" ><path d="M 97 453 L 97 388 L 150 388 L 150 453 C 141 439 132 439 124 453 C 115 468 106 468 97 453 Z" style="fill:#EDF0FD;stroke:#b2350d;stroke-width:7;"/></g><text class="text-bold" x="123.500000" y="421.610964" style="text-anchor:middle;font-size:16px;fill:#0A0F25">c</text></g><g id="Oval"><g class="shape" ><ellipse class="shape" cx="73.000000" cy="258.000000" rx="50.000000" ry="50.000000" style="fill:#F7F8FE;stroke:#a1a4af;stroke-width:6;" /></g></g><g id="(a &lt;-&gt; b)[0]"><marker id="mk-3196466557" markerWidth="30.000000" markerHeight="30.000000" refX="9.000000" refY="15.000000" viewBox="0.000000 0.000000 30.000000 30.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,15.000000 30.000000,0.000000 22.500000,15.000000 30.000000,30.000000" /> </marker><marker id="mk-1326875639" markerWidth="30.000000" markerHeight="36.000000" refX="21.000000" refY="18.000000" viewBox="0.000000 0.000000 30.000000 36.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,0.000000 30.000000,18.000000 0.000000,36.000000" /> </marker><path d="M 106.500000 91.000000 L 106.500000 108.000000 S 106.500000 118.000000 96.500000 118.000000 L 22.000000 118.000000 S 12.000000 118.000000 12.000000 128.000000 L 12.000000 494.000000 S 12.000000 504.000000 22.000000 504.000000 L 96.500000 504.000000 S 106.500000 504.000000 106.500000 514.000000 L 106.500000 531.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:6;stroke-dasharray:24.000000,22.141176;" marker-start="url(#mk-3196466557)" marker-end="url(#mk-1326875639)" mask="url(#3534707844)"/></g><g id="(c -&gt; b)[0]"><marker id="mk-2307423140" markerWidth="35.000000" markerHeight="42.000000" refX="24.500000" refY="21.000000" viewBox="0.000000 0.000000 35.000000 42.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#20222a" stroke-width="7" points="0.000000,0.000000 35.000000,21.000000 0.000000,42.000000" /> </marker><path d="M 124.012820 459.999988 L 124.140110 529.500024" class="connection" style="fill:none;stroke:#20222a;stroke-width:7;" marker-end="url(#mk-2307423140)" mask="url(#3534707844)"/></g><g id="(a &lt;-&gt; Oval)[0]"><marker id="mk-2920934274" markerWidth="72.600000" markerHeight="54.000000" refX="11.850000" refY="27.000000" viewBox="0.000000 0.000000 72.600000 54.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="white" stroke="#0D32B2" stroke-width="6" points="8.250000,27.000000 39.600000,6.750000 72.600000,27.000000 39.600000,47.250000" /> </marker><marker id="mk-4034884378" markerWidth="66.000000" markerHeight="42.000000" refX="57.000000" refY="21.000000" viewBox="0.000000 0.000000 66.000000 42.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="6" points="0.000000,21.000000 33.000000,0.000000 66.000000,21.000000 33.000000,42.000000" /> </marker><path d="M 119.750000 91.000000 L 119.750000 158.000000 S 119.750000 168.000000 109.750000 168.000000 L 83.000000 168.000000 S 73.000000 168.000000 73.000000 178.000000 L 73.000000 196.000000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:6;" marker-start="url(#mk-2920934274)" marker-end="url(#mk-4034884378)" mask="url(#3534707844)"/><text class="text-italic" x="89.000000" y="200.000000" style="text-anchor:middle;font-size:16px;fill:black">*</text></g><g id="(c -- a)[0]"><path d="M 133.000000 381.000000 L 133.000000 85.500000" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:7;" mask="url(#3534707844)"/></g><g id="(Oval &lt;-&gt; c)[0]"><marker id="mk-2510427236" markerWidth="10.000000" markerHeight="12.000000" refX="3.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="10.000000,0.000000 0.000000,6.000000 10.000000,12.000000" /> </marker><marker id="mk-3990223579" markerWidth="10.000000" markerHeight="12.000000" refX="7.000000" refY="6.000000" viewBox="0.000000 0.000000 10.000000 12.000000" orient="auto" markerUnits="userSpaceOnUse"> <polygon class="connection" fill="#0D32B2" stroke-width="2" points="0.000000,0.000000 10.000000,6.000000 0.000000,12.000000" /> </marker><path d="M 73.000000 314.000000 L 73.000000 338.000000 S 73.000000 348.000000 83.000000 348.000000 L 105.333333 348.000000 S 115.333333 348.000000 115.250003 357.999653 L 115.054165 381.500226" class="connection" style="fill:none;stroke:#0D32B2;stroke-width:2;" marker-start="url(#mk-2510427236)" marker-end="url(#mk-3990223579)" mask="url(#3534707844)"/></g><mask id="3534707844" maskUnits="userSpaceOnUse" x="-100" y="-100" width="345" height="814">
 <rect x="-100" y="-100" width="345" height="814" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg
index 8ca072c03..1f41374aa 100644
--- a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg
@@ -39,7 +39,7 @@ width="371" height="270" viewBox="-102 -102 371 270"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="x"><g class="shape" ><rect x="0" y="0" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;rx:4;" /></g><text class="text-bold" x="26.500000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text></g><g id="y"><g class="shape" ><rect x="113" y="0" width="54" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;rx:10;" /></g><text class="text-bold" x="140.000000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text></g><mask id="266990191" maskUnits="userSpaceOnUse" x="-100" y="-100" width="371" height="270">
+]]></script><g id="x"><g class="shape" ><rect x="0" y="0" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;rx:4;" rx="4" /></g><text class="text-bold" x="26.500000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text></g><g id="y"><g class="shape" ><rect x="113" y="0" width="54" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;rx:10;" rx="10" /></g><text class="text-bold" x="140.000000" y="38.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text></g><mask id="266990191" maskUnits="userSpaceOnUse" x="-100" y="-100" width="371" height="270">
 <rect x="-100" y="-100" width="371" height="270" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[
diff --git a/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg b/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg
index 3ab7c4d17..128bb7898 100644
--- a/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg
@@ -39,7 +39,7 @@ width="331" height="270" viewBox="-90 -90 331 270"><style type="text/css">
     svgEl.setAttribute("height", height * ratio - 16);
   }
 });
-]]></script><g id="x"><g class="shape" ><rect x="12" y="12" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;rx:4;" /></g><text class="text-bold" x="38.500000" y="50.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text></g><g id="y"><g class="shape" ><rect x="85" y="12" width="54" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;rx:10;" /></g><text class="text-bold" x="112.000000" y="50.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text></g><mask id="1638488526" maskUnits="userSpaceOnUse" x="-100" y="-100" width="331" height="270">
+]]></script><g id="x"><g class="shape" ><rect x="12" y="12" width="53" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;rx:4;" rx="4" /></g><text class="text-bold" x="38.500000" y="50.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">x</text></g><g id="y"><g class="shape" ><rect x="85" y="12" width="54" height="66" style="fill:#F7F8FE;stroke:#0D32B2;stroke-width:2;rx:10;" rx="10" /></g><text class="text-bold" x="112.000000" y="50.500000" style="text-anchor:middle;font-size:16px;fill:#0A0F25">y</text></g><mask id="1638488526" maskUnits="userSpaceOnUse" x="-100" y="-100" width="331" height="270">
 <rect x="-100" y="-100" width="331" height="270" fill="white"></rect>
 
 </mask><style type="text/css"><![CDATA[