diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCreateLengthArc.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCreateLengthArc.svg
index c883a3979e..c3467957a6 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCreateLengthArc.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCreateLengthArc.svg
@@ -2,68 +2,26 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 8.4666665 8.466667"
+   width="64"
+   height="64"
+   viewBox="0 0 16.933333 16.933334"
    version="1.1"
    id="svg1876"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="enter_arc_length_dimension.svg"
-   style="enable-background:new">
+   style="enable-background:new"
+   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/">
   <defs
      id="defs1870">
-    <inkscape:path-effect
-       effect="powerstroke"
-       id="path-effect1900"
-       is_visible="true"
-       offset_points="0,0.095902298"
-       sort_points="true"
-       interpolator_type="CubicBezierJohan"
-       interpolator_beta="0.2"
-       start_linecap_type="zerowidth"
-       linejoin_type="extrp_arc"
-       miter_limit="4"
-       end_linecap_type="zerowidth" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1958">
-      <feBlend
-         inkscape:collect="always"
-         mode="exclusion"
-         in2="BackgroundImage"
-         id="feBlend1960" />
-    </filter>
+    <rect
+       x="19.887378"
+       y="10.076272"
+       width="26.516504"
+       height="28.107495"
+       id="rect9" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9195959"
-     inkscape:cx="-0.098138164"
-     inkscape:cy="12.982296"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:snap-global="false"
-     showguides="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
   <metadata
      id="metadata1873">
     <rdf:RDF>
@@ -72,119 +30,145 @@
         <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>
   <g
-     inkscape:label="Livello 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-288.53332)"
-     style="filter:url(#filter1958)">
+     id="g13"
+     transform="matrix(0.99999998,0,0,1.0000012,0.13930366,-0.17330364)">
     <g
-       id="g837"
-       transform="matrix(0.49818869,0,0,0.49818869,0.01533585,149.01319)">
+       id="g14"
+       transform="translate(0.03438081,0.23797046)">
       <path
-         sodipodi:open="true"
-         d="m 1.5720431,295.58507 a 6.9265575,5.6768684 0 0 1 6.9437695,-5.45863 a 6.9265575,5.6768684 0 0 1 6.9006804,5.49521"
-         sodipodi:end="6.251185"
-         sodipodi:start="3.1800409"
-         sodipodi:ry="5.6768684"
-         sodipodi:rx="6.9265575"
-         sodipodi:cy="295.80328"
-         sodipodi:cx="8.4934816"
-         sodipodi:type="arc"
-         id="path1878"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:1;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#302b00;stroke-width:1.5875;stroke-linecap:round;stroke-dasharray:none;paint-order:fill markers stroke;enable-background:new"
+         d="m 2.4721489,7.0790754 11.6416661,-8e-7"
+         id="path10" />
       <path
