diff --git a/resources/icons/legend_toolchanges.svg b/resources/icons/legend_toolchanges.svg
index e6c195b110..b6ed4c8a66 100644
--- a/resources/icons/legend_toolchanges.svg
+++ b/resources/icons/legend_toolchanges.svg
@@ -1,102 +1,20 @@
-<?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_toolchanges.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="4.2291667"
-     inkscape:cx="58.285714"
-     inkscape:cy="47.881773"
-     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><path
-     class="st1"
-     d="m 49.227094,20.29803 c -1.6,0 -5.6,4 -5.6,4 v 14.4 l 8,20 h 3.2 3.2 l 8,-20 v -18.4 c 0,0 -3.92,4 -5.6,4 -1.6,0 -9.6,-4 -11.2,-4 z"
-     id="path6993"
-     style="fill:#ed6b21;fill-opacity:1;stroke:#ed6b21;stroke-opacity:1" /><path
-     class="st1"
-     d="m 31.627094,7.4980296 c -1.6,0 -5.6,4.0000004 -5.6,4.0000004 v 17.6 l 8,20 h 3.2 3.2 l 0.96,-2.4 -3.36,-8 v -16 l 8,-7.2 h 2.4 V 7.4980296 c 0,0 -3.92,4.0000004 -5.6,4.0000004 -1.6,0 -9.6,-4.0000004 -11.2,-4.0000004 z"
-     id="path6995"
-     style="stroke:#ffffff;stroke-opacity:1;fill:none;fill-opacity:1;stroke-width:4;stroke-miterlimit:10;stroke-dasharray:none" /><path
-     class="st2"
-     d="m 33.227094,69.89803 h -12 c 0,0 -3.2,0.16 -3.2,3.2 v 0.8 c 0,1.76 1.44,3.2 3.2,3.2 h 56"
-     id="path6997"
-     style="stroke:#ffffff;stroke-opacity:1;stroke-width:6;stroke-miterlimit:10;stroke-dasharray:none" /><line
-     class="st2"
-     x1="37.227093"
-     x2="37.227093"
-     y1="53.898029"
-     y2="65.09803"
-     id="line6999"
-     style="stroke:#ffffff;stroke-opacity:1;stroke-width:6;stroke-miterlimit:10;stroke-dasharray:none" /><path
-     class="st1"
-     d="m 54.827094,63.49803 v 0.88 c 0,1.76 -1.44,3.12 -3.12,3.12 h -13.68 c 0,0 -2.4,-0.08 -2.4,2.4 0,2.8 2.4,2.4 2.4,2.4 h 33.6"
-     id="path7001"
-     style="stroke:#ed6b21;stroke-opacity:1;fill:none;fill-opacity:1;stroke-width:6;stroke-miterlimit:10;stroke-dasharray:none" /><line
-     class="st1"
-     x1="37.227093"
-     x2="37.227093"
-     y1="57.898029"
-     y2="53.898029"
-     id="line7009"
-     style="stroke:#ffffff;stroke-opacity:1;stroke-width:6;stroke-miterlimit:10;stroke-dasharray:none;fill:none;fill-opacity:1" /><line
-     class="st1"
-     x1="72.427094"
-     x2="78.027092"
-     y1="77.09803"
-     y2="77.09803"
-     id="line7011"
-     style="stroke:#ffffff;stroke-opacity:1;stroke-width:6;stroke-miterlimit:10;stroke-dasharray:none" /><rect
-     style="fill:#c1be63;fill-opacity:1;stroke-width:0.262144"
-     id="rect4805"
-     width="73.590103"
-     height="9.5571566"
-     x="11.677858"
-     y="81.76329" /></svg>
+<?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>
diff --git a/resources/icons/legend_wipe.svg b/resources/icons/legend_wipe.svg
index 9dbc9a6556..decfcd6011 100644
--- a/resources/icons/legend_wipe.svg
+++ b/resources/icons/legend_wipe.svg
@@ -1,48 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
+<?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 1000 1000" version="1.1" viewBox="0 0 1e3 1e3" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect id="path6995" width="1e3" height="1e3" style="display:none;stroke:#FFFFFF;stroke-miterlimit:10"/>
+
+<g transform="translate(1.7416 41.799)">
+	<path id="path6997" 
+	d="m969.8 495.7c-10.7 22.2-16.2 30.3-35.8 53-47.1 54.8-64.5 95.5-83.8 195.8-12.6 65.9-21.5 86.8-45.2 103.8-1.8 1.3-4 1.9-6.2 1.9l-172.4-3.4c-6.6-0.1-11.4-6.4-9.7-12.8 21.1-79.3 66.6-153.2 57.1-240.5 0-0.3-0.1-0.6-0.1-0.9l-0.7-66.3c0-0.7-0.1-1.3-0.2-2-16.4-78.2 46.5-267.9-73-265.6-4.2 0.1-8-2.3-9.6-6.1-16.3-37.2-32.6-71.2-82.7-62.5-3.4 0.6-6.8-0.5-9.2-3-34.4-36.2-88.1-55.1-121.6-1.8-1.5 2.5-7.1 4.6-9.9 3.8-121.5-16.5-81.4 135.5-86.4 221.7-0.5 8.5-10.5 12.7-16.9 7.1-51.8-45.3-132.7-6.5-100.3 71.4l0.5 1.3c0.1 0.3 0.3 0.9 0.2 0.9 42.3 94.2 69.4 198.2 143.9 274.4 0.3 0.3 0.7 0.7 1.1 0.9 6.5 5 11.8 10.6 16.1 16.5 17.3 24-0.4 57.4-29.9 56.9l-190.5-3.7c-20.4-0.4-40-8.7-54.3-23.2-9.6-9.7-18.1-20.1-22-27.5-13.5-25.5-18.6-58.7-14.4-92.5 3.2-27.3 9.9-53 26.7-104.2 18.2-55.6 21.2-69.8 21.4-98.9 0-30.2-4-49-20.6-100.3-30.8-93.9-37.9-147.9-25.8-195.6 6.3-24.7 14.4-39.3 31.4-56.3 25.1-24.9 56-37 107-41.5 28.5-2.6 55-1.4 99.9 4.3 36.6 4.7 63.5 4.2 89.2-2 22.2-5.5 27.5-7.5 77.9-32 45.3-22 61.5-27.7 90-31.2 63.7-7.9 129.5 6.3 163.8 35.6 5.1 4.3 17.8 20 28.1 34.4 43.7 61.5 80.7 86.4 149.5 100.7 36.2 7.5 52.8 16.2 76.9 40.5 25.9 26.1 42.1 55 52.4 93.2 14.4 53.8 10 110-11.9 155.7z"
+    style="fill:#FFFFFF" />
+	
+	<path id="path6999" 
+	d="m233.1 455.1c-87.3-66.3 66.2 239.8 88.3 256.3 31.3 39.1 55.6 123.7 81.2 151.8s123.2 38.4 158.4 6.5 76.5-180 66.4-269.3c-0.4-90.4-5-180.8-1.4-271.3 2.4-33.2-42.1-34-40.7-0.7-0.5 33.3-0.9 66.7-1.5 100-0.3 16.5-9.6 26.6-23.6 26.2-60.5-8.5 17.7-210.7-40-219.9-56.8 10 14.9 211.2-46 218.1-62.2-6.3 18.3-243.8-39.2-255.1-60.1 9.3 16 247.1-47.7 253.9-14-0.4-22.4-11.1-22.2-28.6-8.9-41.8 25.5-179.1-17.6-190.7-47.3 20-11.8 217.8-24.3 275.7-16.5 80.6-69.8-29.1-90.1-52.9z"
+    style="fill:#ED6B21" />
+</g>
 
