diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_AreaDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_AreaDimension.svg
index 534f53298b..c9f73d8e05 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_AreaDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_AreaDimension.svg
@@ -1,88 +1,101 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="32"
-   height="32"
+   width="64"
+   height="64"
    fill-rule="evenodd"
    stroke-linejoin="round"
    stroke-width="28.222"
    preserveAspectRatio="xMidYMid"
    version="1.2"
-   viewBox="0 0 847 847"
+   viewBox="0 0 1694 1694"
    xml:space="preserve"
    id="svg82"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs59741" />
-   <path
-   style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:40;stroke-dasharray:none;stroke-opacity:1"
-   d="m 132.29166,145.52083 c 2.59961,79.30664 0,560.91664 0,560.91664 h 555.62497 c 0,0 -60.40195,-478.89582 -555.62497,-560.91664 z"
-   id="path9284" /><path
-   d="m 89,739 v -38 h 658 v 75 H 89 Z"
-   fill="#ffff00"
-   id="path39"
-   style="stroke-width:26.45833208;stroke-dasharray:none;fill:#ffff00;fill-opacity:0.5" /><path
-   style="color:#000000;fill:#ffff00;fill-opacity:0.5;stroke:#000000;stroke-opacity:1;stroke-width:26.45833208;stroke-dasharray:none"
-   d="M 103.6582,66.435547 95.142578,140.95117 C 411.93941,177.15284 662.08158,425.70415 700.30273,742.26367 l 74.45899,-8.99023 C 732.42643,382.63938 454.5551,106.53397 103.6582,66.435547 Z"
-   id="path3929" /><path
-   d="m 89,739 v -38 h 658 v 75 H 89 Z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="round"
-   stroke-width="25"
-   id="path41" /><path
-   d="m 100,92 h 38 V 750 H 63 V 92 Z"
-   fill="#ffff00"
-   id="path51"
-   style="fill:#ffff00;fill-opacity:0.5" /><path
-   d="m 100,92 h 38 V 750 H 63 V 92 Z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="round"
-   stroke-width="25"
-   id="path53"
-   style="stroke-width:26.45833208;stroke-dasharray:none;stroke:#2b2200;stroke-opacity:1" /><path
-   d="m 18,747 c 0,-14 4,-29 11,-41 8,-13 18,-24 31,-31 13,-7 28,-11 43,-11 15,0 30,4 43,11 13,7 23,18 31,31 7,12 11,27 11,41 0,15 -4,29 -11,42 -8,13 -18,23 -31,31 -13,7 -28,11 -43,11 C 88,831 73,827 60,820 47,812 37,802 29,789 22,776 18,762 18,747 Z"
-   fill="#ffff00"
-   id="path55" /><path
-   d="m 18,747 c 0,-14 4,-29 11,-41 8,-13 18,-24 31,-31 13,-7 28,-11 43,-11 15,0 30,4 43,11 13,7 23,18 31,31 7,12 11,27 11,41 0,15 -4,29 -11,42 -8,13 -18,23 -31,31 -13,7 -28,11 -43,11 C 88,831 73,827 60,820 47,812 37,802 29,789 22,776 18,762 18,747 Z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="miter"
-   stroke-width="32"
-   id="path57"
-   transform="translate(-1)"
-   style="stroke-width:31.74999664;stroke-dasharray:none" /><path
-   d="m 655,740 c 0,-14 4,-29 12,-41 7,-13 18,-24 31,-31 13,-7 28,-11 43,-11 15,0 29,4 42,11 13,7 24,18 31,31 8,12 12,27 12,42 0,14 -4,29 -12,41 -7,13 -18,24 -31,31 -13,7 -27,11 -42,11 -15,0 -30,-4 -43,-11 -13,-7 -24,-18 -31,-31 -8,-12 -12,-27 -12,-41 z"
-   fill="#ffff00"
-   id="path59" /><path
-   d="M 17,99 C 17,84 21,70 28,57 36,44 46,34 59,26 72,19 87,15 102,15 c 15,0 30,4 43,11 13,8 23,18 31,31 7,13 11,27 11,42 0,14 -4,29 -11,41 -8,13 -18,24 -31,31 -13,7 -28,11 -43,11 C 87,182 72,178 59,171 46,164 36,153 28,140 21,128 17,113 17,99 Z"
-   fill="#ffff00"
-   id="path63" /><path
-   d="M 17,99 C 17,84 21,70 28,57 36,44 46,34 59,26 72,19 87,15 102,15 c 15,0 30,4 43,11 13,8 23,18 31,31 7,13 11,27 11,42 0,14 -4,29 -11,41 -8,13 -18,24 -31,31 -13,7 -28,11 -43,11 C 87,182 72,178 59,171 46,164 36,153 28,140 21,128 17,113 17,99 Z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="miter"
-   stroke-width="32"
-   id="path65"
-   transform="translate(0,0.99999995)"
-   style="stroke-width:31.74999849;stroke-dasharray:none" /><path
-   d="m 656,746.97497 c 0,-14 4,-29 11,-41 8,-13 18,-24 31,-31 13,-7 28,-11 43,-11 15,0 30,4 43,11 13,7 23,18 31,31 7,12 11,27 11,41 0,15 -4,29 -11,42 -8,13 -18,23 -31,31 -13,7 -28,11 -43,11 -15,0 -30,-4 -43,-11 -13,-8 -23,-18 -31,-31 -7,-13 -11,-27 -11,-42 z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="miter"
-   stroke-width="32"
-   id="path2099"
-   style="stroke-width:31.69999859;stroke-dasharray:none" /><path
-   style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:31.75;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
-   d="m 355.76119,499.64268 271.75349,-272.10103 170.23756,0.82473 -170.23756,-0.82473 z"
-   id="path11628" /><g
-   aria-label="m²"
-   id="text12358"
-   style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:15;stroke-linecap:square;stroke-opacity:1"
-   transform="translate(24.619763,-23.169807)"><path
-     d="m 628.46354,90.830168 q 0,-3.617357 2.68718,-6.097829 1.65365,-1.550296 5.89112,-1.550296 0,0 67.79959,0 13.4359,0 22.2209,8.061537 10.43866,9.50848 10.43866,21.80749 0,0 0,70.69347 0,9.09507 -7.23471,9.09507 -7.95818,0 -7.95818,-9.40513 0,0 0,-68.83312 0,-7.13135 -4.34083,-11.26548 -5.0643,-4.857588 -12.60907,-4.857588 h -14.67613 v 85.059548 q 0,8.99171 -7.33807,8.99171 -8.26824,0 -8.26824,-8.26824 V 98.478292 h -31.72938 v 86.299778 q 0,7.85483 -7.44142,7.85483 -7.44142,0 -7.44142,-7.33806 z"
-     style="font-family:osifont;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-opacity:1"
-     id="path37062" /><path
-     d="m 792.58816,58.894081 q 0,-6.8213 -7.75148,-6.8213 -5.68441,0 -8.68165,7.338065 -2.48047,6.097829 -6.51124,6.097829 -8.3716,0 -8.3716,-7.131359 0,-4.547534 2.89389,-8.578302 4.44418,-6.201182 8.5783,-9.095066 4.54753,-3.203944 13.12583,-3.203944 10.43866,0 17.88008,8.785007 4.13412,4.857593 4.13412,12.092305 0,9.095067 -7.64812,18.500192 l -15.29625,17.880075 h 13.43589 q 9.71519,0 9.71519,7.028007 0,8.06154 -8.47495,8.06154 h -30.17909 q -8.16489,0 -8.16489,-7.13136 0,-2.790536 4.34083,-7.958187 l 24.59802,-29.352261 q 2.37712,-2.997238 2.37712,-6.511241 z"
-     style="font-family:osifont;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-opacity:1"
-     id="path37064" /></g></svg>
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><title
+   id="title7">TechDraw_Dimension_Angle</title><defs
+   id="defs59741"><linearGradient
+     id="linearGradient5"><stop
+       style="stop-color:#c4a000;stop-opacity:1;"
+       offset="0"
+       id="stop5" /><stop
+       style="stop-color:#edd400;stop-opacity:1;"
+       offset="1"
+       id="stop6" /></linearGradient><rect
+     x="61.492918"
+     y="5.5774288"
+     width="4.9420253"
+     height="6.9894365"
+     id="rect2" /><rect
+     x="23.721723"
+     y="3.8124197"
+     width="15.108478"
+     height="10.731255"
+     id="rect1" /><linearGradient
+     xlink:href="#linearGradient3036"
+     id="linearGradient3919"
+     x1="9"
+     y1="50"
+     x2="5"
+     y2="38"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     id="linearGradient3036"><stop
+       id="stop3038"
+       offset="0"
+       style="stop-color:#c4a000;stop-opacity:1" /><stop
+       id="stop3040"
+       offset="1"
+       style="stop-color:#fce94f;stop-opacity:1" /></linearGradient><linearGradient
+     xlink:href="#linearGradient5"
+     id="linearGradient6"
+     x1="702.70618"
+     y1="249.06598"
+     x2="263.62314"
+     y2="591.93341"
+     gradientUnits="userSpaceOnUse"
+     gradientTransform="translate(0.25335181,0.24744418)" /><linearGradient
+     xlink:href="#linearGradient5"
+     id="linearGradient10"
+     gradientUnits="userSpaceOnUse"
+     x1="702.70618"
+     y1="249.06598"
+     x2="263.62314"
+     y2="591.93341"
+     gradientTransform="translate(79.406241,-79.40624)" /></defs>
+   <metadata
+   id="metadata7"><rdf:RDF><cc:Work
+       rdf:about=""><dc:title>TechDraw_Dimension_Angle</dc:title></cc:Work></rdf:RDF></metadata><g
+   id="layer2"><g
+     id="g13-7"
+     transform="matrix(2.4612417,0,0,2.4940196,-2113.5219,-331.36993)"
+     style="display:inline;stroke-width:11.3909"><g
+       id="g9"
+       transform="matrix(0.99999469,0,0,1,64.530402,0)"
+       style="stroke-width:11.3909"><g
+         id="g5-6"
+         transform="matrix(0.39508032,0,0,0.38988928,859.6121,152.06586)"
+         style="stroke-width:11.7143"><path
+           style="font-size:847px;line-height:0px;font-family:Tahoma;-inkscape-font-specification:Tahoma;text-align:end;letter-spacing:26.4688px;word-spacing:0px;text-anchor:end;display:inline;opacity:1;fill:none;stroke:#302b00;stroke-width:217.763;stroke-linecap:round;stroke-dasharray:none;stroke-dashoffset:5.4;paint-order:markers fill stroke"
+           d="m 767.33718,1447.8573 -1.53513,-176.2028 c -0.34143,-39.1892 -1.53516,-75.3276 -4.60542,-108.4106 -3.07027,-33.5921 -9.46666,-59.8041 -19.1892,-78.636 -10.23425,-20.3588 -24.81804,-35.3734 -43.75138,-45.0439 -18.93335,-9.6704 -44.51896,-14.5057 -76.7568,-14.5057 -29.67931,0 -61.66133,9.1616 -95.94602,27.4845 -33.77301,17.8139 -68.82529,43.7715 -105.15684,77.8725 0.51173,8.6524 0.75215,19.1005 1.53514,31.3016 0.75254,11.7266 -0.30155,-58.5196 1.53513,41.99 v 244.1504 c 0,-39.1906 -1.53513,-275.1977 -4.60539,-308.2808 -3.07028,-33.592 -9.46668,-59.804 -19.18922,-78.6359 -10.23423,-20.3589 -24.81802,-35.3735 -43.75137,-45.0439 -18.93334,-9.6704 -44.51895,-14.5056 -76.75682,-14.5056 -31.21444,0 -63.964,9.6705 -98.24869,29.0113 -34.28473,19.3409 -67.54601,44.0259 -99.783868,74.0552 l -1.53516,343.3997 -0.190551,-442.0349"
+           id="path2" /><path
+           style="font-size:847px;line-height:0px;font-family:Tahoma;-inkscape-font-specification:Tahoma;text-align:end;letter-spacing:26.4688px;word-spacing:0px;text-anchor:end;display:inline;opacity:1;fill:none;stroke:#edd400;stroke-width:108.881;stroke-linecap:round;stroke-dasharray:none;stroke-dashoffset:5.4;paint-order:markers fill stroke"
+           d="m 767.33718,1447.8573 -1.53513,-176.2028 c -0.34143,-39.1892 -1.53516,-75.3276 -4.60542,-108.4106 -3.07027,-33.5921 -9.46666,-59.8041 -19.1892,-78.636 -10.23425,-20.3588 -24.81804,-35.3734 -43.75138,-45.0439 -18.93335,-9.6704 -44.51896,-14.5057 -76.7568,-14.5057 -29.67931,0 -61.66133,9.1616 -95.94602,27.4845 -33.77301,17.8139 -68.82529,43.7715 -105.15684,77.8725 0.51173,8.6524 0.75215,19.1005 1.53514,31.3016 0.75254,11.7266 -0.30155,-58.5196 1.53513,41.99 v 244.1504 c 0,-39.1906 -1.53513,-275.1977 -4.60539,-308.2808 -3.07028,-33.592 -9.46668,-59.804 -19.18922,-78.6359 -10.23423,-20.3589 -24.81802,-35.3735 -43.75137,-45.0439 -18.93334,-9.6704 -44.51895,-14.5056 -76.75682,-14.5056 -31.21444,0 -63.964,9.6705 -98.24869,29.0113 -34.28473,19.3409 -67.54601,44.0259 -99.783868,74.0552 l -1.53516,343.3997 -0.190551,-442.0349"
+           id="path4" /><path
+           style="font-size:847px;line-height:0px;font-family:Tahoma;-inkscape-font-specification:Tahoma;text-align:end;letter-spacing:26.4688px;word-spacing:0px;text-anchor:end;display:inline;opacity:1;fill:none;stroke:#fce94f;stroke-width:54.4408;stroke-linecap:round;stroke-dasharray:none;stroke-dashoffset:5.4;paint-order:markers fill stroke"
+           d="m 740.86822,1421.3996 -1.53513,-176.2028 c -0.34143,-39.1892 -1.53516,-75.3276 -4.60542,-108.4106 -3.07027,-33.5921 -9.46666,-59.8041 -19.1892,-78.636 -10.23425,-20.3588 -24.81804,-35.3734 -43.75138,-45.0439 -18.93335,-9.6704 -44.51896,-14.50567 -76.7568,-14.50567 -29.67931,0 -61.66133,9.16157 -95.94602,27.48447 -33.77301,17.8139 -68.82529,43.7715 -105.15684,77.8725 0.51173,8.6524 0.75215,19.1005 1.53514,31.3016 0.75254,11.7266 -0.30155,-58.5196 1.53513,41.99 v 244.1504 c 0,-39.1906 -1.53513,-275.1977 -4.60539,-308.2808 -3.07028,-33.592 -9.46668,-59.804 -19.18922,-78.6359 -10.23423,-20.3589 -24.81802,-35.37347 -43.75137,-45.04387 -18.93334,-9.6704 -44.51895,-14.5056 -76.75682,-14.5056 -31.21444,0 -63.964,9.6705 -98.24869,29.01127 -34.28473,19.3409 -67.546011,44.0259 -99.783869,74.0552 l -1.53516,343.3997 -0.190551,-442.03487"
+           id="path6" /></g><g
+         id="g8-3"
+         transform="matrix(0.99999139,0,0,1,-16.112995,-57.517159)"
+         style="stroke-width:11.3909"><path
+           style="fill:none;stroke:#302b00;stroke-width:85.4672;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:normal"
+           d="m 1230.0224,313.28491 c 0,0 29.3485,-19.56275 62.3662,-25.52568 23.6676,-4.27432 69.0895,-1.43331 82.536,46.75145 18.9996,68.08408 -172.5333,216.34002 -134.148,215.91254 38.3853,-0.42748 161.3134,0 161.3134,0"
+           id="path5" /><path
+           style="fill:none;stroke:#edd400;stroke-width:42.7336;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:normal"
+           d="m 1230.0224,313.28491 c 0,0 29.3485,-19.56275 62.3662,-25.52568 23.6676,-4.27432 69.0895,-1.43331 82.536,46.75145 18.9996,68.08408 -172.5333,216.34002 -134.148,215.91254 38.3853,-0.42748 161.3134,0 161.3134,0"
+           id="path9" /><path
+           style="fill:none;stroke:#fce94f;stroke-width:21.3668;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:normal"
+           d="m 1219.2697,307.23869 c 0,0 29.3485,-19.56275 62.3662,-25.52568 23.6676,-4.27432 69.0895,-1.43331 82.536,46.75145 18.9996,68.08408 -172.5333,216.34002 -134.148,215.91254 38.3853,-0.42748 161.3134,0 161.3134,0"
+           id="path7" /></g></g></g></g></svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionArcLengthAnnotation.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionArcLengthAnnotation.svg
index 626721add0..2c4af9d04a 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionArcLengthAnnotation.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionArcLengthAnnotation.svg
@@ -1,85 +1,33 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="32.0126"
-   height="32.0126"
+   width="64"
+   height="64"
    fill-rule="evenodd"
    stroke-linejoin="round"
    stroke-width="28.222"
    preserveAspectRatio="xMidYMid"
    version="1.2"