-         transform="matrix(0.99989433,-0.01453742,0.00953075,0.99995458,0,0)"
-         d="m 2.5287541,284.74804 a 3.1804714,3.3550663 0 0 1 3.1883901,-3.22607 a 3.1804714,3.3550663 0 0 1 3.1685746,3.24773"
-         sodipodi:open="true"
-         sodipodi:end="6.2511934"
-         sodipodi:start="3.1800423"
-         sodipodi:ry="3.3550663"
-         sodipodi:rx="3.1804714"
-         sodipodi:cy="284.87701"
-         sodipodi:cx="5.7068748"
-         sodipodi:type="arc"
-         id="path822"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.00000632;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:7.45477724;stroke-opacity:1" />
+         style="display:inline;fill:none;stroke:#fce94f;stroke-width:0.529167;stroke-linecap:round;stroke-dasharray:none;paint-order:fill markers stroke;enable-background:new"
+         d="m 2.4721489,7.0790754 11.6416661,-8e-7"
+         id="path12" />
+    </g>
+    <g
+       id="g11"
+       style="enable-background:new"
+       transform="matrix(1.1315124,0,0,0.99732515,-1.1489484,0.02551367)">
+      <g
+         id="g19"
+         style="display:inline;enable-background:new"
+         transform="matrix(0.88377289,0,0,1.002682,-9.2731796,-0.0255821)">
+        <path
+           style="display:inline;fill:none;stroke:#302b00;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+           d="M 14.148196,14.460787 V 3.3482997"
+           id="path18" />
+        <path
+           style="display:inline;fill:none;stroke:#fce94f;stroke-width:0.529166;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+           d="M 14.148196,14.460787 V 3.3482997"
+           id="path19" />
+      </g>
+      <g
+         id="g7"
+         transform="matrix(0.8837729,0,0,1.002682,-9.3595809,-6.2437893)"
+         style="display:inline;enable-background:new">
+        <circle
+           style="fill:#fce94f;stroke:#302b00;stroke-width:0.529167;stroke-dasharray:none"
+           id="circle5"
+           cx="14.24596"
+           cy="13.518621"
+           r="1.0583334" />
+        <path
+           style="fill:#c4a000;stroke:#fce94f;stroke-width:0.529167;stroke-dasharray:none"
+           id="path6"
+           d="m 14.21875,12.990234 h 0.02734 c 0.289417,0 0.529297,0.23988 0.529297,0.529297 0,0.289418 -0.238664,0.527344 -0.529297,0.527344 -0.290634,0 -0.529297,-0.237926 -0.529297,-0.527344 0,-0.280508 0.228874,-0.515454 0.501953,-0.529297 z" />
+      </g>
+    </g>
+    <g
+       id="g12"
+       transform="matrix(1.1315124,0,0,0.99732515,-1.6578931,0.02551367)"
+       style="display:inline;enable-background:new">
+      <g
+         id="g17"
+         style="enable-background:new"
+         transform="matrix(0.88377289,0,0,1.002682,1.465201,-0.0255821)">
+        <path
+           style="display:inline;fill:none;stroke:#302b00;stroke-width:1.5875;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+           d="M 14.148196,14.460787 V 3.3482997"
+           id="path16" />
+        <path
+           style="display:inline;fill:none;stroke:#fce94f;stroke-width:0.52916636;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+           d="M 14.148196,14.460787 V 3.3482997"
+           id="path17" />
+      </g>
+      <g
+         id="g11-2"
+         transform="matrix(0.8837729,0,0,1.002682,1.3788005,-6.2437893)"
+         style="display:inline;enable-background:new">
+        <circle
+           style="fill:#fce94f;stroke:#302b00;stroke-width:0.529167;stroke-dasharray:none"
+           id="circle11"
+           cx="14.24596"
+           cy="13.518621"
+           r="1.0583334" />
+        <path
+           style="fill:#c4a000;stroke:#fce94f;stroke-width:0.529167;stroke-dasharray:none"
+           id="path11"
+           d="m 14.21875,12.990234 h 0.02734 c 0.289417,0 0.529297,0.23988 0.529297,0.529297 0,0.289418 -0.238664,0.527344 -0.529297,0.527344 -0.290634,0 -0.529297,-0.237926 -0.529297,-0.527344 0,-0.280508 0.228874,-0.515454 0.501953,-0.529297 z" />
+      </g>
+    </g>
+    <g
+       id="g16"
+       style="enable-background:new"
+       transform="matrix(1,0,0,0.99999879,-0.13930366,0.17330343)">
       <path
-         inkscape:connector-curvature="0"
-         id="path824"
-         d="M 1.3357157,292.18395 C 1.26906,281.09141 1.26906,281.09141 1.26906,281.09141"
-         style="fill:none;stroke:#ff0000;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;stroke:#555753;stroke-width:1.5875;stroke-linejoin:round;stroke-dasharray:none"
+         d="m 2.1166667,15.599012 c 0,0 -0.057134,-4.235596 6.35,-4.233305 6.4071343,0.0023 6.3500003,4.233994 6.3500003,4.233994"
+         id="path7" />
       <path