-<svg
-   version="1.1"
-   x="0px"
-   y="0px"
-   viewBox="0 0 1000 1000"
-   enable-background="new 0 0 1000 1000"
-   xml:space="preserve"
-   id="svg3610"
-   sodipodi:docname="legend_wipe.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="defs3614" /><sodipodi:namedview
-   id="namedview3612"
-   pagecolor="#505050"
-   bordercolor="#eeeeee"
-   borderopacity="1"
-   inkscape:pageshadow="0"
-   inkscape:pageopacity="0"
-   inkscape:pagecheckerboard="0"
-   showgrid="false"
-   inkscape:zoom="0.812"
-   inkscape:cx="499.38424"
-   inkscape:cy="500.61576"
-   inkscape:window-width="1920"
-   inkscape:window-height="1001"
-   inkscape:window-x="-9"
-   inkscape:window-y="-9"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="g3606" />
-<metadata
-   id="metadata3600"> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
-<g
-   id="g3608"><g
-     transform="translate(0.000000,511.000000) scale(0.100000,-0.100000)"
-     id="g3606"><path
-       d="M5109.5,4754.8c-284.8-35.6-446.9-92.9-899.8-312.5c-504.3-245.2-557.7-265-779.2-320.4c-257.1-61.3-526-67.2-891.9-19.8c-448.9,57.3-713.9,69.2-998.7,43.5c-510.2-45.5-818.7-166.1-1069.9-415.3C300,3560.3,219,3414,155.7,3166.8C35,2690.2,106.2,2150.3,410.8,1211C576.9,698.8,616.4,510.9,616.4,208.4c-2-290.7-31.6-433.1-213.6-988.8c-168.1-512.2-235.3-769.3-267-1042.2c-41.5-338.2,9.9-670.4,144.4-925.5c77.1-146.3,334.2-409.4,494.4-502.3c288.7-168.1,731.7-284.8,1220.2-318.4c300.6-19.8,1087.7-27.7,1087.7-9.9c0,25.7-140.4,284.8-195.8,359.9c-33.6,45.5-152.3,160.2-263,251.2c-112.7,92.9-241.3,211.6-286.7,265c-476.6,559.7-694.1,1295.3-674.3,2297.9l5.9,367.8l65.3,130.5c106.8,215.6,383.7,425.2,611.1,462.8l83.1,11.9l5.9,646.7l5.9,644.7l61.3,128.5c108.8,225.4,282.8,381.7,524.1,470.7c330.2,122.6,733.7,43.5,961.1-189.8l83.1-85l302.6,29.7c978.9,94.9,1605.8,27.7,2121.9-229.4c634.8-314.4,953.2-907.7,1089.6-2032.9c73.2-595.2,39.6-1592-71.2-2096.2c-57.4-267-106.8-369.8-288.7-613c-233.4-308.5-324.3-524.1-324.3-765.3v-65.3h164.1c452.9,2,759.4,65.3,957.2,195.8c259.1,174,350,373.8,480.5,1058c193.8,1002.6,367.8,1410,838.5,1957.8c195.8,227.4,251.1,308.5,357.9,530c219.5,456.8,263,1018.4,118.7,1558.3c-102.8,381.7-265,670.4-524.1,931.5c-241.3,243.2-407.4,330.2-769.3,405.4c-688.2,142.4-1058,391.6-1495,1006.6c-102.8,144.4-229.4,300.6-280.8,344.1C6404.8,4691.5,5746.3,4833.9,5109.5,4754.8z"
-       id="path3602"
-       style="fill:#ffffff;fill-opacity:1" /><path
-       d="M3377.1,1887.3c-183.9-27.7-359.9-162.2-441-334.2c-39.6-83.1-41.5-130.5-51.4-749.5l-9.9-660.5l-138.4-27.7c-263-53.4-456.8-189.8-502.3-356c-45.5-162.1-15.8-731.7,57.3-1087.7c118.7-575.5,348.1-963.1,773.2-1303.2c166.1-132.5,280.8-261,365.8-417.3c148.3-263,235.3-591.3,261-980.9l13.8-199.7l106.8-63.3c162.2-96.9,492.4-199.7,759.4-235.3c579.4-75.1,1152.9,0,1562.3,205.7l181.9,91l11.9,533.9c7.9,350,19.8,561.6,35.6,613c49.4,150.3,156.2,336.2,308.5,533.9c237.3,308.5,276.9,405.4,340.1,838.5c45.5,320.4,45.5,1103.5-2,1445.6c-94.9,704-288.7,1230.1-561.6,1526.7c-176,189.8-399.5,290.7-814.8,363.9c-168.1,29.7-304.6,37.6-721.8,37.6c-300.6,0-599.2-11.9-717.9-25.7l-203.7-25.7l-79.1,89C3778.6,1849.8,3580.8,1919,3377.1,1887.3z"
-       id="path3604"
-       style="fill:#ed6b21;fill-opacity:1" /></g></g>
 </svg>