-   viewBox="0 0 847.00001 847.00001"
+   viewBox="0 0 1693.3332 1693.3333"
    xml:space="preserve"
    id="svg82"
-   sodipodi:docname="TechDraw_ExtensionArcLengthAnnotation.svg"
-   inkscape:version="1.3 (0e150ed, 2023-07-21)"
-   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"><sodipodi:namedview
-   id="namedview1"
-   pagecolor="#ffffff"
-   bordercolor="#000000"
-   borderopacity="0.25"
-   inkscape:showpageshadow="2"
-   inkscape:pageopacity="0.0"
-   inkscape:pagecheckerboard="0"
-   inkscape:deskcolor="#d1d1d1"
-   inkscape:document-units="mm"
-   showgrid="false"
-   inkscape:zoom="6.6706938"
-   inkscape:cx="51.418939"
-   inkscape:cy="32.080621"
-   inkscape:window-width="2560"
-   inkscape:window-height="1412"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="svg82"><inkscape:grid
-     id="grid1"
-     units="px"
-     originx="0"
-     originy="0"
-     spacingx="26.458332"
-     spacingy="26.458332"
-     empcolor="#0099e5"
-     empopacity="0.30196078"
-     color="#0099e5"
-     opacity="0.14901961"
-     empspacing="5"
-     dotted="false"
-     gridanglex="30"
-     gridanglez="30"
-     visible="false" /></sodipodi:namedview><defs
-   id="defs59741" />&#10;   <path
-   style="color:#000000;fill:#ffff00;fill-opacity:1;stroke:#2b2200;stroke-width:25;stroke-linecap:square;stroke-dasharray:none;stroke-opacity:1"
-   d="M 139.30664,60.808594 64.308594,61.193359 64.5,98.691406 C 65.47544,289.07192 90.068844,401.427 139.06055,472.60937 c 48.9917,71.18238 122.68041,90.95647 191.15234,97.12696 68.47193,6.17049 136.50518,3.52965 199.00781,24.53515 62.50263,21.0055 122.38516,63.00294 178.53711,170.5586 l 17.35547,33.24219 66.48438,-34.70899 -17.35547,-33.24414 C 711.24841,609.45837 632.16195,549.74653 553.11133,523.17969 474.06071,496.61284 397.95568,500.53731 336.94336,495.03906 275.93104,489.54081 234.78881,479.41112 200.8418,430.08789 166.89478,380.76466 140.44122,282.01102 139.5,98.308594 Z"
-   id="path1" /><path
-   d="m 655.5,746.97497 c 0,-14 4,-29 12,-41 7,-13 18,-24 31,-31 13,-7 28,-11 43,-11 15,0 29,4 42,11 13,7 24,18 31,31 8,12 12,27 12,42 0,14 -4,29 -12,41 -7,13 -18,24 -31,31 -13,7 -27,11 -42,11 -15,0 -30,-4 -43,-11 -13,-7 -24,-18 -31,-31 -8,-12 -12,-27 -12,-41 z"
-   fill="#ffff00"
-   id="path59" /><path
-   d="m 656,746.97497 c 0,-14 4,-29 11,-41 8,-13 18,-24 31,-31 13,-7 28,-11 43,-11 15,0 30,4 43,11 13,7 23,18 31,31 7,12 11,27 11,41 0,15 -4,29 -11,42 -8,13 -18,23 -31,31 -13,7 -28,11 -43,11 -15,0 -30,-4 -43,-11 -13,-8 -23,-18 -31,-31 -7,-13 -11,-27 -11,-42 z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="miter"
-   stroke-width="32"
-   id="path2099"
-   style="stroke-width:31.7;stroke-dasharray:none" /><path
-   d="M 17,99 C 17,84 21,70 28,57 36,44 46,34 59,26 72,19 87,15 102,15 c 15,0 30,4 43,11 13,8 23,18 31,31 7,13 11,27 11,42 0,14 -4,29 -11,41 -8,13 -18,24 -31,31 -13,7 -28,11 -43,11 C 87,182 72,178 59,171 46,164 36,153 28,140 21,128 17,113 17,99 Z"
-   fill="#ffff00"
-   id="path63" /><path
-   d="M 17,100 C 17,85 21,71 28,58 36,45 46,35 59,27 72,20 87,16 102,16 c 15,0 30,4 43,11 13,8 23,18 31,31 7,13 11,27 11,42 0,14 -4,29 -11,41 -8,13 -18,24 -31,31 -13,7 -28,11 -43,11 C 87,183 72,179 59,172 46,165 36,154 28,141 21,129 17,114 17,100 Z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="miter"
-   stroke-width="32"
-   id="path65"
-   style="stroke-width:31.75;stroke-dasharray:none" /><path
-   style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:31.75;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
-   d="m 361.73725,521.68518 118.59012,-268.13469 338.18717,0 -337.74861,-0.99159 z"
-   id="path11628"
-   sodipodi:nodetypes="ccccc" /><path
-   d="m 505.70673,179.7776 c -0.0719,17.42336 -17.29632,17.42336 -17.4408,0 v -8.72039 c 0,-11.78223 2.32544,-22.98309 6.97632,-33.6026 4.65088,-10.61951 10.96832,-19.76624 18.95233,-27.44019 7.90649,-7.59644 17.28577,-13.681336 28.13782,-18.2547 10.85205,-4.573365 22.2467,-6.860047 34.18396,-6.860047 11.78223,0 23.17688,2.286682 34.18396,6.860047 10.85205,4.495849 20.23132,10.58075 28.13781,18.2547 7.98401,7.75147 14.30146,16.8982 18.95234,27.44019 4.65087,10.69702 6.97631,21.89789 6.97631,33.6026 v 8.72039 c -0.0719,17.42336 -17.19363,17.42336 -17.44079,0 v -8.72039 c 0,-9.14673 -1.86035,-17.9834 -5.58106,-26.51001 -3.7207,-8.52661 -8.72039,-15.85175 -14.99908,-21.97541 -6.3562,-6.20117 -13.91388,-11.12335 -22.67304,-14.76654 -8.75915,-3.64319 -17.94464,-5.46478 -27.55645,-5.46478 -9.76685,0 -18.95233,1.82159 -27.55646,5.46478 -8.75915,3.72071 -16.31683,8.64289 -22.67303,14.76654 -6.27869,6.04615 -11.27838,13.37128 -14.99909,21.97541 -3.7207,8.44909 -5.58105,17.28576 -5.58105,26.51001 z M 812.96722,39.786148 c 6.51123,0 9.76685,2.713013 9.76685,8.139038 0,1.705323 -0.8139,6.23993 -2.44171,13.603821 L 788.08502,207.21779 c -1.16272,5.42603 -3.83697,8.13904 -8.02276,8.13904 -5.96863,0 -8.95295,-2.55798 -8.95295,-7.67395 0,-1.08521 0.11627,-2.17041 0.34882,-3.25562 l 32.7887,-147.549132 h -52.08985 v 8.720398 c 0,5.50354 -2.82928,8.25531 -8.48785,8.25531 -5.34851,0 -8.02277,-2.868042 -8.02277,-8.604126 V 47.57637 c 0,-5.193481 3.10059,-7.790222 9.30176,-7.790222 z"
-   id="text2"
-   style="font-size:238.125px;line-height:1.2;font-family:osifont;-inkscape-font-specification:osifont;fill:#ff0000;stroke:#ff0000;stroke-width:15;stroke-linecap:square;stroke-linejoin:miter"
-   aria-label="⌒ 7"
-   sodipodi:nodetypes="ccsscsscccsccsscsscccscssccsscccssssss" /></svg>
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><title
+   id="title1">TechDraw_Dimension_Angle</title><defs
+   id="defs59741" />
+   <metadata
+   id="metadata1"><rdf:RDF><cc:Work
+       rdf:about=""><dc:title>TechDraw_Dimension_Angle</dc:title></cc:Work></rdf:RDF></metadata><g
+   id="g4"
+   transform="translate(0,-52.916304)"><path
+     style="display:inline;fill:none;stroke:#302b00;stroke-width:211.667;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 158.75017,1217.0831 c 0,0 62.36606,-634.99998 701.14562,-634.99998 638.77951,0 674.68731,634.99998 674.68731,634.99998"
+     id="path2" /><path
+     style="display:inline;fill:none;stroke:#edd400;stroke-width:105.833;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 158.75017,1217.0831 c 0,0 62.36606,-634.99998 701.14562,-634.99998 638.77951,0 674.68731,634.99998 674.68731,634.99998"
+     id="path1" /><path
+     style="display:inline;fill:none;stroke:#fce94f;stroke-width:52.9167;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 132.29166,1190.6248 c 0,0 62.36606,-634.99999 701.14562,-634.99999 638.77952,0 674.68732,634.99999 674.68732,634.99999"
+     id="path5" /></g></svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionAreaAnnotation.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionAreaAnnotation.svg
index 534f53298b..46697b7b43 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionAreaAnnotation.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionAreaAnnotation.svg
@@ -1,88 +1,144 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   width="32"
-   height="32"
+   width="64"
+   height="64"
    fill-rule="evenodd"
    stroke-linejoin="round"
    stroke-width="28.222"
    preserveAspectRatio="xMidYMid"
    version="1.2"