-         style="fill:none;stroke:#ff0000;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 15.701426,292.31781 c -0.06661,-11.30894 -0.06661,-11.30894 -0.06661,-11.30894"
-         id="path826"
-         inkscape:connector-curvature="0" />
+         style="fill:none;stroke:#d3d7cf;stroke-width:0.52916667;stroke-linejoin:round;stroke-dasharray:none"
+         d="m 2.1166667,15.599012 c 0,0 -0.057134,-4.235596 6.35,-4.233305 6.4071343,0.0023 6.3500003,4.233994 6.3500003,4.233994"
+         id="path13" />
+    </g>
+    <g
+       id="g15"
+       transform="translate(-0.23706613,1.0863789)"
+       style="display:inline;stroke-width:0.529167;stroke-dasharray:none;enable-background:new">
+      <circle
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:0.529167;stroke-dasharray:none"
+         id="circle15"
+         cx="14.385263"
+         cy="13.37441"
+         r="1.0583334" />
       <path
-         style="fill:none;stroke:#ff0000;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 1.2658726,285.81396 c 14.3719444,-0.0661 14.3719444,-0.0661 14.3719444,-0.0661"
-         id="path828"
-         inkscape:connector-curvature="0" />
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#888a85;fill-opacity:1;stroke:#d3d7cf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+         id="circle3"
+         d="m 14.384766,12.845703 c 0.289417,0 0.529297,0.239879 0.529297,0.529297 0,0.289418 -0.23988,0.529297 -0.529297,0.529297 -0.289418,0 -0.529297,-0.239879 -0.529297,-0.529297 0,-0.289418 0.239879,-0.529297 0.529297,-0.529297 z" />
+    </g>
+    <g
+       id="g5"
+       transform="translate(-11.73943,0.94216679)"
+       style="display:inline;stroke-width:0.529167;stroke-dasharray:none;enable-background:new">
+      <circle
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:0.529167;stroke-dasharray:none"
+         id="circle2"
+         cx="14.24596"
+         cy="13.518621"
+         r="1.0583334" />
       <path
-         d="M 0.51596934,285.82123 A 0.76839989,0.8018086 0 0 1 1.308311,285.05065 a 0.76839989,0.8018086 0 0 1 0.7436432,0.82173 a 0.76839989,0.8018086 0 0 1 -0.7826041,0.78134 a 0.76839989,0.8018086 0 0 1 -0.75389092,-0.8115 l 0.76834212,0.01 z"
-         sodipodi:end="3.1538534"
-         sodipodi:start="3.1800423"
-         sodipodi:ry="0.8018086"
-         sodipodi:rx="0.76839989"
-         sodipodi:cy="285.85205"
-         sodipodi:cx="1.2838013"
-         sodipodi:type="arc"
-         id="path832"
-         style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:7.45477724;stroke-opacity:1" />
+         style="fill:#888a85;stroke:#d3d7cf;stroke-width:0.529167;stroke-dasharray:none"
+         id="path5"
+         d="m 14.21875,12.990234 h 0.02734 c 0.289417,0 0.529297,0.23988 0.529297,0.529297 0,0.289418 -0.238664,0.527344 -0.529297,0.527344 -0.290634,0 -0.529297,-0.237926 -0.529297,-0.527344 0,-0.280508 0.228874,-0.515454 0.501953,-0.529297 z" />
+    </g>
+    <g
+       id="g15-5"
+       transform="matrix(0.01000043,0,0,0.00999987,-3.9011599,-3.5308166)"
+       style="display:inline">
       <path
