diff --git a/kanji/08580.svg b/kanji/08580.svg
index 0a2a2a904..126d65d8f 100644
--- a/kanji/08580.svg
+++ b/kanji/08580.svg
@@ -48,23 +48,21 @@ kvg:type CDATA #IMPLIED >
 			<path id="kvg:08580-s5" kvg:type="㇔" d="M16.28,53.59c3.94,1.11,10.18,4.56,11.16,6.29"/>
 			<path id="kvg:08580-s6" kvg:type="㇀" d="M16.43,93.38c1.65,1.08,3.63,1.12,4.66-0.21c3.02-3.88,6.03-8.61,8.78-13.56"/>
 		</g>
-		<g id="kvg:08580-g4" kvg:position="right">
-			<g id="kvg:08580-g5" kvg:element="日" kvg:variant="true">
-				<g id="kvg:08580-g6" kvg:element="囚">
-					<g id="kvg:08580-g7" kvg:element="囗" kvg:part="1">
-						<path id="kvg:08580-s7" kvg:type="㇑" d="M45.43,34.73c0.39,0.41,0.86,1.53,0.96,2.07c0.83,4.5,2.13,12.6,2.99,21.71"/>
-						<path id="kvg:08580-s8" kvg:type="㇕a" d="M46.77,35.8c10.59-1.18,27.39-2.8,33.63-3.3c2.5-0.2,2.97,1.01,2.74,2.78c-0.73,5.61-2.5,14.62-3.91,21.41"/>
-					</g>
-					<g id="kvg:08580-g8" kvg:element="人" kvg:variant="true">
-						<path id="kvg:08580-s9" kvg:type="㇒" d="M64.32,37.41c0.06,0.29,0.32,0.96,0.13,1.38C63,42,60.5,46.75,55.02,50.87"/>
-						<path id="kvg:08580-s10" kvg:type="㇔/㇏" d="M63.35,43.08c4.01,1.07,9.85,5.38,10.84,7.48"/>
-					</g>
-					<g id="kvg:08580-g9" kvg:element="囗" kvg:part="2">
-						<path id="kvg:08580-s11" kvg:type="㇐a" d="M49.41,56.15c6.77,0,20.46-0.91,29.81-1.03"/>
-					</g>
+		<g id="kvg:08580-g4" kvg:element="𥁕" kvg:position="right">
+			<g id="kvg:08580-g5" kvg:element="囚" kvg:position="top">
+				<g id="kvg:08580-g6" kvg:element="囗" kvg:part="1">
+					<path id="kvg:08580-s7" kvg:type="㇑" d="M45.43,34.73c0.39,0.41,0.86,1.53,0.96,2.07c0.83,4.5,2.13,12.6,2.99,21.71"/>
+					<path id="kvg:08580-s8" kvg:type="㇕a" d="M46.77,35.8c10.59-1.18,27.39-2.8,33.63-3.3c2.5-0.2,2.97,1.01,2.74,2.78c-0.73,5.61-2.5,14.62-3.91,21.41"/>
+				</g>
+				<g id="kvg:08580-g7" kvg:element="人" kvg:variant="true">
+					<path id="kvg:08580-s9" kvg:type="㇒" d="M64.32,37.41c0.06,0.29,0.32,0.96,0.13,1.38C63,42,60.5,46.75,55.02,50.87"/>
+					<path id="kvg:08580-s10" kvg:type="㇔/㇏" d="M63.35,43.08c4.01,1.07,9.85,5.38,10.84,7.48"/>
+				</g>
+				<g id="kvg:08580-g8" kvg:element="囗" kvg:part="2">
+					<path id="kvg:08580-s11" kvg:type="㇐a" d="M49.41,56.15c6.77,0,20.46-0.91,29.81-1.03"/>
 				</g>
 			</g>
-			<g id="kvg:08580-g10" kvg:element="皿">
+			<g id="kvg:08580-g9" kvg:element="皿" kvg:position="bottom">
 				<path id="kvg:08580-s12" kvg:type="㇑a" d="M42.79,67.27c0.53,0.69,1.21,1.45,1.32,2.04c0.88,4.68,1.6,16.93,2.2,25.34"/>
 				<path id="kvg:08580-s13" kvg:type="㇕b" d="M44.93,68.74c9.43-0.97,35.11-2.1,38.52-2.3c2.14-0.13,3.34,0.92,3.12,2.84c-0.32,2.71-2.07,18.22-2.55,24.01"/>
 				<path id="kvg:08580-s14" kvg:type="㇑a" d="M57.47,69.43c0.22,0.45,0.44,0.82,0.54,1.38c0.76,4.42-0.18,15.52,0.33,23.45"/>