-   viewBox="0 0 847 847"
+   viewBox="0 0 1694 1694"
    xml:space="preserve"
    id="svg82"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><defs
-   id="defs59741" />
-   <path
-   style="fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:40;stroke-dasharray:none;stroke-opacity:1"
-   d="m 132.29166,145.52083 c 2.59961,79.30664 0,560.91664 0,560.91664 h 555.62497 c 0,0 -60.40195,-478.89582 -555.62497,-560.91664 z"
-   id="path9284" /><path
-   d="m 89,739 v -38 h 658 v 75 H 89 Z"
-   fill="#ffff00"
-   id="path39"
-   style="stroke-width:26.45833208;stroke-dasharray:none;fill:#ffff00;fill-opacity:0.5" /><path
-   style="color:#000000;fill:#ffff00;fill-opacity:0.5;stroke:#000000;stroke-opacity:1;stroke-width:26.45833208;stroke-dasharray:none"
-   d="M 103.6582,66.435547 95.142578,140.95117 C 411.93941,177.15284 662.08158,425.70415 700.30273,742.26367 l 74.45899,-8.99023 C 732.42643,382.63938 454.5551,106.53397 103.6582,66.435547 Z"
-   id="path3929" /><path
-   d="m 89,739 v -38 h 658 v 75 H 89 Z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="round"
-   stroke-width="25"
-   id="path41" /><path
-   d="m 100,92 h 38 V 750 H 63 V 92 Z"
-   fill="#ffff00"
-   id="path51"
-   style="fill:#ffff00;fill-opacity:0.5" /><path
-   d="m 100,92 h 38 V 750 H 63 V 92 Z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="round"
-   stroke-width="25"
-   id="path53"
-   style="stroke-width:26.45833208;stroke-dasharray:none;stroke:#2b2200;stroke-opacity:1" /><path
-   d="m 18,747 c 0,-14 4,-29 11,-41 8,-13 18,-24 31,-31 13,-7 28,-11 43,-11 15,0 30,4 43,11 13,7 23,18 31,31 7,12 11,27 11,41 0,15 -4,29 -11,42 -8,13 -18,23 -31,31 -13,7 -28,11 -43,11 C 88,831 73,827 60,820 47,812 37,802 29,789 22,776 18,762 18,747 Z"
-   fill="#ffff00"
-   id="path55" /><path
-   d="m 18,747 c 0,-14 4,-29 11,-41 8,-13 18,-24 31,-31 13,-7 28,-11 43,-11 15,0 30,4 43,11 13,7 23,18 31,31 7,12 11,27 11,41 0,15 -4,29 -11,42 -8,13 -18,23 -31,31 -13,7 -28,11 -43,11 C 88,831 73,827 60,820 47,812 37,802 29,789 22,776 18,762 18,747 Z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="miter"
-   stroke-width="32"
-   id="path57"
-   transform="translate(-1)"
-   style="stroke-width:31.74999664;stroke-dasharray:none" /><path
-   d="m 655,740 c 0,-14 4,-29 12,-41 7,-13 18,-24 31,-31 13,-7 28,-11 43,-11 15,0 29,4 42,11 13,7 24,18 31,31 8,12 12,27 12,42 0,14 -4,29 -12,41 -7,13 -18,24 -31,31 -13,7 -27,11 -42,11 -15,0 -30,-4 -43,-11 -13,-7 -24,-18 -31,-31 -8,-12 -12,-27 -12,-41 z"
-   fill="#ffff00"
-   id="path59" /><path
-   d="M 17,99 C 17,84 21,70 28,57 36,44 46,34 59,26 72,19 87,15 102,15 c 15,0 30,4 43,11 13,8 23,18 31,31 7,13 11,27 11,42 0,14 -4,29 -11,41 -8,13 -18,24 -31,31 -13,7 -28,11 -43,11 C 87,182 72,178 59,171 46,164 36,153 28,140 21,128 17,113 17,99 Z"
-   fill="#ffff00"
-   id="path63" /><path
-   d="M 17,99 C 17,84 21,70 28,57 36,44 46,34 59,26 72,19 87,15 102,15 c 15,0 30,4 43,11 13,8 23,18 31,31 7,13 11,27 11,42 0,14 -4,29 -11,41 -8,13 -18,24 -31,31 -13,7 -28,11 -43,11 C 87,182 72,178 59,171 46,164 36,153 28,140 21,128 17,113 17,99 Z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="miter"
-   stroke-width="32"
-   id="path65"
-   transform="translate(0,0.99999995)"
-   style="stroke-width:31.74999849;stroke-dasharray:none" /><path
-   d="m 656,746.97497 c 0,-14 4,-29 11,-41 8,-13 18,-24 31,-31 13,-7 28,-11 43,-11 15,0 30,4 43,11 13,7 23,18 31,31 7,12 11,27 11,41 0,15 -4,29 -11,42 -8,13 -18,23 -31,31 -13,7 -28,11 -43,11 -15,0 -30,-4 -43,-11 -13,-8 -23,-18 -31,-31 -7,-13 -11,-27 -11,-42 z"
-   fill="none"
-   stroke="#2b2200"
-   stroke-linejoin="miter"
-   stroke-width="32"
-   id="path2099"
-   style="stroke-width:31.69999859;stroke-dasharray:none" /><path
-   style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:31.75;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
-   d="m 355.76119,499.64268 271.75349,-272.10103 170.23756,0.82473 -170.23756,-0.82473 z"
-   id="path11628" /><g
-   aria-label="m²"
-   id="text12358"
-   style="fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:15;stroke-linecap:square;stroke-opacity:1"
-   transform="translate(24.619763,-23.169807)"><path
-     d="m 628.46354,90.830168 q 0,-3.617357 2.68718,-6.097829 1.65365,-1.550296 5.89112,-1.550296 0,0 67.79959,0 13.4359,0 22.2209,8.061537 10.43866,9.50848 10.43866,21.80749 0,0 0,70.69347 0,9.09507 -7.23471,9.09507 -7.95818,0 -7.95818,-9.40513 0,0 0,-68.83312 0,-7.13135 -4.34083,-11.26548 -5.0643,-4.857588 -12.60907,-4.857588 h -14.67613 v 85.059548 q 0,8.99171 -7.33807,8.99171 -8.26824,0 -8.26824,-8.26824 V 98.478292 h -31.72938 v 86.299778 q 0,7.85483 -7.44142,7.85483 -7.44142,0 -7.44142,-7.33806 z"
-     style="font-family:osifont;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-opacity:1"
-     id="path37062" /><path
-     d="m 792.58816,58.894081 q 0,-6.8213 -7.75148,-6.8213 -5.68441,0 -8.68165,7.338065 -2.48047,6.097829 -6.51124,6.097829 -8.3716,0 -8.3716,-7.131359 0,-4.547534 2.89389,-8.578302 4.44418,-6.201182 8.5783,-9.095066 4.54753,-3.203944 13.12583,-3.203944 10.43866,0 17.88008,8.785007 4.13412,4.857593 4.13412,12.092305 0,9.095067 -7.64812,18.500192 l -15.29625,17.880075 h 13.43589 q 9.71519,0 9.71519,7.028007 0,8.06154 -8.47495,8.06154 h -30.17909 q -8.16489,0 -8.16489,-7.13136 0,-2.790536 4.34083,-7.958187 l 24.59802,-29.352261 q 2.37712,-2.997238 2.37712,-6.511241 z"
-     style="font-family:osifont;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-opacity:1"
-     id="path37064" /></g></svg>
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><title
+   id="title7">TechDraw_Dimension_Angle</title><defs
+   id="defs59741"><linearGradient
+     id="linearGradient9"><stop
+       style="stop-color:#c4a000;stop-opacity:1"
+       offset="0"
+       id="stop9" /><stop
+       style="stop-color:#edd400;stop-opacity:1"
+       offset="1"
+       id="stop10" /></linearGradient><linearGradient
+     id="linearGradient22"><stop
+       style="stop-color:#c4a000;stop-opacity:1;"
+       offset="0"
+       id="stop22" /><stop
+       style="stop-color:#edd400;stop-opacity:1;"
+       offset="1"
+       id="stop23" /></linearGradient><linearGradient
+     id="linearGradient8"><stop
+       style="stop-color:#c4a000;stop-opacity:1"
+       offset="0"
+       id="stop7" /><stop
+       style="stop-color:#edd400;stop-opacity:1"
+       offset="1"
+       id="stop8" /></linearGradient><linearGradient
+     id="linearGradient5"><stop
+       style="stop-color:#c4a000;stop-opacity:1;"
+       offset="0"
+       id="stop5" /><stop
+       style="stop-color:#edd400;stop-opacity:1;"
+       offset="1"
+       id="stop6" /></linearGradient><rect
+     x="61.492918"
+     y="5.5774288"
+     width="4.9420253"
+     height="6.9894365"
+     id="rect2" /><rect
+     x="23.721723"
+     y="3.8124197"
+     width="15.108478"
+     height="10.731255"
+     id="rect1" /><linearGradient
+     xlink:href="#linearGradient3036"
+     id="linearGradient3919"
+     x1="9"
+     y1="50"
+     x2="5"
+     y2="38"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     id="linearGradient3036"><stop
+       id="stop3038"
+       offset="0"
+       style="stop-color:#c4a000;stop-opacity:1" /><stop
+       id="stop3040"
+       offset="1"
+       style="stop-color:#fce94f;stop-opacity:1" /></linearGradient><linearGradient
+     xlink:href="#linearGradient5"
+     id="linearGradient6"
+     x1="702.70618"
+     y1="249.06598"
+     x2="263.62314"
+     y2="591.93341"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     xlink:href="#linearGradient8"
+     id="linearGradient7"
+     gradientUnits="userSpaceOnUse"
+     x1="702.70618"
+     y1="249.06598"
+     x2="263.62314"
+     y2="591.93341" /><linearGradient
+     xlink:href="#linearGradient22"
+     id="linearGradient23"
+     x1="397.03059"
+     y1="847"
+     x2="1296.9694"
+     y2="847"
+     gradientUnits="userSpaceOnUse" /><linearGradient
+     xlink:href="#linearGradient9"
+     id="linearGradient10"
+     x1="185.28125"
+     y1="847"
+     x2="1508.7188"
+     y2="847"
+     gradientUnits="userSpaceOnUse" /></defs>
+   <metadata
+   id="metadata7"><rdf:RDF><cc:Work
+       rdf:about=""><dc:title>TechDraw_Dimension_Angle</dc:title></cc:Work></rdf:RDF></metadata><g
+   id="layer3"><rect
+     style="display:inline;fill:none;stroke:#555753;stroke-width:52.9375;stroke-linecap:square;stroke-dasharray:none;paint-order:normal"
+     id="rect4"
+     width="1376.375"
+     height="1376.3749"
+     x="158.8125"
+     y="158.8125" /><path
+     style="display:inline;fill:none;stroke:#d3d7cf;stroke-width:52.9375;stroke-linecap:square;stroke-dasharray:none;paint-order:normal"
+     id="rect5"
+     width="1376.375"
+     height="1376.3749"
+     x="158.8125"
+     y="158.8125"
+     d="m 211.75,211.75 h 1270.5 v 1270.5 H 211.75 Z" /><g
+     id="g9-5"
+     transform="matrix(2.4612286,0,0,2.4940196,-1954.697,-331.36993)"
+     style="display:inline;stroke-width:11.3909"><g
+       id="g5-6-5"
+       transform="matrix(0.28667922,0,0,0.2713698,909.80291,282.78648)"
+       style="stroke-width:16.4836"><path
+         style="font-size:847px;line-height:0px;font-family:Tahoma;-inkscape-font-specification:Tahoma;text-align:end;letter-spacing:26.4688px;word-spacing:0px;text-anchor:end;display:inline;opacity:1;fill:none;stroke:#302b00;stroke-width:306.421;stroke-linecap:round;stroke-dasharray:none;stroke-dashoffset:5.4;paint-order:markers fill stroke"
+         d="m 767.33718,1447.8573 -1.53513,-176.2028 c -0.34143,-39.1892 -1.53516,-75.3276 -4.60542,-108.4106 -3.07027,-33.5921 -9.46666,-59.8041 -19.1892,-78.636 -10.23425,-20.3588 -24.81804,-35.3734 -43.75138,-45.0439 -18.93335,-9.6704 -44.51896,-14.5057 -76.7568,-14.5057 -29.67931,0 -61.66133,9.1616 -95.94602,27.4845 -33.77301,17.8139 -68.82529,43.7715 -105.15684,77.8725 0.51173,8.6524 0.75215,19.1005 1.53514,31.3016 0.75254,11.7266 -0.30155,-58.5196 1.53513,41.99 v 244.1504 c 0,-39.1906 -1.53513,-275.1977 -4.60539,-308.2808 -3.07028,-33.592 -9.46668,-59.804 -19.18922,-78.6359 -10.23423,-20.3589 -24.81802,-35.3735 -43.75137,-45.0439 -18.93334,-9.6704 -44.51895,-14.5056 -76.75682,-14.5056 -31.21444,0 -63.964,9.6705 -98.24869,29.0113 -34.28473,19.3409 -67.54601,44.0259 -99.783868,74.0552 l -1.53516,343.3997 -0.190551,-442.0349"
+         id="path2" /><path
+         style="font-size:847px;line-height:0px;font-family:Tahoma;-inkscape-font-specification:Tahoma;text-align:end;letter-spacing:26.4688px;word-spacing:0px;text-anchor:end;display:inline;opacity:1;fill:none;stroke:#edd400;stroke-width:153.21;stroke-linecap:round;stroke-dasharray:none;stroke-dashoffset:5.4;paint-order:markers fill stroke"
+         d="m 767.33718,1447.8573 -1.53513,-176.2028 c -0.34143,-39.1892 -1.53516,-75.3276 -4.60542,-108.4106 -3.07027,-33.5921 -9.46666,-59.8041 -19.1892,-78.636 -10.23425,-20.3588 -24.81804,-35.3734 -43.75138,-45.0439 -18.93335,-9.6704 -44.51896,-14.5057 -76.7568,-14.5057 -29.67931,0 -61.66133,9.1616 -95.94602,27.4845 -33.77301,17.8139 -68.82529,43.7715 -105.15684,77.8725 0.51173,8.6524 0.75215,19.1005 1.53514,31.3016 0.75254,11.7266 -0.30155,-58.5196 1.53513,41.99 v 244.1504 c 0,-39.1906 -1.53513,-275.1977 -4.60539,-308.2808 -3.07028,-33.592 -9.46668,-59.804 -19.18922,-78.6359 -10.23423,-20.3589 -24.81802,-35.3735 -43.75137,-45.0439 -18.93334,-9.6704 -44.51895,-14.5056 -76.75682,-14.5056 -31.21444,0 -63.964,9.6705 -98.24869,29.0113 -34.28473,19.3409 -67.54601,44.0259 -99.783868,74.0552 l -1.53516,343.3997 -0.190551,-442.0349"
+         id="path4" /><path
+         style="font-size:847px;line-height:0px;font-family:Tahoma;-inkscape-font-specification:Tahoma;text-align:end;letter-spacing:26.4688px;word-spacing:0px;text-anchor:end;display:inline;opacity:1;fill:none;stroke:#fce94f;stroke-width:76.6053;stroke-linecap:round;stroke-dasharray:none;stroke-dashoffset:5.4;paint-order:markers fill stroke"
+         d="m 740.86822,1421.3996 -1.53513,-176.2028 c -0.34143,-39.1892 -1.53516,-75.3276 -4.60542,-108.4106 -3.07027,-33.5921 -9.46666,-59.8041 -19.1892,-78.636 -10.23425,-20.3588 -24.81804,-35.3734 -43.75138,-45.0439 -18.93335,-9.6704 -44.51896,-14.50567 -76.7568,-14.50567 -29.67931,0 -61.66133,9.16157 -95.94602,27.48447 -33.77301,17.8139 -68.82529,43.7715 -105.15684,77.8725 0.51173,8.6524 0.75215,19.1005 1.53514,31.3016 0.75254,11.7266 -0.30155,-58.5196 1.53513,41.99 v 244.1504 c 0,-39.1906 -1.53513,-275.1977 -4.60539,-308.2808 -3.07028,-33.592 -9.46668,-59.804 -19.18922,-78.6359 -10.23423,-20.3589 -24.81802,-35.37347 -43.75137,-45.04387 -18.93334,-9.6704 -44.51895,-14.5056 -76.75682,-14.5056 -31.21444,0 -63.964,9.6705 -98.24869,29.01127 -34.28473,19.3409 -67.546011,44.0259 -99.783869,74.0552 l -1.53516,343.3997 -0.190551,-442.03487"
+         id="path6" /></g><g
+       id="g8-3"
+       transform="matrix(0.99999139,0,0,1,-59.130182,-15.065413)"
+       style="stroke-width:11.3909"><path
+         style="fill:none;stroke:#302b00;stroke-width:85.4672;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:normal"
+         d="m 1230.0224,313.28491 c 0,0 29.3485,-19.56275 62.3662,-25.52568 23.6676,-4.27432 69.0895,-1.43331 82.536,46.75145 18.9996,68.08408 -172.5333,216.34002 -134.148,215.91254 38.3853,-0.42748 161.3134,0 161.3134,0"
+         id="path5-2" /><path
+         style="fill:none;stroke:#edd400;stroke-width:42.7336;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:normal"
+         d="m 1230.0224,313.28491 c 0,0 29.3485,-19.56275 62.3662,-25.52568 23.6676,-4.27432 69.0895,-1.43331 82.536,46.75145 18.9996,68.08408 -172.5333,216.34002 -134.148,215.91254 38.3853,-0.42748 161.3134,0 161.3134,0"
+         id="path9-2" /><path
+         style="fill:none;stroke:#fce94f;stroke-width:21.3668;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:normal"
+         d="m 1219.2697,307.23869 c 0,0 29.3485,-19.56275 62.3662,-25.52568 23.6676,-4.27432 69.0895,-1.43331 82.536,46.75145 18.9996,68.08408 -172.5333,216.34002 -134.148,215.91254 38.3853,-0.42748 161.3134,0 161.3134,0"
+         id="path7" /></g></g></g></svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCustomizeFormat.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCustomizeFormat.svg
index 8e27752cab..d00bddebb2 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCustomizeFormat.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCustomizeFormat.svg
@@ -1,43 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
-<svg width="17.2mm" height="17.2mm" fill-rule="evenodd" stroke-linejoin="round" stroke-width="28.222" preserveAspectRatio="xMidYMid" version="1.2" viewBox="0 0 1720 1720" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:ooo="http://xml.openoffice.org/svg/export">
- <defs class="ClipPathGroup">
-  <clipPath id="presentation_clip_path">
-   <rect width="1720" height="1720"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="64"
+   height="64"
+   fill-rule="evenodd"
+   stroke-linejoin="round"
+   stroke-width="28.222"
+   preserveAspectRatio="xMidYMid"
+   version="1.2"
+   viewBox="0 0 1693.3332 1693.3332"
+   xml:space="preserve"
+   id="svg24"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+ <defs
+   class="ClipPathGroup"
+   id="defs1">
+  <clipPath
+   id="presentation_clip_path">
+   <rect
+   width="1720"
+   height="1720"
+   id="rect1"
+   x="0"
+   y="0" />
   </clipPath>
  </defs>