-         style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:7.45477724;stroke-opacity:1"
-         id="path834"
-         sodipodi:type="arc"
-         sodipodi:cx="15.649536"
-         sodipodi:cy="285.6239"
-         sodipodi:rx="0.76839989"
-         sodipodi:ry="0.8018086"
-         sodipodi:start="3.1800423"
-         sodipodi:end="3.1538534"
-         d="m 14.881704,285.59308 a 0.76839989,0.8018086 0 0 1 0.792342,-0.77058 a 0.76839989,0.8018086 0 0 1 0.743643,0.82173 a 0.76839989,0.8018086 0 0 1 -0.782604,0.78134 a 0.76839989,0.8018086 0 0 1 -0.753891,-0.8115 l 0.768342,0.01 z" />
+         style="font-size:238.125px;line-height:1.2;font-family:osifont;-inkscape-font-specification:osifont;display:inline;fill:none;stroke:#302b00;stroke-width:158.748;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;enable-background:new"
+         d="m 926.04163,919.85332 v -31.04501 c 0,-41.94521 8.27834,-81.82073 24.83595,-119.62663 16.55729,-37.80588 39.04758,-70.36862 67.47102,-97.6882 28.1476,-27.04351 61.5382,-48.70615 100.1719,-64.9875 38.6339,-16.28137 79.1993,-24.42193 121.6965,-24.42193 41.9453,0 82.5107,8.14087 121.6963,24.42193 38.6339,16.00517 72.0244,37.66793 100.1717,64.9875 28.4235,27.59565 50.9139,60.15828 67.4713,97.6882 16.5573,38.08184 24.8361,77.95738 24.8361,119.62663 v 31.04501"
+         id="path13-8-6" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.40000001;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path1198"
-         sodipodi:type="arc"
-         sodipodi:cx="8.4934769"
-         sodipodi:cy="296.09073"
-         sodipodi:rx="7.6988111"
-         sodipodi:ry="6.7847557"
-         sodipodi:start="3.1800409"
-         sodipodi:end="6.251185"
-         d="m 0.80035556,295.82993 a 7.6988111,6.7847557 0 0 1 7.71794204,-6.52392 a 7.6988111,6.7847557 0 0 1 7.6700484,6.56764"
-         sodipodi:open="true" />
-      <path
-         sodipodi:open="true"
-         d="m 2.1752736,295.88208 a 6.3465438,5.2597609 0 0 1 6.3623145,-5.05755 a 6.3465438,5.2597609 0 0 1 6.3228339,5.09144"
-         sodipodi:end="6.251185"
-         sodipodi:start="3.1800409"
-         sodipodi:ry="5.2597609"
-         sodipodi:rx="6.3465438"
-         sodipodi:cy="296.08426"
-         sodipodi:cx="8.517127"
-         sodipodi:type="arc"
-         id="path1200"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.39652857;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="295.80072"
-         x="0.79692447"
-         height="0.083420403"
-         width="1.3000313"
-         id="rect1202"
-         style="opacity:1;fill:#2b2200;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:#2b2200;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.40000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1204"
-         width="1.3000313"
-         height="0.083420403"
-         x="14.876537"
-         y="295.8952" />
+         style="font-size:238.125px;line-height:1.2;font-family:osifont;-inkscape-font-specification:osifont;display:inline;fill:none;stroke:#fce94f;stroke-width:52.9159;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;enable-background:new"
+         d="m 926.04163,919.85332 v -31.04501 c 0,-41.94521 8.27834,-81.82073 24.83595,-119.62663 16.55729,-37.80588 39.04758,-70.36862 67.47102,-97.6882 28.1476,-27.04351 61.5382,-48.70615 100.1719,-64.9875 38.6339,-16.28137 79.1993,-24.42193 121.6965,-24.42193 41.9453,0 82.5107,8.14087 121.6963,24.42193 38.6339,16.00517 72.0244,37.66793 100.1717,64.9875 28.4235,27.59565 50.9139,60.15828 67.4713,97.6882 16.5573,38.08184 24.8361,77.95738 24.8361,119.62663 v 31.04501"
+         id="path15-7-1" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertDiameter.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertDiameter.svg
index bba2dc60db..67b4109da8 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertDiameter.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertDiameter.svg
@@ -2,68 +2,19 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <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"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   viewBox="0 0 8.4666665 8.466667"
+   width="64"
+   height="64"
+   viewBox="0 0 16.933333 16.933334"
    version="1.1"
    id="svg1876"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="enter_diameter_symbol_in_dimension.svg"
-   style="enable-background:new">
+   style="enable-background:new"
+   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/">
   <defs
