diff --git a/substation-diagram/substation-diagram-core/src/main/java/com/powsybl/substationdiagram/svg/DefaultSVGWriter.java b/substation-diagram/substation-diagram-core/src/main/java/com/powsybl/substationdiagram/svg/DefaultSVGWriter.java
index e3f89118..ec9b26c6 100644
--- a/substation-diagram/substation-diagram-core/src/main/java/com/powsybl/substationdiagram/svg/DefaultSVGWriter.java
+++ b/substation-diagram/substation-diagram-core/src/main/java/com/powsybl/substationdiagram/svg/DefaultSVGWriter.java
@@ -152,7 +152,7 @@ public GraphMetadata write(Graph graph,
         globalStyle.ifPresent(graphStyle::append);
         graphStyle.append(componentLibrary.getStyleSheet());
 
-        List<String> listUsedComponentSVG = new ArrayList<>();
+        Set<String> listUsedComponentSVG = new HashSet<>();
 
         graph.getNodes().forEach(n -> {
             Optional<String> nodeStyle = styleProvider.getNodeStyle(n, layoutParameters.isAvoidSVGComponentsDuplication());
@@ -274,7 +274,7 @@ public GraphMetadata write(SubstationGraph graph,
         Document document = domImpl.createDocument("http://www.w3.org/2000/svg", "svg", null);
         Element style = document.createElement("style");
 
-        List<String> listUsedComponentSVG = new ArrayList<>();
+        Set<String> listUsedComponentSVG = new HashSet<>();
 
         StringBuilder graphStyle = new StringBuilder();
         for (Graph vlGraph : graph.getNodes()) {
@@ -1139,7 +1139,7 @@ private void shiftFeedersPosition(Graph graph, double scaleShiftFeederNames) {
     /**
      * Creation of the defs area for the SVG components
      */
-    protected void createDefsSVGComponents(Document document, List<String> listUsedComponentSVG) {
+    protected void createDefsSVGComponents(Document document, Set<String> listUsedComponentSVG) {
         if (layoutParameters.isAvoidSVGComponentsDuplication()) {
             Element defs = document.createElement("defs");
 
diff --git a/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL1_optimized.svg b/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL1_optimized.svg
index 67086b03..46b41105 100644
--- a/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL1_optimized.svg
+++ b/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL1_optimized.svg
@@ -29,11 +29,6 @@
 .PHASE_SHIFT_TRANSFORMER {stroke:rgb(0,0,255);stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;}
 ]]></style>
     <defs>
-        <g id="LOAD">
-    <rect height="9" width="16"/>
-    <line y2="9" x1="0" x2="16" y1="0"/>
-    <line y2="9" x1="16" x2="0" y1="0"/>
-</g>
         <g id="GENERATOR">
     <circle r="6" cx="6" cy="6"/>
     <path d="M6,6 A 6 20 0 0 0 0,6"/>
@@ -44,257 +39,8 @@
     <line y2="9" x1="0" x2="16" y1="0"/>
     <line y2="9" x1="16" x2="0" y1="0"/>
 </g>
-        <g id="GENERATOR">
-    <circle r="6" cx="6" cy="6"/>
-    <path d="M6,6 A 6 20 0 0 0 0,6"/>
-    <path d="M6,6 A 6 20 0 0 0 12,6"/>
-</g>
-        <g id="TWO_WINDINGS_TRANSFORMER">
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
-</g>
-        <g id="TWO_WINDINGS_TRANSFORMER">
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
-</g>
-        <g id="TWO_WINDINGS_TRANSFORMER">
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
-</g>
-        <g id="TWO_WINDINGS_TRANSFORMER">
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
-</g>
-        <g id="TWO_WINDINGS_TRANSFORMER">
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
+        <g id="NODE">
+    <circle r="4" cx="4" cy="4"/>
 </g>
         <g id="DISCONNECTOR">
     <g class="closed" id="DISCONNECTOR-closed">
@@ -305,43 +51,19 @@
         <line y2="8" x1="8" x2="0" y1="0"/>
     </g>
 </g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
+        <g id="INDUCTOR">
+    <path d="M5,5 A 5 20 0 0 0 0,5"/>
+    <path d="M10,5 A 5 20 0 0 0 5,5"/>
+    <path d="M15,5 A 5 20 0 0 0 10,5"/>
 </g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
+        <g id="TWO_WINDINGS_TRANSFORMER">
+    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
+    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
 </g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
+        <g id="THREE_WINDINGS_TRANSFORMER">
+    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
+    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
+    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
 </g>
         <g id="BREAKER">
     <g class="closed" id="BREAKER-closed">
@@ -352,84 +74,6 @@
         <rect x="1" width="18" y="1" height="18"/>
         <line y2="10" x1="5" x2="15" y1="10"/>
     </g>
-</g>
-        <g id="THREE_WINDINGS_TRANSFORMER">
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
-</g>
-        <g id="INDUCTOR">
-    <path d="M5,5 A 5 20 0 0 0 0,5"/>
-    <path d="M10,5 A 5 20 0 0 0 5,5"/>
-    <path d="M15,5 A 5 20 0 0 0 10,5"/>
-</g>
-        <g id="THREE_WINDINGS_TRANSFORMER">
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
-</g>
-        <g id="INDUCTOR">
-    <path d="M5,5 A 5 20 0 0 0 0,5"/>
-    <path d="M10,5 A 5 20 0 0 0 5,5"/>
-    <path d="M15,5 A 5 20 0 0 0 10,5"/>
-</g>
-        <g id="THREE_WINDINGS_TRANSFORMER">
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
-</g>
-        <g id="INDUCTOR">
-    <path d="M5,5 A 5 20 0 0 0 0,5"/>
-    <path d="M10,5 A 5 20 0 0 0 5,5"/>
-    <path d="M15,5 A 5 20 0 0 0 10,5"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
 </g>
         <g id="ARROW">
      <g class="arrow-up" id="ARROW-arrow-up">
diff --git a/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL2_optimized.svg b/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL2_optimized.svg
index 47433d64..2cf671c1 100644
--- a/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL2_optimized.svg
+++ b/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL2_optimized.svg
@@ -29,173 +29,18 @@
 .PHASE_SHIFT_TRANSFORMER {stroke:rgb(0,0,255);stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;}
 ]]></style>
     <defs>
-        <g id="LOAD">
-    <rect height="9" width="16"/>
-    <line y2="9" x1="0" x2="16" y1="0"/>
-    <line y2="9" x1="16" x2="0" y1="0"/>
-</g>
         <g id="GENERATOR">
     <circle r="6" cx="6" cy="6"/>
     <path d="M6,6 A 6 20 0 0 0 0,6"/>
     <path d="M6,6 A 6 20 0 0 0 12,6"/>
 </g>
-        <g id="TWO_WINDINGS_TRANSFORMER">
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
-</g>
-        <g id="TWO_WINDINGS_TRANSFORMER">
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
-</g>
-        <g id="TWO_WINDINGS_TRANSFORMER">
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
-</g>
-        <g id="TWO_WINDINGS_TRANSFORMER">
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
+        <g id="LOAD">
+    <rect height="9" width="16"/>
+    <line y2="9" x1="0" x2="16" y1="0"/>
+    <line y2="9" x1="16" x2="0" y1="0"/>
 </g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
+        <g id="NODE">
+    <circle r="4" cx="4" cy="4"/>
 </g>
         <g id="DISCONNECTOR">
     <g class="closed" id="DISCONNECTOR-closed">
@@ -206,43 +51,19 @@
         <line y2="8" x1="8" x2="0" y1="0"/>
     </g>
 </g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
+        <g id="INDUCTOR">
+    <path d="M5,5 A 5 20 0 0 0 0,5"/>
+    <path d="M10,5 A 5 20 0 0 0 5,5"/>
+    <path d="M15,5 A 5 20 0 0 0 10,5"/>
 </g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
+        <g id="TWO_WINDINGS_TRANSFORMER">
+    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
+    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
 </g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
+        <g id="THREE_WINDINGS_TRANSFORMER">
+    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
+    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
+    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
 </g>
         <g id="BREAKER">
     <g class="closed" id="BREAKER-closed">
@@ -253,69 +74,6 @@
         <rect x="1" width="18" y="1" height="18"/>
         <line y2="10" x1="5" x2="15" y1="10"/>
     </g>
-</g>
-        <g id="THREE_WINDINGS_TRANSFORMER">
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
-</g>
-        <g id="INDUCTOR">
-    <path d="M5,5 A 5 20 0 0 0 0,5"/>
-    <path d="M10,5 A 5 20 0 0 0 5,5"/>
-    <path d="M15,5 A 5 20 0 0 0 10,5"/>
-</g>
-        <g id="THREE_WINDINGS_TRANSFORMER">
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
-</g>
-        <g id="INDUCTOR">
-    <path d="M5,5 A 5 20 0 0 0 0,5"/>
-    <path d="M10,5 A 5 20 0 0 0 5,5"/>
-    <path d="M15,5 A 5 20 0 0 0 10,5"/>
-</g>
-        <g id="THREE_WINDINGS_TRANSFORMER">
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
-</g>
-        <g id="INDUCTOR">
-    <path d="M5,5 A 5 20 0 0 0 0,5"/>
-    <path d="M10,5 A 5 20 0 0 0 5,5"/>
-    <path d="M15,5 A 5 20 0 0 0 10,5"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
 </g>
         <g id="ARROW">
      <g class="arrow-up" id="ARROW-arrow-up">
diff --git a/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL3_optimized.svg b/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL3_optimized.svg
index e430b4af..70a01621 100644
--- a/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL3_optimized.svg
+++ b/substation-diagram/substation-diagram-core/src/test/resources/TestCase12GraphVL3_optimized.svg
@@ -34,19 +34,8 @@
     <line y2="9" x1="0" x2="16" y1="0"/>
     <line y2="9" x1="16" x2="0" y1="0"/>
 </g>
-        <g id="INDUCTOR">
-    <path d="M5,5 A 5 20 0 0 0 0,5"/>
-    <path d="M10,5 A 5 20 0 0 0 5,5"/>
-    <path d="M15,5 A 5 20 0 0 0 10,5"/>
-</g>
-        <g id="TWO_WINDINGS_TRANSFORMER">
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
-</g>
-        <g id="INDUCTOR">
-    <path d="M5,5 A 5 20 0 0 0 0,5"/>
-    <path d="M10,5 A 5 20 0 0 0 5,5"/>
-    <path d="M15,5 A 5 20 0 0 0 10,5"/>
+        <g id="NODE">
+    <circle r="4" cx="4" cy="4"/>
 </g>
         <g id="CAPACITOR">
     <line y2="3" x1="6" x2="6" y1="0"/>
@@ -63,138 +52,19 @@
         <line y2="8" x1="8" x2="0" y1="0"/>
     </g>
 </g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-</g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
-</g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
+        <g id="INDUCTOR">
+    <path d="M5,5 A 5 20 0 0 0 0,5"/>
+    <path d="M10,5 A 5 20 0 0 0 5,5"/>
+    <path d="M15,5 A 5 20 0 0 0 10,5"/>
 </g>
-        <g id="BREAKER">
-    <g class="closed" id="BREAKER-closed">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="15" x1="10" x2="10" y1="5"/>
-    </g>
-    <g class="open" id="BREAKER-open">
-        <rect x="1" width="18" y="1" height="18"/>
-        <line y2="10" x1="5" x2="15" y1="10"/>
-    </g>
+        <g id="TWO_WINDINGS_TRANSFORMER">
+    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
+    <circle r="4" id="TWO_WINDINGS_TRANSFORMER-WINDING2" cx="9" cy="4"/>
 </g>
-        <g id="DISCONNECTOR">
-    <g class="closed" id="DISCONNECTOR-closed">
-        <line y2="8" x1="0" x2="8" y1="0"/>
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
-    <g class="open" id="DISCONNECTOR-open">
-        <line y2="8" x1="8" x2="0" y1="0"/>
-    </g>
+        <g id="THREE_WINDINGS_TRANSFORMER">
+    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
+    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
+    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
 </g>
         <g id="BREAKER">
     <g class="closed" id="BREAKER-closed">
@@ -205,45 +75,6 @@
         <rect x="1" width="18" y="1" height="18"/>
         <line y2="10" x1="5" x2="15" y1="10"/>
     </g>
-</g>
-        <g id="THREE_WINDINGS_TRANSFORMER">
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
-</g>
-        <g id="THREE_WINDINGS_TRANSFORMER">
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
-</g>
-        <g id="THREE_WINDINGS_TRANSFORMER">
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING1" cx="4" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING2" cx="10" cy="4"/>
-    <circle r="4" id="THREE_WINDINGS_TRANSFORMER-WINDING3" cx="7" cy="8"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
-</g>
-        <g id="NODE">
-    <circle r="4" cx="4" cy="4"/>
 </g>
         <g id="ARROW">
      <g class="arrow-up" id="ARROW-arrow-up">