- <g class="SlideGroup">
-   <g id="container-id1">
-    <g id="id1" class="Slide" clip-path="url(#presentation_clip_path)">
-     <g class="Page">
-      <g class="Graphic">
-       <g id="id3">
-        <rect class="BoundingBox" width="1720" height="1720" fill="none"/>
-        <path d="m1040 1541-374 1 187-355 187 354z" fill="#f00"/>
-        <path d="m1040 1541-374 1 187-355 187 354z" fill="none" stroke="#2b1100" stroke-linecap="round" stroke-linejoin="round" stroke-width="38"/>
-        <path d="m1236 796h-447v-751h893v751h-446z" fill="#ff0"/>
-        <path d="m1236 796h-447v-751h893v751h-446z" fill="none" stroke="#2b1100" stroke-linecap="round" stroke-linejoin="miter" stroke-width="30"/>
-        <path d="m412 796h-375v-751h751v751h-376z" fill="#ff0"/>
-        <path d="m412 796h-375v-751h751v751h-376z" fill="none" stroke="#2b1100" stroke-linecap="round" stroke-linejoin="miter" stroke-width="30"/>
-        <path d="m412 881v-94h40v189h-40v-95z" fill="#2b1100"/>
-        <path d="m835 1080v-131h40v261h-40v-130z" fill="#2b1100"/>
-        <path d="m650 935h224v40h-447v-40h223z" fill="#2b1100"/>
-        <path d="m858 1669h-816v-121h1633v121h-817z" fill="#ff0"/>
-        <path d="m858 1669h-816v-121h1633v121h-817z" fill="none" stroke="#2b1100" stroke-linecap="round" stroke-linejoin="miter" stroke-width="40"/>
-        <path d="m615 424c0 37-10 73-28 105-19 32-45 59-77 77-33 19-69 29-106 29s-73-10-105-29c-32-18-59-45-78-77-18-32-28-68-28-105s10-74 28-106c19-32 46-59 78-77 32-19 68-28 105-28s73 9 106 28c32 18 58 45 77 77 18 32 28 69 28 106z" fill="none" stroke="#f00" stroke-linecap="round" stroke-linejoin="miter" stroke-width="70"/>
-        <path d="m406 732h-14v-635h28v635h-14z" fill="#f00"/>
-        <path d="m406 732h-14v-635h28v635h-14z" fill="none" stroke="#f00" stroke-linecap="round" stroke-linejoin="miter" stroke-width="40"/>
-        <path d="m89 414v-14h635v28h-635v-14z" fill="#f00"/>
-        <path d="m89 414v-14h635v28h-635v-14z" fill="none" stroke="#f00" stroke-linecap="round" stroke-linejoin="miter" stroke-width="40"/>
-        <path d="m1409 424c0 31-8 62-23 89-15 28-37 50-64 66-26 16-56 24-86 24-31 0-61-8-87-24s-48-38-63-66c-16-27-24-58-24-89 0-32 8-63 24-90 15-27 37-50 63-66s56-24 87-24c30 0 60 8 86 24 27 16 49 39 64 66s23 58 23 90z" fill="none" stroke="#f00" stroke-linecap="round" stroke-linejoin="miter" stroke-width="69"/>
-        <path d="m1303 693-9-7 327-422 17 15-326 422-9-8z" fill="#f00"/>
-        <path d="m1303 693-9-7 327-422 17 15-326 422-9-8z" fill="none" stroke="#f00" stroke-linecap="round" stroke-linejoin="miter" stroke-width="40"/>
-        <path d="m841 575-9-7 326-422 18 15-326 421-9-7z" fill="#f00"/>
-        <path d="m841 575-9-7 326-422 18 15-326 421-9-7z" fill="none" stroke="#f00" stroke-linecap="round" stroke-linejoin="miter" stroke-width="40"/>
-       </g>
-      </g>
-     </g>
-    </g>
-   </g>
- </g>
-</svg>
+ 
+<g
+   id="layer1"><path
+     style="fill:none;stroke:#302b00;stroke-width:211.667;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 238.12516,1455.2084 h 410.10412 c 0,0 -288.61275,-277.8125 -343.95829,-582.08328 -55.34554,-304.27081 82.12753,-634.99996 542.39579,-634.99996 410.10402,0 565.38622,318.22039 515.93742,634.99996 -49.4487,316.77958 -317.5,582.08328 -317.5,582.08328 h 410.1042"
+     id="path7" /><path
+     style="fill:none;stroke:#edd400;stroke-width:105.833325;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 238.12516,1455.2084 h 410.10412 c 0,0 -288.61275,-277.8125 -343.95829,-582.08328 -55.34554,-304.27081 82.12753,-634.99996 542.39579,-634.99996 410.10402,0 565.38622,318.22039 515.93742,634.99996 -49.4487,316.77958 -317.5,582.08328 -317.5,582.08328 h 410.1042"
+     id="path9" /><path
+     style="fill:none;stroke:#fce94f;stroke-width:52.9167;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 211.66665,1428.7499 h 410.10412 c 0,0 -288.61275,-277.8125 -343.95829,-582.08327 -55.34554,-304.27081 82.12753,-634.99996 542.39579,-634.99996 410.10403,0 565.38623,318.22039 515.93743,634.99996 -49.4487,316.77957 -317.5,582.08327 -317.5,582.08327 h 410.1042"
+     id="path10" /></g></svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionRemovePrefixChar.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionRemovePrefixChar.svg
index 326e5b5fa8..59231221d8 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionRemovePrefixChar.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionRemovePrefixChar.svg
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
    id="svg190"
    xml:space="preserve"