-     id="defs1870">
-    <inkscape:path-effect
-       effect="powerstroke"
-       id="path-effect1900"
-       is_visible="true"
-       offset_points="0,0.095902298"
-       sort_points="true"
-       interpolator_type="CubicBezierJohan"
-       interpolator_beta="0.2"
-       start_linecap_type="zerowidth"
-       linejoin_type="extrp_arc"
-       miter_limit="4"
-       end_linecap_type="zerowidth" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter1958">
-      <feBlend
-         inkscape:collect="always"
-         mode="exclusion"
-         in2="BackgroundImage"
-         id="feBlend1960" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="6.9786817"
-     inkscape:cy="11.424345"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:snap-global="false"
-     showguides="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     id="defs1870" />
   <metadata
      id="metadata1873">
     <rdf:RDF>
@@ -72,87 +23,20 @@
         <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>
   <g
-     inkscape:label="Livello 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-288.53332)"
-     style="filter:url(#filter1958)">
-    <g
-       id="g832"
-       transform="matrix(0.45774741,0,0,0.45774741,0.20138822,160.379)">
-      <g
-         transform="translate(-0.33408691,-0.60135643)"
-         id="g827">
-        <path
-           style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:1.25;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path1878"
-           sodipodi:type="arc"
-           sodipodi:cx="8.8082666"
-           sodipodi:cy="287.36746"
-           sodipodi:rx="4.6534534"
-           sodipodi:ry="4.6682072"
-           sodipodi:start="2.8527395"
-           sodipodi:end="2.8468159"
-           d="m 4.3476003,288.69722 a 4.6534534,4.6682072 0 0 1 3.1285115,-5.80259 a 4.6534534,4.6682072 0 0 1 5.7888752,3.12983 a 4.6534534,4.6682072 0 0 1 -3.111366,5.81186 A 4.6534534,4.6682072 0 0 1 4.3555306,288.7237"
-           sodipodi:open="true" />
-        <path
-           style="fill:none;stroke:#ff0000;stroke-width:1.25;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 10.803344,280.82614 C 6.7307272,293.74341 6.7307272,293.74341 6.7307272,293.74341"
-           id="path1880"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         id="g908">
-        <path
-           sodipodi:type="star"
-           style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.49879649;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter1958)"
-           id="path1970-2"
-           sodipodi:sides="3"
-           sodipodi:cx="-17.197916"
-           sodipodi:cy="289.20422"
-           sodipodi:r1="0.82020247"
-           sodipodi:r2="2.523628"
-           sodipodi:arg1="1.1089328"
-           sodipodi:arg2="2.1561303"
-           inkscape:flatsided="false"
-           inkscape:rounded="0"
-           inkscape:randomized="0"
-           d="m -16.83242,289.93849 l -1.759744,1.36925 l 0.575608,-2.15412 l -0.305932,-2.20861 l 1.577716,1.57555 l 2.065676,0.83936 z"
-           inkscape:transform-center-x="-1.1870005"
-           inkscape:transform-center-y="-0.38435428"
-           transform="matrix(-0.46043869,0.87402234,-0.90622198,-0.46210975,268.4388,443.28052)" />
-        <rect
-           style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:25.19470787;stroke-opacity:1"
-           id="rect841"
-           width="9.4239111"
-           height="1.5829397"
-           x="2.3791704"
-           y="293.84268"
-           transform="rotate(-0.28080906)" />
-        <path
-           sodipodi:type="star"
-           style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.49879649;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path1970"
-           sodipodi:sides="3"
-           sodipodi:cx="-17.197916"
-           sodipodi:cy="289.20422"
-           sodipodi:r1="0.82020247"
-           sodipodi:r2="2.523628"
-           sodipodi:arg1="1.1089328"
-           sodipodi:arg2="2.1561303"
-           inkscape:flatsided="false"
-           inkscape:rounded="0"
-           inkscape:randomized="0"
-           d="m -16.83242,289.93849 l -1.759744,1.36925 l 0.575608,-2.15412 l -0.305932,-2.20861 l 1.577716,1.57555 l 2.065676,0.83936 z"
-           inkscape:transform-center-x="1.1936193"
-           inkscape:transform-center-y="0.37847883"
-           transform="matrix(0.45306844,-0.87786549,0.91007806,0.4544685,-252.68278,147.9845)" />
-      </g>
-    </g>
+     id="layer2"
+     style="display:inline">
+    <path
+       style="enable-background:new;fill:#fce94f;stroke:#302b00;stroke-width:0.529167;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;paint-order:normal"
+       d="m 2.3812499,14.552084 2.38125,-1.5875 v 1.058333 h 7.4083331 l 0,-1.058333 2.38125,1.5875 -2.38125,1.5875 -3e-6,-1.058333 H 4.7624999 v 1.058333 z"
+       id="path2" />
+    <path
+       d="m 8.4614704,1.0173747 q 1.6219726,0 2.9651696,0.7349239 0.418166,0.2407508 0.785644,0.532186 l 1.381213,-1.3811496 0.849002,0.8489636 -1.381212,1.3811497 q 0.253433,0.3294486 0.46885,0.6969105 0.760302,1.3431364 0.760302,3.0283927 0,1.6472429 -0.747629,2.9903792 -0.734957,1.3304663 -2.090826,2.0907333 -1.343197,0.760266 -2.9905136,0.760266 -1.6219745,0 -2.965172,-0.747596 Q 5.0908056,11.724454 4.7359983,11.44569 L 3.3547864,12.82684 2.4931122,11.977877 3.8869966,10.596726 Q 3.6208908,10.254606 3.4054719,9.8618017 2.6578442,8.5059944 2.6578442,6.8587515 q 0,-1.6599141 0.7603001,-3.0030505 0.7603002,-1.3558076 2.0908265,-2.0907313 1.3431975,-0.747595 2.9524996,-0.747595 z m -0.012685,1.2164255 q -1.2164803,0 -2.2682293,0.5828707 Q 5.141478,3.3995413 4.5459085,4.4639138 3.9630126,5.5282861 3.9630126,6.8587515 q 0,1.3051232 0.5702248,2.3694952 0.1267112,0.22808 0.2787769,0.443489 L 11.312582,3.1714617 Q 11.059162,2.9813952 10.767715,2.8166709 9.7286363,2.2338002 8.4487979,2.2338002 Z m -2.280901,8.6543608 q 1.0644202,0.595542 2.2809018,0.595542 1.3051801,0 2.3442588,-0.595542 1.051748,-0.608213 1.621973,-1.6725853 0.570226,-1.0643722 0.570226,-2.3568242 0,-1.3431365 -0.595569,-2.4075088 Q 12.275636,4.2485051 12.148913,4.0457674 L 5.6483461,10.546042 q 0.2407605,0.177395 0.5195383,0.342119 z"
+       id="text4"
+       style="font-size:19.844px;line-height:0px;text-align:end;text-anchor:end;display:inline;fill:#fce94f;stroke:#302b00;stroke-width:0.52916667;stroke-linecap:square;stroke-dasharray:none;stroke-dashoffset:3;paint-order:normal"
+       aria-label="⌀" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertRepetition.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertRepetition.svg
index 872174798d..e83093319f 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertRepetition.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertRepetition.svg
@@ -3,67 +3,19 @@
    style="enable-background:new"
    id="svg1876"
    version="1.1"
