diff --git a/resources/icons/legend_customgcodes.svg b/resources/icons/legend_customgcodes.svg
index f363b39fdc..96e0be69e3 100644
--- a/resources/icons/legend_customgcodes.svg
+++ b/resources/icons/legend_customgcodes.svg
@@ -1,71 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   id="Layer_1"
-   style="enable-background:new 0 0 96 96;"
-   version="1.1"
-   viewBox="0 0 96 96"
-   xml:space="preserve"
-   sodipodi:docname="legend_customgcodes.svg"
-   inkscape:version="1.1 (c68e22c387, 2021-05-23)"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-     id="defs7016"><linearGradient
-       id="linearGradient7403"
-       inkscape:swatch="solid"><stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7401" /></linearGradient></defs><sodipodi:namedview
-     id="namedview7014"
-     pagecolor="#505050"
-     bordercolor="#eeeeee"
-     borderopacity="1"
-     inkscape:pageshadow="0"
-     inkscape:pageopacity="0"
-     inkscape:pagecheckerboard="0"
-     showgrid="false"
-     inkscape:zoom="5.9809448"
-     inkscape:cx="57.93399"
-     inkscape:cy="54.422839"
-     inkscape:window-width="1920"
-     inkscape:window-height="1001"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><style
-     type="text/css"
-     id="style6991">
-	.st0{fill:none;stroke:#010000;stroke-width:4;stroke-linecap:round;stroke-miterlimit:10;}
-	.st1{fill:none;stroke:#010000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st2{fill:none;stroke:#010000;stroke-width:4;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st3{fill:none;stroke:#010000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st4{fill:#010000;}
-	.st5{fill:none;stroke:#010000;stroke-width:3.8974;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st6{fill:none;stroke:#010000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st7{fill:#010000;stroke:#010000;stroke-width:2;stroke-miterlimit:10;}
-	.st8{opacity:0.75;}
-	.st9{fill:none;stroke:#010000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st10{fill:none;stroke:#010000;stroke-width:6;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st11{fill:none;stroke:#010000;stroke-width:3;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st12{fill:none;stroke:#010000;stroke-width:3.9497;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st13{fill:none;stroke:#010000;stroke-width:1.9008;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st14{fill:none;stroke:#010000;stroke-width:1.9935;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st15{fill:none;stroke:#010000;stroke-width:4;stroke-miterlimit:10;}
-	.st16{fill:none;stroke:#010000;stroke-width:1.9048;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st17{fill:none;stroke:#010000;stroke-width:1.934;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st18{fill:none;stroke:#010000;stroke-width:1.9684;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-	.st19{fill:none;stroke:#010000;stroke-width:1.9343;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
-</style><rect
-     style="fill:#e2d243;fill-opacity:1;stroke-width:0.262144"
-     id="rect4805"
-     width="73.590103"
-     height="9.5571566"
-     x="11.677858"
-     y="81.76329" /><path
-     d="M 36.729013,56.172738 20.203456,39.714289 36.712236,23.25584 31.679071,18.239452 10.153903,39.714289 31.695848,61.189125 Z m 22.011708,0 16.50878,-16.458449 -16.50878,-16.458449 5.033164,-5.016388 21.541946,21.474837 -21.541946,21.474836 z"
-     id="path9251"
-     style="fill:#ffffff;fill-opacity:1;stroke-width:0.167772" /><path
-     d="m 30.890542,43.069732 h 6.710886 v -6.710886 h -6.710886 z m 33.68865,-6.710886 h -6.710887 v 6.710886 h 6.710887 z m -20.199768,6.710886 h 6.710886 v -6.710886 h -6.710886 z"
-     id="path9253"
-     style="fill:#ed6b21;fill-opacity:1;stroke-width:0.167772" /></svg>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 96 96">
+  <rect id="rect4805" x="11.7" y="81.8" width="73.6" height="9.56" style="fill: #e2d243"/>
+  <g>
+    <path d="M38.1,25c-5.6,5.6-3.5,15.9,3.9,18.7.8.3.9.5-.7,1.9C26.6,58.2,29.4,62,21.5,51.7c-2.5-3.3,4-4.8,3-7.1a17,17,0,0,1-1.8-4.4c-.1-.4-.2-.5-.7-.5-2.6-.1-6.5,1.1-6.6-2.9a45.7,45.7,0,0,0,0-7.4c-.1-1.8.8-3.5,2.8-3.3s4.3,1,4.8-1.2a14,14,0,0,1,1.6-3.8,1,1,0,0,0-.3-1.4c-1.4-1.6-4.9-3.6-2.5-5.9l6.1-6.1a2.1,2.1,0,0,1,3.3,0c4.8,5.1,2.6,2.3,8.1,1.1,1.4-.3,1.3-.9,1.2-1.9a18.6,18.6,0,0,1-.4-3.4c.6-2.8,3.8-1.9,5.9-2h5.3c1.7,0,2.4.7,2.5,2.5s-.8,3.7,1.8,5,3.5,2.6,4.9.8S63.9,5.5,66,7.6l6.3,6.3c.5.4.4.8-.1,1.2L59,28.3c-.7.7-.9.2-1.2-.3C55,20.8,44.2,18.6,39,24.1" style="fill: #ed6b21"/>
+    <path d="M78.9,18.8c1.7.1,8.5,7.4,10.1,9.2a1.7,1.7,0,0,1,0,2.4c-1.6,1.7-3.4,3.4-5.1,5.1a.7.7,0,0,1-1.1,0L72.5,25.2c-.4-.5-.3-.7.3-1.3s2.8-2.8,4.1-4.1A2.8,2.8,0,0,1,78.9,18.8Z" style="fill: #fff"/>
+    <path d="M45.7,73.7h0c-1.6,1.2-3.5,1.2-5.3,1.7l-5.6,1.3c-2.1.4-2.9.3-3.7-1.4a1.3,1.3,0,0,1-.1-.6c.8-3.6,1.5-7.2,2.4-10.8.5-1.8,2.2-2.7,3.4-4s.6,0,.9.2L47.8,70.3a.8.8,0,0,1,.4.9" style="fill: #fff"/>
+    <path d="M78.2,39.4a1.1,1.1,0,0,1,0,1.5c-7.9,8.5-16.6,16.5-24.7,24.9-.6.6-1,.7-1.6,0l-9.8-9.7a1.2,1.2,0,0,1,0-1.6c8.4-8.3,16.7-16.7,25-25,.4-.4.7-.5,1.2,0C71.5,32.8,74.9,36,78.2,39.4Z" style="fill: #fff"/>
+  </g>
+</svg>
diff --git a/resources/icons/legend_toolchanges.svg b/resources/icons/legend_toolchanges.svg
index b6ed4c8a66..85b6218a9b 100644
--- a/resources/icons/legend_toolchanges.svg
+++ b/resources/icons/legend_toolchanges.svg
@@ -1,20 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generator: Adobe Illustrator 25.4.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg enable-background="new 0 0 96 96" version="1.1" viewBox="0 0 96 96" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<path id="path6993" 
-	  d="m22.3 7.7c-1.8 0-6.1 4.1-6.1 4.1v14.7l8.8 20.4h7l8.8-20.4v-18.8s-4.3 4.1-6.1 4.1c-1.9 0-10.7-4.1-12.4-4.1z"
-      style="fill:#FFFFFF;stroke:#FFFFFF;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" />
-	  
-<path id="path6994"
-	d="m57.3 64.4v0.9c0 1.8-1.6 3.2-3.4 3.2h-15s-2.6-0.1-2.6 2.5c0 2.9 2.6 2.5 2.6 2.5h36.9"
-    style="fill:none;stroke:#FFFFFF;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" />
-	
-<rect id="path6995" x="11.7" y="81.8" width="73.6" height="9.6" style="fill:#C1BE63" />
-<path id="path6996"
-	d="m49.6 16.6c-2.2 0-7.7 4.6-7.7 4.6v16.4l11 22.8h8.8l11-22.8v-21s-5.4 4.6-7.7 4.6c-2.3-0.1-13.2-4.6-15.4-4.6z"
-    style="fill:#ED6B21;stroke:#ED6B21;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10" />
-
-	<path d="m61 23.8c0.6 0 0.7 0.4 0.7 0.9v28c0 0.5-0.3 0.9-0.8 0.9h-5.6c-0.7 0-0.8-0.4-0.8-0.8v-22.6l-2.5 1.3c-0.1 0.1-0.2 0.1-0.3 0.1-0.3 0-0.4-0.3-0.4-0.6v-4.4c0-0.5 0.1-0.9 0.5-1.1l2.4-1.2c0.6-0.3 1.2-0.5 1.9-0.5h4.9z"/>
-	<path d="m21.4 19.6c-0.4 0-0.4-0.5-0.4-0.7 0-4 2.7-7.3 6.9-7.3 3.8 0 7.1 2.6 7.1 6.5v1.1c0 2.2-1.1 3.8-1.8 4.6l-5.6 6.3h6.7c0.5 0 0.8 0.2 0.8 0.8v3.5c0 0.5-0.2 0.7-0.7 0.7h-12.6c-0.3 0-0.8-0.1-0.8-0.6v-3.2c0-0.5 0-0.7 0.1-0.8l7.4-9.1c0.3-0.4 0.9-1.1 0.9-2.2v-1c0-0.9-0.8-1.4-1.6-1.4-1.2 0-1.6 1.1-1.6 2.3 0 0.5-0.2 0.6-0.5 0.6l-4.3-0.1z"/>
-
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="96" height="96" viewBox="0 0 96 96">
+  <rect id="rect4805" x="11.7" y="81.8" width="73.6" height="9.6" style="fill: #c1be63"/>
+  <polyline points="29.9 53.6 34.5 44.8 43.9 44.7 43.9 33.1 38.9 33.1 38.9 6.2 17 6.2 17 33.2 11.6 33.2 11.6 44.7 21 44.7 25.6 53.6" style="fill: #fff"/>
+  <polyline points="68 73.2 73.3 63.3 84 63.2 84 50 78.3 50 78.3 19.7 53.3 19.7 53.3 50.2 47.1 50.2 47.1 63.2 57.9 63.2 63.1 73.2" style="fill: #ed6b21"/>
+  <g>
+    <path d="M32.3,62.6c4.5,5.9,10.4,7.8,18.5,8.4" style="fill: none;stroke: #fff;stroke-miterlimit: 10;stroke-width: 2.8346456692913384px"/>
+    <polygon points="28.9 66.3 28.8 56.4 37.4 61.2 28.9 66.3" style="fill: #fff"/>
+    <polygon points="49.2 75.8 57.9 71.2 49.6 65.9 49.2 75.8" style="fill: #fff"/>
+  </g>
 </svg>