-   viewBox="0 0 1693 1693"
+   viewBox="0 0 1693.3333 1693.3333"
    version="1.2"
    preserveAspectRatio="xMidYMid"
    stroke-width="28.222"
    stroke-linejoin="round"
    fill-rule="evenodd"
-   height="16.93mm"
-   width="16.93mm"><metadata
+   height="64"
+   width="64"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata
    id="metadata194"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata>
  <defs
    id="defs146"
    class="ClipPathGroup">
@@ -26,7 +26,9 @@
    <rect
    id="rect143"
    height="1693"
-   width="1693" />
+   width="1693"
+   x="0"
+   y="0" />
   </clipPath>
  
          
@@ -50,64 +52,36 @@
          
          
         </defs>
-        <g
-   transform="translate(-35.350472,-49.835587)"
-   id="g235"><path
-     style="fill:none;stroke:#ff0000;stroke-width:57;stroke-linecap:square;stroke-linejoin:bevel"
-     id="path148"
-     d="m 121,974 v 0 c -7,-26 -11,-51 -11,-77 0,-48 13,-93 35,-134 24,-41 58,-75 98,-98 19,-11 38,-19 58,-26 v 0 c 25,-7 50,-11 77,-11 46,0 93,13 133,37 40,23 74,57 98,98 10,18 19,37 25,57 v 0 c 8,24 11,51 11,77 0,46 -12,93 -36,134 -24,41 -58,74 -98,98 -18,10 -37,19 -57,24 v 0 c -25,8 -50,12 -76,12 -48,0 -93,-12 -135,-36 -40,-24 -74,-57 -98,-98 -10,-17 -17,-36 -24,-56" /><path
-     style="fill:none;stroke:#ff0000;stroke-width:57;stroke-linejoin:miter"
-     id="path150"
-     d="M 492,521 258,1264" /><path
-     style="fill:none;stroke:#ff0000;stroke-width:58;stroke-linecap:square;stroke-linejoin:bevel"
-     id="path154"
-     d="M 749,528 H 564 V 141 h 370 v 387 z" /><path
-     style="fill:#ffff00"
-     id="path156"
-     d="m 813,1063 567,8 -85,583 -403,-3 z" /><path
-     style="fill:none;stroke:#2b1100;stroke-width:53;stroke-linejoin:miter"
-     id="path158"
-     d="m 813,1063 567,8 -85,583 -403,-3 z" /><path
-     style="fill:none;stroke:#2b1100;stroke-width:53;stroke-linejoin:miter"
-     id="path160"
-     d="m 1252,714 408,626" /><path
-     style="fill:none;stroke:#2b1100;stroke-width:53;stroke-linejoin:miter"
-     id="path162"
-     d="m 1425,927 46,-28 112,173 -43,29" /><path
-     style="fill:none;stroke:#2b1100;stroke-width:40;stroke-linejoin:miter"
-     id="path164"
-     d="m 984,1182 -1,328" /><path
-     style="fill:none;stroke:#2b1100;stroke-width:40;stroke-linejoin:miter"
-     id="path166"
-     d="m 1100,1187 -2,328" /><path
-     style="fill:none;stroke:#2b1100;stroke-width:40;stroke-linejoin:miter"
-     id="path168"
-     d="m 1215,1187 -2,328" /><path
-     style="fill:none;stroke:#ff0000;stroke-width:66;stroke-linecap:square;stroke-linejoin:bevel"
-     id="path170"
-     d="m 840,730 c 80,-32 143,-18 207,36 64,53 77,144 61,228" /><path
-     style="fill:#ff0000"
-     id="path172"
-     d="m 1111,899 124,5 -64,126 -72,125 -58,-125 -59,-131 z" /><path
-     style="fill:none;stroke:#ff0000;stroke-width:33;stroke-linecap:square;stroke-linejoin:bevel"
-     id="path174"
-     d="m 1111,899 124,5 -64,126 -72,125 -58,-125 -59,-131 z" /><path
-     style="fill:#ff0000"
-     id="path176"
-     d="m 1170,402 c 0,8 -2,15 -6,22 -4,7 -9,12 -16,16 -7,4 -14,6 -22,6 -7,0 -15,-2 -21,-6 -7,-4 -13,-9 -16,-16 -4,-7 -6,-14 -6,-22 0,-7 2,-15 6,-21 3,-7 9,-13 16,-16 6,-4 14,-6 21,-6 8,0 15,2 22,6 7,3 12,9 16,16 4,6 6,14 6,21 z" /><path
-     style="fill:none;stroke:#ff0000;stroke-width:40;stroke-linecap:round;stroke-linejoin:miter"
-     id="path178"
-     d="m 1170,402 c 0,8 -2,15 -6,22 -4,7 -9,12 -16,16 -7,4 -14,6 -22,6 -7,0 -15,-2 -21,-6 -7,-4 -13,-9 -16,-16 -4,-7 -6,-14 -6,-22 0,-7 2,-15 6,-21 3,-7 9,-13 16,-16 6,-4 14,-6 21,-6 8,0 15,2 22,6 7,3 12,9 16,16 4,6 6,14 6,21 z" /><path
-     style="fill:#ff0000"
-     id="path180"
-     d="m 1392,402 c 0,7 -2,15 -5,22 -4,6 -10,12 -16,15 -7,4 -14,6 -22,6 -8,0 -15,-2 -22,-6 -6,-3 -12,-9 -16,-15 -3,-7 -5,-15 -5,-22 0,-8 2,-15 5,-22 4,-7 10,-12 16,-16 7,-4 14,-6 22,-6 8,0 15,2 22,6 6,4 12,9 16,16 3,7 5,14 5,22 z" /><path
-     style="fill:none;stroke:#ff0000;stroke-width:40;stroke-linecap:round;stroke-linejoin:miter"
-     id="path182"
-     d="m 1392,402 c 0,7 -2,15 -5,22 -4,6 -10,12 -16,15 -7,4 -14,6 -22,6 -8,0 -15,-2 -22,-6 -6,-3 -12,-9 -16,-15 -3,-7 -5,-15 -5,-22 0,-8 2,-15 5,-22 4,-7 10,-12 16,-16 7,-4 14,-6 22,-6 8,0 15,2 22,6 6,4 12,9 16,16 3,7 5,14 5,22 z" /><path
-     style="fill:#ff0000"
-     id="path184"
-     d="m 1588,402 c 0,7 -2,15 -6,22 -4,6 -9,12 -16,15 -6,4 -14,6 -22,6 -7,0 -15,-2 -21,-6 -7,-3 -12,-9 -16,-15 -4,-7 -6,-15 -6,-22 0,-8 2,-15 6,-22 4,-7 9,-12 16,-16 6,-4 14,-6 21,-6 8,0 16,2 22,6 7,4 12,9 16,16 4,7 6,14 6,22 z" /><path
-     style="fill:none;stroke:#ff0000;stroke-width:40;stroke-linecap:round;stroke-linejoin:miter"
-     id="path186"
-     d="m 1588,402 c 0,7 -2,15 -6,22 -4,6 -9,12 -16,15 -6,4 -14,6 -22,6 -7,0 -15,-2 -21,-6 -7,-3 -12,-9 -16,-15 -4,-7 -6,-15 -6,-22 0,-8 2,-15 6,-22 4,-7 9,-12 16,-16 6,-4 14,-6 21,-6 8,0 16,2 22,6 7,4 12,9 16,16 4,7 6,14 6,22 z" /></g>
-</svg>
\ No newline at end of file
+        
+<g
+   id="g5"
+   transform="translate(-52.91665,79.375149)"><path
+     style="fill:none;stroke:#302b00;stroke-width:211.667;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 1164.1666,1111.25 h 423.3333"
+     id="path1" /><path
+     style="fill:none;stroke:#edd400;stroke-width:105.833;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 1164.1666,1111.2498 423.3333,2e-4"
+     id="path4" /><path
+     style="fill:none;stroke:#fce94f;stroke-width:52.9167;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="M 1164.1666,1084.7917 H 1587.5"
+     id="path5" /></g><g
+   id="layer1"
+   transform="matrix(0.58696436,0,0,0.58695781,18.97947,336.47984)"
+   style="stroke-width:48.0814"><path
+     style="fill:none;stroke:#302b00;stroke-width:360.614;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 238.12516,1455.2084 h 410.10412 c 0,0 -288.61275,-277.8125 -343.95829,-582.08328 -55.34554,-304.27081 82.12753,-634.99996 542.39579,-634.99996 410.10402,0 565.38622,318.22039 515.93742,634.99996 -49.4487,316.77958 -317.5,582.08328 -317.5,582.08328 h 410.1042"
+     id="path7" /><path
+     style="fill:none;stroke:#edd400;stroke-width:180.307;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 238.12516,1455.2084 h 410.10412 c 0,0 -288.61275,-277.8125 -343.95829,-582.08328 -55.34554,-304.27081 82.12753,-634.99996 542.39579,-634.99996 410.10402,0 565.38622,318.22039 515.93742,634.99996 -49.4487,316.77958 -317.5,582.08328 -317.5,582.08328 h 410.1042"
+     id="path9" /><path
+     style="fill:none;stroke:#fce94f;stroke-width:90.1534;stroke-linecap:round;stroke-dasharray:none;paint-order:markers fill stroke"
+     d="m 211.66665,1428.7499 h 410.10412 c 0,0 -288.61275,-277.8125 -343.95829,-582.08327 -55.34554,-304.27081 82.12753,-634.99996 542.39579,-634.99996 410.10403,0 565.38623,318.22039 515.93743,634.99996 -49.4487,316.77957 -317.5,582.08327 -317.5,582.08327 h 410.1042"
+     id="path10" /></g><g
+   id="g3"
+   transform="matrix(1.0000033,0,0,0.99999322,19.091375,-53.327508)"><path
+     style="fill:#fce94f;stroke:#280000;stroke-width:158.75;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+     d="M 113.20018,1455.629 959.86377,344.37097"
+     id="path2" /><path
+     style="fill:#fce94f;stroke:#ef2929;stroke-width:52.9167577;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+     d="M 113.20018,1455.629 959.86377,344.37097"
+     id="path6" /></g></svg>