-   viewBox="0 0 8.4666665 8.466667"
-   height="32"
-   width="32"
+   viewBox="0 0 16.933333 16.933335"
+   height="64"
+   width="64"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg">
   <defs
      id="defs1870" />
-  <text
-     xml:space="preserve"
-     style="font-size:2.11667px;line-height:1.2;font-family:osifont;-inkscape-font-specification:osifont;fill:none;fill-opacity:0.5;stroke:#2b2200;stroke-width:0.583935;stroke-linecap:square;stroke-dasharray:none"
-     x="7.7181821"
-     y="4.3254466"
-     id="text2358"><tspan
-       id="tspan2356"
-       style="stroke-width:0.583935"
-       x="7.7181821"
-       y="4.3254466" /></text>
   <g
-     id="g3481">
-    <g
-       id="g908"
-       transform="matrix(0.45953633,0,0,0.45953633,0.32783854,-128.21756)">
-      <path
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.498796;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path1970-2"
-         d="m -16.83242,289.93849 -1.759744,1.36925 0.575608,-2.15412 -0.305932,-2.20861 1.577716,1.57555 2.065676,0.83936 z"
-         transform="matrix(-0.46043869,0.87402234,-0.90622198,-0.46210975,268.4388,443.28052)" />
-      <rect
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:25.1947;stroke-opacity:1"
-         id="rect841"
-         width="9.4239111"
-         height="1.5829397"
-         x="2.3791704"
-         y="293.84268"
-         transform="rotate(-0.28080906)" />
-      <path
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.498796;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path1970"
-         d="m -16.83242,289.93849 -1.759744,1.36925 0.575608,-2.15412 -0.305932,-2.20861 1.577716,1.57555 2.065676,0.83936 z"
-         transform="matrix(0.45306844,-0.87786549,0.91007806,0.4544685,-252.68278,147.9845)" />
-    </g>
-    <g
-       id="g3470">
-      <g
-         aria-label="×"
-         id="text2362"
-         style="font-size:8.46667px;line-height:1.2;font-family:osifont;-inkscape-font-specification:osifont;letter-spacing:-0.79375px;fill:none;fill-opacity:0.5;stroke:#2b2200;stroke-width:0.583935;stroke-linecap:square">
-        <path
-           d="M 7.1369031,1.7056033 Q 7.2526584,1.589848 7.3601454,1.589848 q 0.3141929,0 0.3141929,0.3265952 0,0.1240235 -0.1322918,0.2439129 l -1.0169926,0.9839196 0.9839197,0.959115 q 0.1694988,0.1570964 0.1694988,0.3100587 0,0.285254 -0.3141929,0.285254 -0.1033529,0 -0.2976563,-0.1860352 L 6.1075082,3.5700897 5.1483932,4.541607 q -0.1612305,0.1612306 -0.2687175,0.1612306 -0.3265952,0 -0.3265952,-0.2811199 0,-0.14056 0.1488282,-0.2935223 L 5.6816942,3.1442757 4.7101769,2.1727584 Q 4.5489464,2.0115279 4.5489464,1.908175 q 0,-0.3224611 0.3224611,-0.3224611 0.1281576,0 0.2811199,0.1570964 l 0.9549808,0.9756515 z"
-           style="fill:#ff0000;fill-opacity:1;stroke:none"
-           id="path3460" />
-      </g>
-      <g
-         aria-label="_"
-         id="text2362-3"
-         style="font-size:8.46667px;line-height:1.2;font-family:osifont;-inkscape-font-specification:osifont;letter-spacing:-0.79375px;fill:none;fill-opacity:0.5;stroke:#2b2200;stroke-width:0.583935;stroke-linecap:square;enable-background:new">
-        <path
-           d="m 1.0858509,4.5907001 q 0,0 2.5135426,0 0.2976564,0 0.2976564,0.318327 0,0.2769858 -0.3100587,0.2769858 H 1.0941191 q -0.30592462,0 -0.30592462,-0.3141928 0,-0.28112 0.29765642,-0.28112 z"
-           style="fill:#ff0000;fill-opacity:1;stroke:none"
-           id="path3463" />
-      </g>
-    </g>
+     id="layer1">
+    <path
+       style="font-size:13.3906px;line-height:0px;text-align:end;text-anchor:end;fill:#fce94f;stroke:#302b00;stroke-width:0.529166;stroke-dasharray:none;paint-order:fill markers stroke"
+       d="M 6.1503351,12.741937 V 7.7052204 q 0,-0.961424 -0.4296729,-1.427787 Q 5.2981509,5.803896 4.3886772,5.803896 q -1.2102444,0 -1.7616576,0.6744324 -0.5442521,0.667257 -0.5442521,2.181142 V 12.741937 H 0.79374968 V 4.8639958 H 1.8321251 l 0.1933527,1.0762217 h 0.071613 Q 2.4623114,5.3590578 3.1211427,5.0433661 3.7799739,4.7204995 4.5748685,4.7204995 q 1.4465644,0 2.1483631,0.7031315 Q 7.42503,6.1267624 7.42503,7.6119484 v 5.1299886 z m 6.6456019,-5.9192176 2.506425,-2.5183588 0.730443,0.7533551 -2.492101,2.4968337 q 2.062429,2.095045 2.477779,2.4968346 l -0.730445,0.753355 Q 13.633799,9.1473574 12.781614,8.3222544 L 10.332482,10.804739 9.5662323,10.051384 Q 10.504352,9.1258334 12.04401,7.5545494 L 9.5519099,5.0720651 10.31816,4.3043606 Z"
+       id="text1"
+       aria-label="n× " />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertSquare.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertSquare.svg
index 0eb17119c8..dbf1f238a2 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertSquare.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionInsertSquare.svg
@@ -1,21 +1,25 @@
 <?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"
    style="enable-background:new"
    id="svg1876"
    version="1.1"
-   viewBox="0 0 8.4666665 8.466667"
-   height="32"
-   width="32">
+   viewBox="0 0 16.933333 16.933334"
+   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/">
   <defs
      id="defs1870">
     <filter
        id="filter1958"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       x="-0.061574262"
+       y="-0.041955596"
+       width="1.1308433"
+       height="1.1622597">
       <feBlend
          id="feBlend1960"
          in2="BackgroundImage"
@@ -23,7 +27,11 @@
     </filter>
     <filter
        id="filter1958-7"
-       style="color-interpolation-filters:sRGB">
+       style="color-interpolation-filters:sRGB"
+       x="-0.061574262"
+       y="-0.23279332"
+       width="1.1308433"
+       height="1.6508332">
       <feBlend
          id="feBlend1960-2"
          in2="BackgroundImage"
@@ -38,43 +46,20 @@
         <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>
   <g
-     style="filter:url(#filter1958)"
-     transform="translate(0,-288.53332)"
-     id="layer1">
-    <rect
-       y="289.71573"
-       x="2.2066233"
-       height="4.3681531"
-       width="4.1808338"
-       id="rect2130"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0.5840525;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <g
-       id="g908"
-       style="filter:url(#filter1958-7)"
-       transform="matrix(0.45953633,0,0,0.45953633,0.32783854,160.31576)">
-      <path
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.49879649;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter1958-7)"
-         id="path1970-2"
-         d="m -16.83242,289.93849 -1.759744,1.36925 0.575608,-2.15412 -0.305932,-2.20861 1.577716,1.57555 2.065676,0.83936 z"
-         transform="matrix(-0.46043869,0.87402234,-0.90622198,-0.46210975,268.4388,443.28052)" />
-      <rect
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:25.19470787;stroke-opacity:1"
-         id="rect841"
-         width="9.4239111"
-         height="1.5829397"
-         x="2.3791704"
-         y="293.84268"
-         transform="rotate(-0.28080906)" />
-      <path
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.49879649;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path1970"
-         d="m -16.83242,289.93849 -1.759744,1.36925 0.575608,-2.15412 -0.305932,-2.20861 1.577716,1.57555 2.065676,0.83936 z"
-         transform="matrix(0.45306844,-0.87786549,0.91007806,0.4544685,-252.68278,147.9845)" />
-    </g>
+     id="layer2"
+     style="display:inline;enable-background:new">
+    <path
+       style="enable-background:new;display:inline;fill:#fce94f;stroke:#302b00;stroke-width:0.529167;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none;paint-order:normal"
+       d="m 2.3812499,14.552084 2.38125,-1.5875 v 1.058333 h 7.4083331 v -1.058333 l 2.38125,1.5875 -2.38125,1.5875 -3e-6,-1.058333 H 4.7624999 v 1.058333 z"
+       id="path2" />
+    <path
+       d="m 4.4979166,11.377084 h 8.7312494 l 0,-8.7312506 z m -0.79375,-9.5250006 0,8.7312506 8.7312494,-8.7312506 z M 2.6458385,0.79375466 H 14.287496 V 12.435412 H 2.6458385 Z"
+       id="text4"
+       style="font-size:12.7001px;line-height:0px;text-align:end;text-anchor:end;fill:#fce94f;stroke:#302b00;stroke-width:0.529177;stroke-linecap:square;stroke-dashoffset:3;paint-order:normal"
+       aria-label="〼" />
   </g>
 </svg>