diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCircleCenterLines.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCircleCenterLines.svg
index ab8b110c4b..e922ddcda4 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCircleCenterLines.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionCircleCenterLines.svg
@@ -2,52 +2,94 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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="64"
    height="64"
    viewBox="0 0 16.933333 16.933334"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="assi_mezzerie_giallo.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs2">
     <linearGradient
-       id="linearGradient5969"
-       osb:paint="solid">
+       id="linearGradient3">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop6" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5969">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
          offset="0"
          id="stop5967" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient6"
+       id="radialGradient7"
+       cx="7.8876033"
+       cy="286.57697"
+       fx="7.8876033"
+       fy="286.57697"
+       r="6.1166241"
+       gradientTransform="matrix(1,0,0,1.0003089,0,-0.08849432)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient6"
+       id="linearGradient2"
+       x1="4.4678578"
+       y1="282.99539"
+       x2="14.767755"
+       y2="292.10928"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient3"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="28.547192"
-     inkscape:cy="30.303061"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -56,65 +98,68 @@
         <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,-280.06665)">
-    <path
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path839"
-       sodipodi:type="arc"
-       sodipodi:cx="8.4666872"
-       sodipodi:cy="288.53336"
-       sodipodi:rx="6.1199794"
-       sodipodi:ry="6.1199794"
-       sodipodi:start="2.540798"
-       sodipodi:end="2.5299071"
-       sodipodi:open="true"
-       d="m 3.4183979,291.99297 a 6.1199794,6.1199794 0 0 1 1.574944,-8.49847 a 6.1199794,6.1199794 0 0 1 8.5027211,1.5518 a 6.1199794,6.1199794 0 0 1 -1.528643,8.50692 a 6.1199794,6.1199794 0 0 1 -8.5110452,-1.50548" />
-    <path
-       d="m 2.0543273,292.92777 a 7.7736254,7.7736254 0 0 1 2.0005011,-10.79479 a 7.7736254,7.7736254 0 0 1 10.8001946,1.97111 a 7.7736254,7.7736254 0 0 1 -1.94169,10.80552 A 7.7736254,7.7736254 0 0 1 2.1025658,292.99735"
-       sodipodi:open="true"
-       sodipodi:end="2.5299071"
-       sodipodi:start="2.540798"
-       sodipodi:ry="7.7736254"
-       sodipodi:rx="7.7736254"
-       sodipodi:cy="288.53336"
-       sodipodi:cx="8.4666872"
-       sodipodi:type="arc"
-       id="path837"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <path
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:1.29999995;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4508"
-       sodipodi:type="arc"
-       sodipodi:cx="8.4666872"
-       sodipodi:cy="288.53336"
-       sodipodi:rx="6.9231811"
-       sodipodi:ry="6.9704261"
-       sodipodi:start="2.540798"
-       sodipodi:end="2.5299071"
-       sodipodi:open="true"
-       d="m 2.7558475,292.47372 a 6.9231811,6.9704261 0 0 1 1.7816437,-9.67943 a 6.9231811,6.9704261 0 0 1 9.6186398,1.76745 a 6.9231811,6.9704261 0 0 1 -1.729266,9.68905 a 6.9231811,6.9704261 0 0 1 -9.6280564,-1.71468" />
-    <path
-       style="fill:#ffff00;fill-opacity:1;stroke:#ff0000;stroke-width:1.30731916;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:5.22927664, 2.61463832000000007, 1.30731916000000004, 2.61463832000000007;stroke-dashoffset:0;stroke-opacity:1"
-       d="M -0.04651861,288.39186 L 18.4862,288.4857"
-       id="path5989"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:label="path5989" />
-    <path
-       style="fill:#00ffff;fill-opacity:1;stroke:#ff0000;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:5.2, 2.6, 1.3, 2.6;stroke-dashoffset:10.13279915;stroke-opacity:1"
-       d="M 8.4901406,278.5436 L 8.4431916,298.646"
-       id="path5989-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:label="path5989"
-       inkscape:transform-center-y="-0.41756205" />
+     transform="translate(0.57899503,-278.01443)"
+     style="display:inline">
+    <g
+       id="g4428-3"
+       transform="matrix(0.0386382,0,0,0.03863832,-58.284885,263.11938)"
+       style="display:inline;stroke-width:1">
+      <path
+         style="fill:none;stroke:#555753;stroke-width:8.27356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+      <path
+         style="fill:none;stroke:#babdb6;stroke-width:4.13678;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+      <path
+         style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2-4-1"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+      <path
+         style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2-4"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
+    </g>
+    <g
+       id="g1">
+      <path
+         style="display:inline;fill:#ffff00;fill-opacity:1;stroke:#0b1521;stroke-width:1.5875;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 15.031422,286.4811 H 0.74392165"
+         id="path5" />
+      <path
+         style="display:inline;fill:#ffff00;fill-opacity:1;stroke:#729fcf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:5.29166997,2.11666799,1.05833399,2.11666799;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 15.825233,286.4811 H -0.04982836"
+         id="path2" />
+    </g>
+    <g
+       id="g6"
+       transform="rotate(-90,7.8877023,286.4811)">
+      <path
+         style="display:inline;fill:#ffff00;fill-opacity:1;stroke:#0b1521;stroke-width:1.5875;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 15.031422,286.4811 H 0.74392165"
+         id="path3" />
+      <path
+         style="display:inline;fill:#ffff00;fill-opacity:1;stroke:#729fcf;stroke-width:0.529167;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:5.29166997,2.11666799,1.05833399,2.11666799;stroke-dashoffset:0;stroke-opacity:1"
+         d="M 15.825233,286.4811 H -0.04982836"
+         id="path6" />
+    </g>
   </g>
+  <path
+     style="fill:#d3d7cf;stroke:#729fcf;stroke-width:0.529167;stroke-dasharray:5.29167, 2.11667, 1.05833, 2.11667;stroke-dashoffset:0;paint-order:fill markers stroke"
+     d="m 7.2760453,8.4666669 2.381243,3.2e-5"
+     id="path4" />
+  <path
+     style="fill:#d3d7cf;stroke:#729fcf;stroke-width:0.529167;stroke-dasharray:5.29167, 2.11667, 1.05833, 2.11667;stroke-dashoffset:0;paint-order:fill markers stroke"
+     d="m 8.4666508,9.6573044 3.2e-5,-2.381243"
+     id="path7" />
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmArc.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmArc.svg
index efeaa5dfb2..29c66a9874 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmArc.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmArc.svg
@@ -2,44 +2,126 @@
 <!-- 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="64"
    height="64"
    viewBox="0 0 16.933333 16.933334"
    version="1.1"
    id="svg1593"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="arco_cosmetico_giallo.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs1587" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="20.197687"
-     inkscape:cy="9.484827"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false" />
+     id="defs1587">
+    <linearGradient
+       id="linearGradient10">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop9" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop10" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop7" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop4" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="1"
+         id="stop2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient1"
+       id="linearGradient2"
+       x1="12.878931"
+       y1="282.9209"
+       x2="15.943335"
+       y2="282.9209"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient1"
+       id="linearGradient3"
+       gradientUnits="userSpaceOnUse"
+       x1="1.2773438"
+       y1="294.44922"
+       x2="3.7324219"
+       y2="294.44922" />
+    <linearGradient
+       xlink:href="#linearGradient4"
+       id="linearGradient5"
+       x1="12.878933"
+       y1="294.40137"
+       x2="15.943333"
+       y2="294.40137"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient14"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient8"
+       id="linearGradient6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       xlink:href="#linearGradient10"
+       id="linearGradient7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+  </defs>
   <metadata
      id="metadata1590">
     <rdf:RDF>
@@ -48,132 +130,68 @@
         <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,-280.06665)">
-    <path
-       style="fill:#ffff00;stroke:#ffff00;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.75, 0.75;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 4.8191964,294.59038 c 7.4287856,0.0152 7.4287856,0.0152 7.4287856,0.0152"
-       id="path1770"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#ffff00;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.75000002, 0.75000002;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 14.504836,284.99924 c -0.09449,7.18155 -0.09449,7.18155 -0.09449,7.18155"
-       id="path1772"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:1;fill:#ffff00;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="path1738-3-8"
-       sodipodi:type="arc"
-       sodipodi:cx="14.410636"
-       sodipodi:cy="294.40155"
-       sodipodi:rx="1.7008928"
-       sodipodi:ry="1.7008928"
-       sodipodi:start="3.1355538"
-       sodipodi:end="2.9298937"
-       sodipodi:open="true"
-       d="m 12.709774,294.41182 a 1.7008928,1.7008928 0 0 1 1.603193,-1.70836 a 1.7008928,1.7008928 0 0 1 1.788492,1.51328 a 1.7008928,1.7008928 0 0 1 -1.419363,1.8639 a 1.7008928,1.7008928 0 0 1 -1.934381,-1.3217" />
-    <path
-       style="opacity:1;fill:#ff0000;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"
-       id="path1738-3"
-       sodipodi:type="arc"
-       sodipodi:cx="14.410635"
-       sodipodi:cy="282.92047"
-       sodipodi:rx="1.7008928"
-       sodipodi:ry="1.7008928"
-       sodipodi:start="3.1355538"
-       sodipodi:end="2.8797933"
-       sodipodi:open="true"
-       d="m 12.709773,282.93074 a 1.7008928,1.7008928 0 0 1 1.581932,-1.707 a 1.7008928,1.7008928 0 0 1 1.804593,1.46963 a 1.7008928,1.7008928 0 0 1 -1.351317,1.89481 a 1.7008928,1.7008928 0 0 1 -1.977282,-1.22749" />
-    <path
-       style="opacity:1;fill:#ff0000;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"
-       id="path1738"
-       sodipodi:type="arc"
-       sodipodi:cx="2.5040922"
-       sodipodi:cy="294.44867"
-       sodipodi:rx="1.7008928"
-       sodipodi:ry="1.7008928"
-       sodipodi:start="3.1355538"
-       sodipodi:end="2.8797933"
-       sodipodi:open="true"
-       d="m 0.80323042,294.45894 a 1.7008928,1.7008928 0 0 1 1.58193218,-1.707 a 1.7008928,1.7008928 0 0 1 1.804593,1.46963 a 1.7008928,1.7008928 0 0 1 -1.3513176,1.89481 a 1.7008928,1.7008928 0 0 1 -1.97728209,-1.22749" />
-    <path
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.39948392;stroke-opacity:1"
-       id="path1734-7"
-       sodipodi:type="arc"
-       sodipodi:cx="14.413028"
-       sodipodi:cy="294.54962"
-       sodipodi:rx="13.615903"
-       sodipodi:ry="13.502474"
-       sodipodi:start="3.3143361"
-       sodipodi:end="4.5666427"
-       d="M 0.99977149,292.22874 A 13.615903,13.502474 0 0 1 12.435579,281.1903"
-       sodipodi:open="true" />
-    <path
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:3.39948392;stroke-opacity:1"
-       id="path1734-7-5"
-       sodipodi:type="arc"
-       sodipodi:cx="17.631096"
-       sodipodi:cy="296.9057"
-       sodipodi:rx="13.615903"
-       sodipodi:ry="13.081364"
-       sodipodi:start="3.5035011"
-       sodipodi:end="4.2945316"
-       d="M 4.8971927,292.27412 A 13.615903,13.081364 0 0 1 12.10572,284.94985"
-       sodipodi:open="true" />
-    <path
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:3.00000008, 1.50000004, 0.75000002, 1.50000004;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1734-7-3"
-       sodipodi:type="arc"
-       sodipodi:cx="15.986719"
-       sodipodi:cy="295.50241"
-       sodipodi:rx="13.615903"
-       sodipodi:ry="13.081364"
-       sodipodi:start="3.3534788"
-       sodipodi:end="4.4637938"
-       d="m 2.6753224,292.75134 a 13.615903,13.081364 0 0 1 9.9613046,-9.92816"
-       sodipodi:open="true" />
-    <path
-       sodipodi:open="true"
-       d="M 5.5745242,292.59898 A 12.950489,12.392507 0 0 1 12.430768,285.6604"
-       sodipodi:end="4.2945316"
-       sodipodi:start="3.5035011"
-       sodipodi:ry="12.392507"
-       sodipodi:rx="12.950489"
-       sodipodi:cy="296.98666"
-       sodipodi:cx="17.686117"
-       sodipodi:type="arc"
-       id="path1107"
-       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:3.39948392;stroke-opacity:1" />
-    <path
-       sodipodi:open="true"
-       d="M 0.31251003,291.9471 A 14.019665,13.999018 0 0 1 12.087431,280.50274"
-       sodipodi:end="4.5666427"
-       sodipodi:start="3.3143361"
-       sodipodi:ry="13.999018"
-       sodipodi:rx="14.019665"
-       sodipodi:cy="294.35333"
-       sodipodi:cx="14.123519"
-       sodipodi:type="arc"
-       id="path1109"
-       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:3.39948392;stroke-opacity:1" />
-    <path
-       style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0.37433758;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1111"
-       sodipodi:type="arc"
-       sodipodi:cx="14.441258"
-       sodipodi:cy="294.35425"
-       sodipodi:rx="0.64556569"
-       sodipodi:ry="0.62194216"
-       sodipodi:start="3.1096357"
-       sodipodi:end="3.109482"
-       d="m 13.796022,294.37412 a 0.64556569,0.62194216 0 0 1 0.624585,-0.6415 a 0.64556569,0.62194216 0 0 1 0.665886,0.60171 a 0.64556569,0.62194216 0 0 1 -0.624533,0.64154 a 0.64556569,0.62194216 0 0 1 -0.665934,-0.60165"
-       sodipodi:open="true" />
+     id="layer3"
+     style="display:inline"
+     transform="matrix(0.26458334,0,0,0.26458334,0.06614583,0)">
+    <g
+       id="layer1-3"
+       transform="translate(-0.24999998)">
+      <path
+         style="display:inline;fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:3.45;stroke-opacity:1"
+         id="path2"
+         d="M -13.685776,15.235369 A 36,36 0 0 1 -48.854274,51.225765"
+         transform="rotate(-88.62016)" />
+      <path
+         d="M 14.951172,12.048828 A 2,2 0 0 0 12.902344,14 a 2,2 0 0 0 0.01172,0.06836 36,36 0 0 1 27.060546,11.007813 36,36 0 0 1 10.001953,26.986328 2,2 0 0 0 0.05469,0.01172 2,2 0 0 0 2.001953,-1.998047 C 52.053484,29.45341 35.567964,12.545433 14.951172,12.048828 Z"
+         style="fill:#729fcf;fill-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:3.45"
+         id="path3" />
+      <path
+         d="M 49.976562,52.0625 A 36,36 0 0 0 39.974609,25.076172 36,36 0 0 0 12.914063,14.068359 a 2,2 0 0 0 1.939453,1.980469 c 18.48833,0.445336 33.199828,15.529753 33.18164,34.023438 a 2,2 0 0 0 1.941406,1.990234 z"
+         style="display:inline;fill:#3465a4;fill-opacity:1;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:3.45"
+         id="path4" />
+    </g>
+    <g
+       transform="matrix(0.77869459,0,0,0.77869445,65.33141,41.811165)"
+       id="g14"
+       style="stroke-width:1.2842">
+      <path
+         style="fill:#729fcf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path13"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient6);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path14"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
+    </g>
+    <g
+       transform="matrix(0.77869459,0,0,0.77869445,29.298264,41.597628)"
+       id="g16"
+       style="stroke-width:1.2842">
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path15"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient7);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path16"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
+    </g>
+    <g
+       transform="matrix(0.77869459,0,0,0.77869445,29.298264,5.5976279)"
+       id="g18"
+       style="stroke-width:1.2842">
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path17"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient14);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path18"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmCircle.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmCircle.svg
index 53ad307405..512c7b6322 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmCircle.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmCircle.svg
@@ -2,26 +2,54 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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="svg8"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="creates_cosmetic_circumference.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs2">
     <linearGradient
-       id="linearGradient5969"
-       osb:paint="solid">
+       id="linearGradient6">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop5" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient1">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop1" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="1"
+         id="stop2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5969">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
          offset="0"
@@ -34,29 +62,71 @@
        width="6"
        patternUnits="userSpaceOnUse"
        id="EMFhbasepattern" />
+    <linearGradient
+       xlink:href="#linearGradient1"
+       id="linearGradient2"
+       x1="7.0339123"
+       y1="288.49248"
+       x2="9.8303113"
+       y2="288.49248"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient4"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3892">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3894" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop3896" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3892"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient14"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient6"
+       id="linearGradient3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="6.8210814"
-     inkscape:cy="26.281493"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -65,78 +135,62 @@
         <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)">
+     id="layer3"
+     style="display:inline"
+     transform="matrix(0.26458334,0,0,0.26458334,0.06614583,0)">
     <g
-       id="g827"
-       transform="matrix(0.56816734,0,0,0.56816734,-0.57714939,128.83144)">
+       id="g4428-3"
+       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296236)">
       <path
-         d="m 2.7558475,292.47372 a 6.9231811,6.9704261 0 0 1 1.7816437,-9.67943 a 6.9231811,6.9704261 0 0 1 9.6186398,1.76745 a 6.9231811,6.9704261 0 0 1 -1.729266,9.68905 a 6.9231811,6.9704261 0 0 1 -9.6280564,-1.71468"
-         sodipodi:open="true"
-         sodipodi:end="2.5299071"
-         sodipodi:start="2.540798"
-         sodipodi:ry="6.9704261"
-         sodipodi:rx="6.9231811"
-         sodipodi:cy="288.53336"
-         sodipodi:cx="8.4666872"
-         sodipodi:type="arc"
-         id="path4508"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0.69999999;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:2.8, 1.4, 0.7, 1.4;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:none;stroke:#0b1521;stroke-width:8.27355;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
       <path
-         d="m 6.7657672,288.54354 a 1.7008928,1.7008928 0 0 1 1.6031927,-1.70836 a 1.7008928,1.7008928 0 0 1 1.7884921,1.51328 a 1.7008928,1.7008928 0 0 1 -1.419363,1.86389 a 1.7008928,1.7008928 0 0 1 -1.9343809,-1.32169"
-         sodipodi:open="true"
-         sodipodi:end="2.9298937"
-         sodipodi:start="3.1355538"
-         sodipodi:ry="1.7008928"
-         sodipodi:rx="1.7008928"
-         sodipodi:cy="288.53326"
-         sodipodi:cx="8.466629"
-         sodipodi:type="arc"
-         id="path1738-3-8"
-         style="opacity:1;fill:#ffff00;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" />
+         style="fill:none;stroke:#3465a4;stroke-width:4.13677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
       <path
-         sodipodi:open="true"
-         d="m 7.8520164,288.50583 a 0.64556569,0.62194222 0 0 1 0.6245845,-0.64149 a 0.64556569,0.62194222 0 0 1 0.6658861,0.6017 a 0.64556569,0.62194222 0 0 1 -0.6245334,0.64154 a 0.64556569,0.62194222 0 0 1 -0.665934,-0.60165"
-         sodipodi:end="3.109482"
-         sodipodi:start="3.1096357"
-         sodipodi:ry="0.62194222"
-         sodipodi:rx="0.64556569"
-         sodipodi:cy="288.48596"
-         sodipodi:cx="8.4972525"
-         sodipodi:type="arc"
-         id="path1111"
-         style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:0.37433758;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2-4-1"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
       <path
-         d="m 11.569581,283.91753 a 1.6032633,1.5897803 0 0 1 1.491131,-1.59549 a 1.6032633,1.5897803 0 0 1 1.701011,1.37362 a 1.6032633,1.5897803 0 0 1 -1.273753,1.77103 a 1.6032633,1.5897803 0 0 1 -1.863788,-1.1473"
-         sodipodi:open="true"
-         sodipodi:end="2.8797933"
-         sodipodi:start="3.1355538"
-         sodipodi:ry="1.5897803"
-         sodipodi:rx="1.6032633"
-         sodipodi:cy="283.90793"
-         sodipodi:cx="13.172815"
-         sodipodi:type="arc"
-         id="path1738"
-         style="opacity:1;fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.93862909;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2-4"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
+    </g>
+    <g
+       transform="matrix(0.77869459,0,0,0.77869445,69.548876,23.582719)"
+       id="g14"
+       style="stroke-width:1.2842">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.26458332"
-         d="m 4.591514,293.38948 l 4.7149872,-5.74156 z"
-         id="path834" />
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path13"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
       <path
-         inkscape:transform-center-y="-0.0372349"
-         inkscape:transform-center-x="-0.098328866"
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#ffff00;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.6, 0.6;stroke-dashoffset:1.76999998;stroke-opacity:1"
-         d="m 9.098645,287.90981 l 3.077619,-2.94138"
-         id="path836" />
+         style="fill:url(#linearGradient3);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path14"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
+    </g>
+    <g
+       transform="matrix(0.77869459,0,0,0.77869445,45.548272,23.597758)"
+       id="g16"
+       style="stroke-width:1.2842">
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path15"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient14);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path16"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmCircle3Points.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmCircle3Points.svg
index ad571067db..e06d336e97 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmCircle3Points.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionDrawCosmCircle3Points.svg
@@ -1,44 +1,151 @@
-<?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.19mm" height="17.19mm" fill-rule="evenodd" stroke-linejoin="round" stroke-width="28.222" preserveAspectRatio="xMidYMid" version="1.2" viewBox="0 0 1719 1719" 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="1719" height="1719"/>
+<?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.3333 1693.3333"
+   xml:space="preserve"
+   id="svg25"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+ <defs
+   class="ClipPathGroup"
+   id="defs1"><linearGradient
+   id="linearGradient7"><stop
+     style="stop-color:#888a85;stop-opacity:1"
+     offset="0"
+     id="stop6" /><stop
+     style="stop-color:#babdb6;stop-opacity:1"
+     offset="1"
+     id="stop7" /></linearGradient><linearGradient
+   id="linearGradient5"><stop
+     style="stop-color:#888a85;stop-opacity:1"
+     offset="0"
+     id="stop4" /><stop
+     style="stop-color:#babdb6;stop-opacity:1"
+     offset="1"
+     id="stop5" /></linearGradient><linearGradient
+   id="linearGradient3"><stop
+     style="stop-color:#729fcf;stop-opacity:1"
+     offset="0"
+     id="stop2" /><stop
+     style="stop-color:#ffffff;stop-opacity:0"
+     offset="1"
+     id="stop3" /></linearGradient>
+  <clipPath
+   id="presentation_clip_path">
+   <rect
+   width="1719"
+   height="1719"
+   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="1719" height="1719" fill="none"/>
-        <path d="m882 906v-1c0-6 1-12 4-17s8-9 13-12 11-4 16-4h1c6 0 12 1 18 4 5 3 9 7 12 12s5 10 5 15v2c0 5-2 11-5 16s-7 9-12 12-11 4-17 4c0 1 0 1-1 1-6 0-12-2-17-5s-10-7-13-12-4-10-4-15z" fill="#f00"/>
-        <path d="m882 906v-1c0-6 1-12 4-17s8-9 13-12 11-4 16-4h1c6 0 12 1 18 4 5 3 9 7 12 12s5 10 5 15v2c0 5-2 11-5 16s-7 9-12 12-11 4-17 4c0 1 0 1-1 1-6 0-12-2-17-5s-10-7-13-12-4-10-4-15z" fill="none" stroke="#f00" stroke-linejoin="round" stroke-width="43"/>
-        <path d="m286 1330c-11-16-22-33-31-50-40-70-69-145-85-223" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m154 909v-7c0-23 1-45 3-68" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m185 688c17-57 40-112 70-165 20-34 42-67 67-98" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m617 203c92-38 191-59 290-59h2" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m1056 159c25 6 49 11 73 19" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m1574 551c12 23 23 45 32 68" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m1647 762c8 46 13 93 13 140 0 53-5 106-17 157" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m1599 1201c-11 23-21 46-33 67" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m1482 1392c-42 49-91 94-144 131-18 12-36 24-55 35-10 6-22 13-34 18" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m1111 1631c-24 7-48 13-73 16" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m890 1659c-100-2-199-25-289-66" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m455 1508c-20-15-39-30-58-47" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m1270 242c41 22 80 47 117 77 41 33 79 70 112 111" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m431 311c19-15 39-31 60-45" fill="none" stroke="#f00" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="80"/>
-        <path d="m78 646v-1c0-23 6-46 17-66 12-20 29-36 49-48 18-10 37-16 57-17h10c23 0 46 6 66 17 20 12 37 28 49 48 8 15 14 32 16 49 1 5 2 11 2 17 0 23-7 46-18 66-12 20-29 37-49 48-12 7-26 12-40 15-9 2-18 3-26 3-24 0-47-7-67-18s-37-28-49-48c-5-10-10-21-13-32l-4-33z" fill="#f00"/>
-        <path d="m58 639v0-1c0-26 8-52 20-74 14-23 33-41 55-55 20-11 43-18 65-19v0h10c27 0 53 6 75 19 23 14 42 32 56 55 9 16 16 35 18 54v0c1 6 2 13 2 20 0 26-8 51-20 74-14 22-33 42-56 54-14 8-30 14-45 17v0c-10 3-20 3-30 3-26 0-52-7-75-20-22-12-41-32-55-54-6-11-11-23-15-35" fill="none" stroke="#ff0" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="66"/>
-        <path d="m497 212v-1c0-23 7-46 18-66 12-20 28-36 48-48 18-10 38-16 58-17h9c24 0 47 6 66 17 21 12 37 28 50 48 8 15 14 31 16 48 1 6 1 12 1 18 0 23-6 46-17 66-13 20-29 37-50 48-12 7-26 12-39 15-10 2-18 3-27 3-23 0-46-7-67-18-20-11-36-28-48-48-6-10-10-21-13-32l-5-33z" fill="#f00"/>
-        <path d="m478 205v0-1c0-26 7-52 20-75 14-22 32-40 55-54 20-11 42-18 65-19v0h10c27 0 52 6 75 19 23 14 42 32 55 54 10 17 16 36 19 55v0c0 6 1 13 1 20 0 26-7 51-20 74-13 22-32 41-55 54-14 8-30 14-45 17v0c-11 3-20 3-30 3-26 0-52-7-75-20s-41-32-55-54c-6-11-11-23-15-35" fill="none" stroke="#ff0" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="66"/>
-        <path d="m1197 275v-1c0-23 6-46 17-66 13-20 29-36 49-48 18-10 38-16 57-17h10c23 0 46 5 66 17 21 12 37 28 49 48 9 15 14 31 16 48 1 6 2 12 2 18 0 23-7 45-18 65-12 20-28 37-49 49-12 7-26 12-40 15-9 2-18 2-26 2-24 0-47-6-67-17-20-12-36-29-49-49-5-10-10-20-13-31l-4-33z" fill="#f00"/>
-        <path d="m1177 268v0-1c0-27 8-52 20-75 14-22 33-41 55-54 20-12 43-18 65-20v0h10c27 0 53 7 75 20 23 13 42 32 56 54 9 17 16 35 18 55v0c1 6 2 13 2 20 0 25-8 51-20 73-14 23-33 42-56 55-13 8-30 14-45 17v0c-10 2-20 3-30 3-26 0-52-7-75-20-22-13-41-32-55-55-6-11-11-23-15-35" fill="none" stroke="#ff0" stroke-linecap="square" stroke-linejoin="bevel" stroke-width="66"/>
-       </g>
-      </g>
-     </g>
-    </g>
-   </g>
- </g>
-</svg>
+ <linearGradient
+   xlink:href="#linearGradient3"
+   id="linearGradient3898"
+   x1="37.429146"
+   y1="41.590584"
+   x2="24.483221"
+   y2="4.9104676"
+   gradientUnits="userSpaceOnUse" /><linearGradient
+   id="linearGradient17"><stop
+     style="stop-color:#729fcf;stop-opacity:1"
+     offset="0"
+     id="stop16" /><stop
+     style="stop-color:#ffffff;stop-opacity:0"
+     offset="1"
+     id="stop17" /></linearGradient><linearGradient
+   xlink:href="#linearGradient17"
+   id="linearGradient3856"
+   x1="22.84341"
+   y1="4.8241611"
+   x2="30.783579"
+   y2="28.644661"
+   gradientUnits="userSpaceOnUse" /><linearGradient
+   xlink:href="#linearGradient3836-9-3"
+   id="linearGradient14"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+   x1="-18"
+   y1="18"
+   x2="-22"
+   y2="5" /><linearGradient
+   id="linearGradient3836-9-3"><stop
+     style="stop-color:#888a85;stop-opacity:1"
+     offset="0"
+     id="stop3838-8-5" /><stop
+     style="stop-color:#babdb6;stop-opacity:1"
+     offset="1"
+     id="stop3840-1-6" /></linearGradient><linearGradient
+   xlink:href="#linearGradient5"
+   id="linearGradient1"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+   x1="-18"
+   y1="18"
+   x2="-22"
+   y2="5" /><linearGradient
+   xlink:href="#linearGradient7"
+   id="linearGradient2"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+   x1="-18"
+   y1="18"
+   x2="-22"
+   y2="5" /></defs>
+ 
+<g
+   id="layer3"
+   style="display:inline"
+   transform="matrix(26.458333,0,0,26.458333,6.6145817,-1.6542887e-5)"><g
+     id="g4428-3"
+     transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-54.421236)"><path
+       style="fill:none;stroke:#0b1521;stroke-width:8.27355;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3044"
+       d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+       transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" /><path
+       style="fill:none;stroke:#3465a4;stroke-width:4.13677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3044-2"
+       d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+       transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" /><path
+       style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3044-2-4-1"
+       d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+       transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" /><path
+       style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3044-2-4"
+       d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+       transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" /></g><g
+     transform="matrix(0.77869459,0,0,0.77869445,69.548876,25.457719)"
+     id="g14"
+     style="stroke-width:1.2842"><path
+       style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path13"
+       d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" /><path
+       style="fill:url(#linearGradient1);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path14"
+       d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" /></g><g
+     transform="matrix(0.77869459,0,0,0.77869445,45.548272,1.472758)"
+     id="g16"
+     style="stroke-width:1.2842"><path
+       style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path15"
+       d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" /><path
+       style="fill:url(#linearGradient2);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path16"
+       d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" /></g><g
+     transform="matrix(0.77869459,0,0,0.77869445,62.519343,8.4976597)"
+     id="g18"
+     style="stroke-width:1.2842"><path
+       style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path17"
+       d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" /><path
+       style="fill:url(#linearGradient14);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path18"
+       d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" /></g></g></svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionHoleCircle.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionHoleCircle.svg
index 2cfd5a9c56..868219ab9f 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionHoleCircle.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionHoleCircle.svg
@@ -2,57 +2,84 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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="64"
    height="64"
    viewBox="0 0 16.933333 16.933334"
    version="1.1"
    id="svg8"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="assi_circonf_in_cerchio_giallo.svg"
-   inkscape:export-filename="E:\1-FREECAD\COMUNITA'\macro-toolsTechDrav\IconTest\icons-toolsTechDraw\assi_circonf_in_cerchio.png"
-   inkscape:export-xdpi="96"
-   inkscape:export-ydpi="96">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs2">
     <linearGradient
-       id="linearGradient5969"
-       osb:paint="solid">
+       id="linearGradient10">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop10" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="1"
+         id="stop11" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop8" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="1"
+         id="stop9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop6" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="1"
+         id="stop7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5969">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
          offset="0"
          id="stop5967" />
     </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient6"
+       id="linearGradient7"
+       x1="-1.4923168"
+       y1="7.304256"
+       x2="2.2091107"
+       y2="7.304256"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient8"
+       id="linearGradient9"
+       x1="-6.3479584"
+       y1="-1.1116331"
+       x2="-2.6520416"
+       y2="-1.1116331"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient10"
+       id="linearGradient11"
+       x1="-11.209111"
+       y1="7.304256"
+       x2="-7.5076832"
+       y2="7.304256"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568542"
-     inkscape:cx="25.109085"
-     inkscape:cy="38.000373"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false" />
   <metadata
      id="metadata5">
     <rdf:RDF>
@@ -61,193 +88,83 @@
         <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>
+  <ellipse
+     style="display:inline;fill:none;stroke:#0b1521;stroke-width:1.5875;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:1.5875, 3.175;stroke-dashoffset:0"
+     id="path32"
+     cx="8.4814825"
+     cy="10.056869"
+     rx="5.1347332"
+     ry="5.162077" />
+  <ellipse
+     style="display:inline;fill:none;stroke:#729fcf;stroke-width:0.52916667;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:1.58750009, 3.17500019;stroke-dashoffset:0"
+     id="ellipse33"
+     cx="8.4814825"
+     cy="10.056869"
+     rx="5.1347332"
+     ry="5.162077" />
   <g
-     inkscape:label="Livello 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-280.06665)">
-    <ellipse
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:39.23077011;stroke-opacity:1"
-       id="path835-6"
-       cx="14.357396"
-       cy="285.56192"
-       rx="1.8898904"
-       ry="1.8691021" />
-    <circle
-       r="1.294897"
-       cy="285.46844"
-       cx="14.164527"
-       id="circle963"
-       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:39.23077011;stroke-opacity:1" />
-    <circle
-       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:39.23077011;stroke-opacity:1"
-       id="circle965"
-       cx="14.164527"
-       cy="285.46844"
-       r="2.4875872" />
-    <ellipse
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:39.23077011;stroke-opacity:1"
-       id="ellipse967"
-       cx="14.169182"
-       cy="285.46854"
-       rx="1.8898904"
-       ry="1.8691021" />
-    <ellipse
-       ry="1.8691021"
-       rx="1.8898904"
-       cy="285.52258"
-       cx="14.132645"
-       id="ellipse969"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:39.23077011;stroke-opacity:1" />
-    <ellipse
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:39.23077011;stroke-opacity:1"
-       id="path835-7"
-       cx="8.023921"
-       cy="283.15851"
-       rx="1.8898904"
-       ry="1.8691021" />
-    <circle
-       r="1.294897"
-       cy="283.02103"
-       cx="8.2114019"
-       id="circle935"
-       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:39.23077011;stroke-opacity:1" />
-    <circle
-       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:39.23077011;stroke-opacity:1"
-       id="circle937"
-       cx="8.2114019"
-       cy="283.02103"
-       r="2.4875872" />
-    <ellipse
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:39.23077011;stroke-opacity:1"
-       id="ellipse939"
-       cx="8.2160568"
-       cy="283.02112"
-       rx="1.8898904"
-       ry="1.8691021" />
-    <ellipse
-       ry="1.8691021"
-       rx="1.8898904"
-       cy="283.07516"
-       cx="8.1795197"
-       id="ellipse941"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:39.23077011;stroke-opacity:1" />
-    <path
-       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.50379795;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.01519174, 1.00759587, 0.50379794, 1.00759587;stroke-dashoffset:4.65509272;stroke-opacity:1"
-       d="m 8.0807972,280.05563 l 0.033335,6.31888"
-       id="path943"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:label="path5989" />
-    <circle
-       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:39.23077011;stroke-opacity:1"
-       id="circle915"
-       cx="3.5811937"
-       cy="294.19968"
-       r="1.294897" />
-    <circle
-       r="2.4875872"
-       cy="294.19968"
-       cx="3.5811937"
-       id="circle917"
-       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:39.23077011;stroke-opacity:1" />
-    <ellipse
-       ry="1.8691021"
-       rx="1.8898904"
-       cy="294.19977"
-       cx="3.5858486"
-       id="ellipse919"
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:39.23077011;stroke-opacity:1" />
-    <circle
-       r="1.294897"
-       cy="287.51895"
-       cx="2.5890062"
-       id="circle904"
-       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:39.23077011;stroke-opacity:1" />
-    <circle
-       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:39.23077011;stroke-opacity:1"
-       id="path835-2-5"
-       cx="2.5890062"
-       cy="287.51895"
-       r="2.4875872" />
-    <path
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:3.175, 1.5875, 0.79375, 1.5875;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4508"
-       sodipodi:type="arc"
-       sodipodi:cx="8.9854546"
-       sodipodi:cy="290.0925"
-       sodipodi:rx="6.9231811"
-       sodipodi:ry="6.9704261"
-       sodipodi:start="2.540798"
-       sodipodi:end="5.7595865"
-       sodipodi:open="true"
-       d="m 3.2746149,294.03287 a 6.9231811,6.9704261 0 0 1 -0.4549413,-7.11044 a 6.9231811,6.9704261 0 0 1 5.9876535,-3.79805 a 6.9231811,6.9704261 0 0 1 6.1737779,3.48291" />
-    <ellipse
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:39.23077011;stroke-opacity:1"
-       id="path835"
-       cx="3.5493119"
-       cy="294.25381"
-       rx="1.8898904"
-       ry="1.8691021" />
-    <ellipse
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffff00;stroke-width:0.75;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:39.23077011;stroke-opacity:1"
-       id="path835-2"
-       cx="2.5936606"
-       cy="287.51904"
-       rx="1.8898904"
-       ry="1.8691021" />
-    <path
-       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.52822;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.11288001, 1.05644, 0.52822, 1.05644;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 2.623848,284.02327 l 0.033172,7.41249"
-       id="path5989-1-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:label="path5989" />
-    <path
-       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.5029791;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.01191628, 1.00595814, 0.50297907, 1.00595814;stroke-dashoffset:0.60778832;stroke-opacity:1"
-       d="m -0.08069989,287.43392 l 5.79305869,-0.0169"
-       id="path5989-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:label="path5989" />
-    <path
-       inkscape:label="path5989"
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path921"
-       d="m 3.450576,290.80452 l 0.033362,6.21926"
-       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.00000006, 1.00000003, 0.50000001, 1.00000003;stroke-dashoffset:4.25;stroke-opacity:1" />
-    <path
-       inkscape:label="path5989"
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path923"
-       d="m -0.01578919,294.31305 l 6.88693479,-0.0168"
-       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.00000006, 1.00000003, 0.50000001, 1.00000003;stroke-dashoffset:4.25;stroke-opacity:1" />
-    <path
-       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.00000006, 1.00000003, 0.50000001, 1.00000003;stroke-dashoffset:4.25;stroke-opacity:1"
-       d="m 4.6144192,283.13441 l 6.8869348,-0.0168"
-       id="path945"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:label="path5989" />
-    <path
-       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.52257675;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.09030702, 1.04515351, 0.52257676, 1.04515351;stroke-dashoffset:4.56209517;stroke-opacity:1"
-       d="m 14.033965,282.07247 l 0.03324,6.81617"
-       id="path971"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:label="path5989" />
-    <path
-       style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.48691007;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:1.94764032, 0.97382016, 0.48691008, 0.97382016;stroke-dashoffset:3.84658957;stroke-opacity:1"
-       d="m 10.402475,285.58182 l 6.522541,-0.0168"
-       id="path973"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:label="path5989" />
+     id="layer2">
+    <g
+       id="g7"
+       transform="matrix(1.0000048,0,0,0.99999204,3.9666461,5.5333797)"
+       style="display:inline;stroke-width:1">
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:0.529168;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none"
+         d="M -0.18967969,5.2603093 C 0.93949296,4.9577484 2.1001423,5.6278496 2.4027032,6.7570223 2.7052641,7.8861949 2.0351629,9.0468443 0.90599025,9.3494052 -0.2231824,9.6519661 -1.3838318,8.9818649 -1.6863927,7.8526922 -1.9889536,6.7235196 -1.3188524,5.5628702 -0.18967969,5.2603093 Z"
+         transform="scale(-1,1)"
+         id="path14" />
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:0.529168;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none"
+         d="m -5.996713,0.38699847 c -0.8266117,-0.82661176 -0.8266117,-2.16681417 0,-2.99342597 0.8266118,-0.8266118 2.1668142,-0.8266118 2.993426,0 0.8266117,0.8266118 0.8266117,2.16681421 0,2.99342597 -0.8266118,0.82661173 -2.1668142,0.82661173 -2.993426,0 z"
+         transform="scale(-1,1)"
+         id="path6" />
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:0.529168;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none"
+         d="m -7.3136073,7.8526922 c -0.3025609,1.1291727 -1.4632103,1.7992739 -2.592383,1.496713 -1.1291727,-0.3025609 -1.7992737,-1.4632103 -1.4967127,-2.5923829 0.302561,-1.1291727 1.46321,-1.7992739 2.5923827,-1.496713 1.1291727,0.3025609 1.7992739,1.4632103 1.496713,2.5923829 z"
+         transform="scale(-1,1)"
+         id="path3" />
+      <path
+         style="display:inline;stroke-width:0.529168;fill:url(#linearGradient7);stroke:#d3d7cf;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none"
+         d="M 0.34375,5.7167969 C 1.0449237,5.709804 1.6987684,6.1785127 1.890625,6.8945312 2.1169144,7.7390546 1.6139513,8.611629 0.76953125,8.8378906 -0.07499219,9.06418 -0.94756646,8.561217 -1.1738281,7.7167969 -1.4000768,6.8724255 -0.89658734,5.9975941 -0.05273437,5.7714844 0.07977642,5.7359782 0.21327368,5.7180981 0.34375,5.7167969 Z"
+         transform="scale(-1,0.99999999)"
+         id="path1" />
+      <path
+         style="display:inline;stroke-width:0.529168;fill:url(#linearGradient9);stroke:#d3d7cf;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none"
+         d="m -4.5,-2.6972656 c 0.4042679,0 0.8099418,0.1556449 1.1210937,0.4667968 0.6182618,0.6182619 0.6182618,1.6239258 0,2.24218755 -0.6182618,0.61826178 -1.6239256,0.61826175 -2.2421874,0 -0.6182618,-0.61826178 -0.6182618,-1.62392575 0,-2.24218755 0.311152,-0.311152 0.7168258,-0.4667968 1.1210937,-0.4667968 z"
+         transform="scale(-1,0.99999999)"
+         id="path2" />
+      <path
+         style="display:inline;fill:url(#linearGradient11);stroke:#d3d7cf;stroke-width:0.529168;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:none"
+         d="m -9.34375,5.7167969 c 0.1304763,0.0013 0.2639736,0.019181 0.3964844,0.054687 0.8438529,0.2261097 1.3473424,1.100941 1.1210937,1.9453125 C -8.0524335,8.561217 -8.9250077,9.06418 -9.7695313,8.8378906 -10.613951,8.611629 -11.116914,7.7390546 -10.890625,6.8945312 -10.698768,6.1785126 -10.044924,5.709804 -9.34375,5.7167969 Z"
+         transform="scale(-1,0.99999999)"
+         id="path4" />
+      <path
+         style="display:inline;fill:none;stroke:#204a87;stroke-width:0.529168;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:0.529168, 1.05833;stroke-dashoffset:0.264583"
+         d="m 2.3914758,5.7173571 -5.4992615,3.175"
+         id="path16" />
+      <path
+         style="display:inline;fill:none;stroke:#204a87;stroke-width:0.529168;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:0.529168, 1.05833;stroke-dashoffset:0.264583"
+         d="M 4.4999999,2.0652859 4.5,-4.2847142"
+         id="path15" />
+      <path
+         style="display:inline;fill:none;stroke:#204a87;stroke-width:0.529168;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:0.529168, 1.05833;stroke-dashoffset:0.264583"
+         d="M 6.6085243,5.717357 12.107786,8.8923571"
+         id="path13" />
+      <path
+         style="display:inline;fill:none;stroke:#204a87;stroke-width:0.529168;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:0.529168, 1.05833;stroke-dashoffset:0.264583"
+         d="M -1.9456549,4.5552261 1.2293448,10.054488"
+         id="path22" />
+      <path
+         style="display:inline;fill:none;stroke:#204a87;stroke-width:0.529168;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:0.529168, 1.05833;stroke-dashoffset:0.264583"
+         d="m 7.6750002,-1.109714 -6.3500001,-3e-7"
+         id="path21" />
+      <path
+         style="display:inline;fill:none;stroke:#204a87;stroke-width:0.529168;stroke-linecap:square;stroke-linejoin:round;stroke-dasharray:0.529168, 1.05833;stroke-dashoffset:0.264583"
+         d="M 7.7706547,10.054488 10.945655,4.5552266"
+         id="path5" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionLineParallel.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionLineParallel.svg
index adb22a3572..e1fc160c4a 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionLineParallel.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionLineParallel.svg
@@ -2,44 +2,62 @@
 <!-- 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="svg843"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="creates_cosmetic_parallel.svg">
-  <defs
-     id="defs837" />
+   sodipodi:docname="TechDraw_ExtensionLineParallel.svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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/">
   <sodipodi:namedview
-     id="base"
+     id="namedview1"
      pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
      inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="0.91289294"
-     inkscape:cy="14.381402"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="6.0877474"
+     inkscape:cx="24.228995"
+     inkscape:cy="27.185753"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false" />
+     inkscape:current-layer="g1" />
+  <defs
+     id="defs837">
+    <linearGradient
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient14"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+  </defs>
   <metadata
      id="metadata840">
     <rdf:RDF>
@@ -48,44 +66,64 @@
         <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)">
+     id="g1"
+     transform="matrix(1.688137,0,0,1.7516193,1.342005,1.1796513)">
     <g
-       id="g818"
-       transform="matrix(0.49556144,0,0,0.49556144,-0.024424,149.77952)">
-      <rect
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.6000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect825"
-         width="1.391614"
-         height="14.016263"
-         x="228.56145"
-         y="172.03438"
-         transform="matrix(0.64298429,0.76587936,-0.76272685,0.64672077,0,0)" />
+       id="g4"
+       transform="translate(-0.02930456,0.02737671)">
       <path
-         sodipodi:open="true"
-         transform="matrix(0.62156793,0.78336027,-0.77777715,0.62854014,0,0)"
-         d="m 224.92784,172.26166 a 1.6844164,1.7167388 0 0 1 1.68508,-1.71441 a 1.6844164,1.7167388 0 0 1 1.68376,1.71576 a 1.6844164,1.7167388 0 0 1 -1.68183,1.71772 a 1.6844164,1.7167388 0 0 1 -1.687,-1.71243"
-         sodipodi:end="3.1390863"
-         sodipodi:start="3.1429535"
-         sodipodi:ry="1.7167388"
-         sodipodi:rx="1.6844164"
-         sodipodi:cy="172.26399"
-         sodipodi:cx="226.61226"
-         sodipodi:type="arc"
-         id="path827"
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.60001194;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path845-6"
+         id="path3"
          d="M 13.37281,280.83818 C 0.65746922,290.72811 0.65746922,290.72811 0.65746922,290.72811"
-         style="fill:none;stroke:#ff0000;stroke-width:1.86800003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3.73600016, 1.86800008;stroke-dashoffset:2.16688013;stroke-opacity:1" />
+         style="fill:none;stroke:#0b1521;stroke-width:2.48388378;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.024424,-138.7538)" />
+      <path
+         id="path4"
+         d="M 13.37281,280.83818 C 0.65746922,290.72811 0.65746922,290.72811 0.65746922,290.72811"
+         style="display:inline;fill:none;stroke:#3465a4;stroke-width:1.24194189;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.02442399,-138.7538)" />
+      <path
+         id="path2"
+         d="m 13.182082,280.59348 -12.70829018,9.8868"
+         style="display:inline;fill:none;stroke:#729fcf;stroke-width:0.620971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.02442399,-138.7538)"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       transform="matrix(0.12204556,0,0,0.11762235,5.7952885,1.6070471)"
+       id="g16"
+       style="display:inline;stroke-width:1.2842">
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path15"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient14);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path16"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
+    </g>
+    <g
+       id="g7"
+       transform="translate(1.5661823,2.554319)">
+      <path
+         id="path5"
+         d="M 13.37281,280.83818 C 0.65746922,290.72811 0.65746922,290.72811 0.65746922,290.72811"
+         style="fill:none;stroke:#555753;stroke-width:2.48388;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.024424,-138.7538)" />
+      <path
+         id="path6"
+         d="M 13.37281,280.83818 C 0.65746922,290.72811 0.65746922,290.72811 0.65746922,290.72811"
+         style="display:inline;fill:none;stroke:#babdb6;stroke-width:1.24194;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.02442399,-138.7538)" />
+      <path
+         id="path7"
+         d="m 13.182082,280.59348 -12.70829018,9.8868"
+         style="display:inline;fill:none;stroke:#d3d7cf;stroke-width:0.620971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.02442399,-138.7538)"
+         sodipodi:nodetypes="cc" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionLinePerpendicular.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionLinePerpendicular.svg
index 66c3b7feea..c61266c038 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionLinePerpendicular.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_ExtensionLinePerpendicular.svg
@@ -2,44 +2,40 @@
 <!-- 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="svg843"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
-   sodipodi:docname="creates_cosmetic_perpendicular.svg">
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs837" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="10.69456"
-     inkscape:cy="15.079131"
-     inkscape:document-units="mm"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     units="px"
-     inkscape:pagecheckerboard="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="745"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-others="false" />
+     id="defs837">
+    <linearGradient
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient14"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+  </defs>
   <metadata
      id="metadata840">
     <rdf:RDF>
@@ -48,43 +44,63 @@
         <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)">
+     id="g3"
+     transform="matrix(1.688137,0,0,1.7516193,1.342005,1.17965)">
     <g
-       id="g818"
-       transform="matrix(0.51353284,0,0,0.51353284,-0.0983307,144.66326)">
-      <rect
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.60006005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect825"
-         width="1.5705374"
-         height="15.777605"
-         x="294.5943"
-         y="-20.915379"
-         transform="matrix(-0.01554413,0.99987918,-0.99999007,0.00445675,0,0)" />
+       id="g4-7"
+       transform="matrix(0,0.96375794,-1.0376049,0,5.6481081,-0.25642485)">
       <path
-         transform="matrix(-0.03564269,0.9993646,-0.99964309,-0.0267149,0,0)"
-         d="m 280.3783,-18.529088 a 1.6844164,1.7173343 0 0 1 1.68482,-1.714997 a 1.6844164,1.7173343 0 0 1 1.68401,1.71582 a 1.6844164,1.7173343 0 0 1 -1.68104,1.718845 a 1.6844164,1.7173343 0 0 1 -1.68778,-1.711965 l 1.6844,-0.0054 z"
-         sodipodi:end="3.1384683"
-         sodipodi:start="3.1429535"
-         sodipodi:ry="1.7173343"
-         sodipodi:rx="1.6844164"
-         sodipodi:cy="-18.526751"
-         sodipodi:cx="282.06271"
-         sodipodi:type="arc"
-         id="path827"
-         style="opacity:1;fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:#2b2200;stroke-width:0.60001194;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke" />
+         id="path3-4"
+         d="M 13.056529,281.1429 1.9225776,289.50895"
+         style="fill:none;stroke:#0b1521;stroke-width:2.48388;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.024424,-138.7538)" />
       <path
-         inkscape:connector-curvature="0"
-         id="path845-6"
-         d="M 8.5002418,281.3705 C 8.3163896,294.17878 8.3163896,294.17878 8.3163896,294.17878"
-         style="fill:none;stroke:#ff0000;stroke-width:1.39999998;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:2.8, 1.4, 0.7, 1.4;stroke-dashoffset:1.3904779;stroke-opacity:1" />
+         id="path4-9"
+         d="M 13.056529,281.1429 1.9225775,289.50895"
+         style="display:inline;fill:none;stroke:#3465a4;stroke-width:1.24194;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.02442399,-138.7538)" />
+      <path
+         id="path2"
+         d="m 12.865818,280.89814 -11.126993,8.363"
+         style="display:inline;fill:none;stroke:#729fcf;stroke-width:0.620971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.02442399,-138.7538)" />
+    </g>
+    <g
+       id="g7"
+       transform="translate(1.5661823,2.554319)"
+       style="display:inline">
+      <path
+         id="path5"
+         d="M 13.37281,280.83818 C 0.65746922,290.72811 0.65746922,290.72811 0.65746922,290.72811"
+         style="fill:none;stroke:#555753;stroke-width:2.48388;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.024424,-138.7538)" />
+      <path
+         id="path6"
+         d="M 13.37281,280.83818 C 0.65746922,290.72811 0.65746922,290.72811 0.65746922,290.72811"
+         style="display:inline;fill:none;stroke:#babdb6;stroke-width:1.24194;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.02442399,-138.7538)" />
+      <path
+         id="path7"
+         d="m 13.182082,280.59348 -12.70829018,9.8868"
+         style="display:inline;fill:none;stroke:#d3d7cf;stroke-width:0.620971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.16674;stroke-opacity:1"
+         transform="matrix(0.49556143,0,0,0.49556143,-0.02442399,-138.7538)" />
+    </g>
+    <g
+       transform="matrix(0.12204556,0,0,0.11762235,3.6010553,-0.05450985)"
+       id="g16"
+       style="display:inline;stroke-width:1.2842">
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path15"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient14);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path16"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_CosmeticCircle.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_CosmeticCircle.svg
index 22efc682e8..e149393500 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_CosmeticCircle.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_CosmeticCircle.svg
@@ -1,43 +1,15 @@
 <?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"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg3085"
    height="64"
    width="64"
    version="1.1"
-   sodipodi:docname="TechDraw_CosmeticCircle.svg"
-   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1358"
-     inkscape:window-height="710"
-     id="namedview32"
-     showgrid="true"
-     inkscape:zoom="3.6875"
-     inkscape:cx="26.320541"
-     inkscape:cy="13.559322"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3085">
-    <inkscape:grid
-       type="xygrid"
-       id="grid839" />
-  </sodipodi:namedview>
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs3087">
     <linearGradient
@@ -120,6 +92,53 @@
        x1="31.454977"
        id="linearGradient869"
        xlink:href="#linearGradient5062" />
+    <linearGradient
+       xlink:href="#linearGradient4"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient6"
+       id="linearGradient3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient6">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop5" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata3090">
@@ -129,51 +148,50 @@
         <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>
-  <text
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28200001;marker:none;enable-background:accumulate"
-     xml:space="preserve"
-     id="text3130"
-     y="46.145554"
-     x="13.788582"><tspan
-       id="tspan3132"
-       y="46.145554"
-       x="13.788582" /></text>
-  <path
-     inkscape:connector-curvature="0"
-     id="path3063"
-     d="M 11.709108,52.290892 52.290892,11.709108"
-     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   <g
-     id="g1457">
-    <circle
-       r="29.014698"
-       style="fill:#729fcf;fill-opacity:1;stroke:#000000;stroke-width:1.97060359;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path46"
-       cx="32"
-       cy="32" />
-    <circle
-       r="24"
-       cy="32"
-       cx="32"
-       id="path1438"
-       style="fill:#d3d7cf;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+     id="layer3"
+     style="display:inline;stroke-width:1"
+     transform="matrix(0.99999678,0,0,1,2.0012884,-0.001272)">
     <g
-       id="g901"
-       transform="translate(-2.169491,1.966101)">
+       id="g4428-3"
+       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296236)"
+       style="stroke-width:1">
       <path
-         id="path895"
-         d="m 34.169491,39.593221 c 0,-19.118644 0,-19.118644 0,-19.118644"
-         style="fill:none;stroke:#000000;stroke-width:2.65518355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="fill:none;stroke:#0b1521;stroke-width:8.27356;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
       <path
-         style="fill:none;stroke:#000000;stroke-width:2.65518355;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 24.610169,30.033899 c 19.118644,0 19.118644,0 19.118644,0"
-         id="path897"
-         inkscape:connector-curvature="0" />
+         style="fill:none;stroke:#3465a4;stroke-width:4.13678;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+      <path
+         style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2-4-1"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+      <path
+         style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2-4"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
+    </g>
+    <g
+       transform="matrix(0.77869459,0,0,0.77869445,45.548272,23.597758)"
+       id="g16"
+       style="stroke-width:1.2842">
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path15"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient3);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path16"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_LeaderLine.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_LeaderLine.svg
index e55ec9ed4c..c63f980559 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_LeaderLine.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_LeaderLine.svg
@@ -2,49 +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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="64"
    height="64"
    id="svg3085"
-   sodipodi:docname="techdraw-mline.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1358"
-     inkscape:window-height="703"
-     id="namedview983"
-     showgrid="true"
-     inkscape:zoom="8.03125"
-     inkscape:cx="32"
-     inkscape:cy="5.2857789"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3085"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid985" />
-  </sodipodi:namedview>
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs3087">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5062">
       <stop
          style="stop-color:#729fcf;stop-opacity:1"
@@ -66,20 +36,6 @@
          offset="1"
          style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect3066"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="single_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="0"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
     <linearGradient
        id="linearGradient7597">
       <stop
@@ -122,7 +78,6 @@
          id="stop3840-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5062"
        id="linearGradient5064"
        x1="33.055637"
@@ -131,7 +86,6 @@
        y2="57.417107"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5062"
        id="linearGradient5072"
        x1="3.8125484"
@@ -140,7 +94,6 @@
        y2="51.68948"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5062"
        id="linearGradient5080"
        x1="13.818283"
@@ -149,7 +102,6 @@
        y2="25.689482"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5062"
        id="linearGradient5088"
        x1="43.818283"
@@ -166,96 +118,40 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <text
-     x="13.788582"
-     y="46.145554"
-     id="text3130"
-     xml:space="preserve"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28200001;marker:none;enable-background:accumulate"><tspan
-       x="13.788582"
-       y="46.145554"
-       id="tspan3132" /></text>
   <g
-     id="g1815">
+     id="g3"
+     transform="matrix(1.000003,0,0,1.0000084,-0.29066176,-16.687102)"
+     style="stroke-width:0.999994">
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path3061-2-6"
-       d="m 39.867728,50.432299 -5.043926,3.249433 -14.37481,-26.019768 5.043926,-3.249432 z"
-       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:none;stroke:#0b1521;stroke-width:7.99996;stroke-dasharray:none"
+       d="M 9,63.796199 32.290565,40.68676 h 15.999952"
+       id="path2" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path3063-7-1"
-       d="M 37.798712,50.675315 24.245786,26.416728"
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="display:inline;fill:#3465a4;stroke:#0b1521;stroke-width:1.99999;stroke-linejoin:round;stroke-dasharray:none"
+       d="M 3.5811389,69.57704 5,56.796232 16,67.79618 Z"
+       id="path1" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path3061-2"
-       d="M 14.384846,55.128496 8.5892901,53.575582 18.204445,25.447086 24,27 Z"
-       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="display:inline;fill:none;stroke:#0b1521;stroke-width:7.99996;stroke-linecap:round;stroke-dasharray:none"
+       d="m 58.290487,30.686844 -9.99997,9.999916 9.99997,9.999916"
+       id="path3" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path3063-7"
-       d="m 10.858731,52.833317 8.939981,-25.6087"
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="display:inline;fill:none;stroke:#3465a4;stroke-width:3.99997;stroke-linecap:round;stroke-dasharray:none"
+       d="M 9.1435549,63.768554 32,40.796309 h 16.290517"
+       id="path6" />
     <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path3061"
-       d="M 40.599427,54.421192 34.803871,52.868278 50.204445,7.8977836 56,9.450698 Z"
-       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:none;stroke:#3465a4;stroke-width:3.99997;stroke-linecap:round;stroke-dasharray:none"
+       d="m 58.290487,30.686844 -9.999726,9.999916 9.999726,9.999916"
+       id="path7" />
     <path
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0"
-       id="path3063"
-       d="M 37.073312,52.126013 51.798712,9.675315"
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+       d="M 9.3644222,62.012639 30.999635,39.796771 h 16.290517"
+       id="path4" />
     <path
-       d="M 44.970374,5.822785 A 8.993818,8.9934077 0.02042283 1 1 58.632785,17.5224 8.993818,8.9934077 0.02042283 1 1 44.970374,5.822785 Z"
-       id="path4250-71"
-       style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 46.49299,7.133747 A 6.9999997,7.0000001 0 1 1 57.126578,16.240159 6.9999997,7.0000001 0 0 1 46.49299,7.133747 Z"
-       id="path4250-7-3"
-       style="fill:url(#linearGradient5088);fill-opacity:1.0;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 30.970374,45.82823 A 8.993818,8.9934077 0.02042283 1 1 44.632785,57.527845 8.993818,8.9934077 0.02042283 1 1 30.970374,45.82823 Z"
-       id="path4250-71-6"
-       style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 32.49299,47.139192 A 6.9999997,7.0000001 0 1 1 43.126578,56.245604 6.9999997,7.0000001 0 0 1 32.49299,47.139192 Z"
-       id="path4250-7-3-2"
-       style="fill:url(#linearGradient5064);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 14.970374,19.82823 A 8.993818,8.9934077 0.02042283 1 1 28.632785,31.527845 8.993818,8.9934077 0.02042283 1 1 14.970374,19.82823 Z"
-       id="path4250-71-8"
-       style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 16.49299,21.139192 A 6.9999997,7.0000001 0 1 1 27.126578,30.245604 6.9999997,7.0000001 0 0 1 16.49299,21.139192 Z"
-       id="path4250-7-3-8"
-       style="fill:url(#linearGradient5080);fill-opacity:1.0;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 4.964639,45.82823 A 8.993818,8.9934077 0.02042283 1 1 18.62705,57.527845 8.993818,8.9934077 0.02042283 1 1 4.964639,45.82823 Z"
-       id="path4250-71-1"
-       style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       d="M 6.487255,47.139192 A 6.9999997,7.0000001 0 1 1 17.120843,56.245604 6.9999997,7.0000001 0 0 1 6.487255,47.139192 Z"
-       id="path4250-7-3-5"
-       style="fill:url(#linearGradient5072);fill-opacity:1.0;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none"
+       d="m 57.290202,29.686856 -9.999726,9.999916 9.999726,9.999916"
+       id="path5" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Line2Points.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Line2Points.svg
index 12e2203d47..2649951754 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Line2Points.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Line2Points.svg
@@ -2,47 +2,51 @@
 <!-- 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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="64"
    height="64"
    id="svg3085"
-   sodipodi:docname="TechDraw_Line2Points.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1358"
-     inkscape:window-height="703"
-     id="namedview983"
-     showgrid="true"
-     inkscape:zoom="7.375"
-     inkscape:cx="11.254237"
-     inkscape:cy="32"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3085"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid985" />
-  </sodipodi:namedview>
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs3087">
+    <linearGradient
+       id="linearGradient2">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop1" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop6" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="1"
+         id="stop7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="1"
+         id="stop5" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3836-0">
       <stop
@@ -54,20 +58,6 @@
          offset="1"
          style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect3066"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="single_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="0"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
     <linearGradient
        id="linearGradient7597">
       <stop
@@ -118,35 +108,50 @@
        id="linearGradient3801-1"
        xlink:href="#linearGradient3836-0" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5062"
-       id="linearGradient145"
-       gradientUnits="userSpaceOnUse"
-       x1="43.818283"
-       y1="11.684036"
-       x2="59.806271"
-       y2="11.684036" />
+       xlink:href="#linearGradient4"
+       id="linearGradient5"
+       x1="4.0513154"
+       y1="55.463016"
+       x2="19.698685"
+       y2="55.463016"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5062">
+       xlink:href="#linearGradient6"
+       id="linearGradient7"
+       x1="47.656659"
+       y1="11.761779"
+       x2="63.302326"
+       y2="11.761779"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient2"
+       id="linearGradient47"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         style="stop-color:#888a85;stop-opacity:1"
          offset="0"
-         id="stop5058" />
+         id="stop3838-8-5" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         style="stop-color:#babdb6;stop-opacity:1"
          offset="1"
-         id="stop5060" />
+         id="stop3840-1-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5062"
-       id="linearGradient679"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient1"
        gradientUnits="userSpaceOnUse"
-       x1="43.818283"
-       y1="11.684036"
-       x2="59.806271"
-       y2="11.684036" />
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <metadata
      id="metadata3090">
@@ -156,59 +161,50 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <text
-     x="13.788582"
-     y="46.145554"
-     id="text3130"
-     xml:space="preserve"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28200001;marker:none;enable-background:accumulate"><tspan
-       x="13.788582"
-       y="46.145554"
-       id="tspan3132" /></text>
   <g
-     transform="translate(9.1695506e-8,0.06779684)"
-     id="g615">
-    <path
-       id="path3061"
-       d="M 15.90812,53.334522 11.665479,49.091882 54.09188,6.6654781 58.33452,10.908118 Z"
-       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path3063"
-       d="M 14.002005,49.583782 54.58379,9.0019981"
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+     id="layer3"
+     style="display:inline"
+     transform="translate(0.25)">
     <g
-       id="g135"
-       transform="matrix(0.70757421,-0.70721112,0.70757421,0.70721112,7.1551096,40.176276)">
+       id="layer1"
+       transform="translate(-3.2499999,2.0000121)">
       <path
-         d="M 44.970374,5.822785 A 8.993818,8.9934077 0.02042283 1 1 58.632785,17.5224 8.993818,8.9934077 0.02042283 1 1 44.970374,5.822785 Z"
-         id="path131"
-         style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="fill:#3465a4;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 15.908118,53.33451 11.665477,49.091871 54.091883,6.6654658 58.334523,10.908105 Z"
+         id="path3061" />
       <path
-         d="M 46.49299,7.133747 A 6.9999997,7.0000001 0 1 1 57.126578,16.240159 6.9999997,7.0000001 0 0 1 46.49299,7.133747 Z"
-         id="path133"
-         style="fill:url(#linearGradient679);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 14.002003,49.583771 54.583793,9.0019854"
+         id="path3063" />
     </g>
     <g
-       id="g135-5"
-       transform="matrix(0.70757421,-0.70721112,0.70757421,0.70721112,-32.980484,80.447462)">
+       transform="matrix(0.77869459,0,0,0.77869445,69.798355,1.0976485)"
+       id="g47"
+       style="display:inline;stroke-width:1.2842">
       <path
-         d="M 44.970374,5.822785 A 8.993818,8.9934077 0.02042283 1 1 58.632785,17.5224 8.993818,8.9934077 0.02042283 1 1 44.970374,5.822785 Z"
-         id="path131-6"
-         style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path46"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
       <path
-         d="M 46.49299,7.133747 A 6.9999997,7.0000001 0 1 1 57.126578,16.240159 6.9999997,7.0000001 0 0 1 46.49299,7.133747 Z"
-         id="path133-2"
-         style="fill:url(#linearGradient145);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
+         style="fill:url(#linearGradient1);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path47"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
+    </g>
+    <g
+       transform="matrix(0.77869459,0,0,0.77869445,24.798173,46.097607)"
+       id="g49"
+       style="stroke-width:1.2842">
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path48"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient47);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path49"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Midpoints.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Midpoints.svg
index 5cbfba6bc5..244c10b87d 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Midpoints.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Midpoints.svg
@@ -2,72 +2,52 @@
 <!-- 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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="64"
    height="64"
    id="svg3085"
-   sodipodi:docname="techdraw-midpoint.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1358"
-     inkscape:window-height="703"
-     id="namedview983"
-     showgrid="true"
-     inkscape:zoom="4"
-     inkscape:cx="2.140625"
-     inkscape:cy="15"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3085"
-     inkscape:snap-global="false"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid985"
-       empspacing="2" />
-    <sodipodi:guide
-       position="30.30631,52.366005"
-       orientation="0,1"
-       id="guide1038"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="30.100144,12.369922"
-       orientation="0,1"
-       id="guide1040"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="51.953674,37.934428"
-       orientation="1,0"
-       id="guide1042"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="11.957592,68.240738"
-       orientation="1,0"
-       id="guide1044"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs3087">
     <linearGradient
-       inkscape:collect="always"
+       id="linearGradient24">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop23" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop24" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop14" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop15" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="0"
+         id="stop9" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="1"
+         id="stop10" />
+    </linearGradient>
+    <linearGradient
        id="linearGradient5062">
       <stop
          style="stop-color:#729fcf;stop-opacity:1"
@@ -89,20 +69,6 @@
          offset="1"
          style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect3066"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="single_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="0"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
     <linearGradient
        id="linearGradient7597">
       <stop
@@ -145,7 +111,6 @@
          id="stop3840-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5062"
        id="linearGradient5064"
        x1="33.055637"
@@ -154,7 +119,6 @@
        y2="57.417107"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5062"
        id="linearGradient5072"
        x1="3.8125484"
@@ -163,7 +127,6 @@
        y2="51.68948"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5062"
        id="linearGradient5080"
        x1="13.818283"
@@ -172,7 +135,6 @@
        y2="25.689482"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5062"
        id="linearGradient5088"
        x1="43.818283"
@@ -180,6 +142,53 @@
        x2="59.806271"
        y2="11.684036"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient9"
+       id="linearGradient10"
+       x1="30.313029"
+       y1="51.672932"
+       x2="45.290518"
+       y2="51.672932"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0000093,0,0,1,23.726546,23.727119)" />
+    <linearGradient
+       xlink:href="#linearGradient24"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       xlink:href="#linearGradient15"
+       id="linearGradient16"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <metadata
      id="metadata3090">
@@ -189,102 +198,92 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <text
-     x="13.788582"
-     y="46.145554"
-     id="text3130"
-     xml:space="preserve"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28200001;marker:none;enable-background:accumulate"><tspan
-       x="13.788582"
-       y="46.145554"
-       id="tspan3132" /></text>
   <g
-     id="g1769">
-    <path
-       inkscape:connector-curvature="0"
-       id="path1058"
-       d="M 8,6 56,6.4533587 V 56 H 8 Z"
-       style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.43847871;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.31934762;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 16,14.850112 32,0.311106 v 34 H 16 Z"
-       id="path1065"
-       inkscape:connector-curvature="0" />
-    <rect
-       y="7.9072881"
-       x="10.324164"
-       height="45.934795"
-       width="43.934795"
-       id="rect1893"
-       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.06520438;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+     id="layer3"
+     style="display:inline"
+     transform="translate(0.25)">
     <g
-       transform="matrix(0.8,0,0,0.8,34.389942,11.45757)"
-       id="g982">
+       id="layer1"
+       transform="translate(-3.2499999,2.0000121)">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-71-8"
-         d="M 14.970374,19.82823 A 8.993818,8.9934077 0.02042283 1 1 28.632785,31.527845 8.993818,8.9934077 0.02042283 1 1 14.970374,19.82823 Z" />
+         style="fill:#babdb6;stroke:#555753;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 15.908118,53.33451 11.665477,49.091871 54.091883,6.6654658 58.334523,10.908105 Z"
+         id="path3061" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient5080);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-7-3-8"
-         d="M 16.49299,21.139192 A 6.9999997,7.0000001 0 1 1 27.126578,30.245604 6.9999997,7.0000001 0 0 1 16.49299,21.139192 Z" />
+         style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 14.002003,49.583771 54.583793,9.0019854"
+         id="path3063" />
     </g>
     <g
-       transform="matrix(0.8,0,0,0.8,22.563325,-30.744336)"
-       id="g986">
+       transform="matrix(0.77869459,0,0,0.77869445,69.798355,1.0976485)"
+       id="g47"
+       style="display:inline;stroke-width:1.2842">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-71-1"
-         d="M 4.964639,45.82823 A 8.993818,8.9934077 0.02042283 1 1 18.62705,57.527845 8.993818,8.9934077 0.02042283 1 1 4.964639,45.82823 Z" />
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path46"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient5072);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-7-3-5"
-         d="M 6.487255,47.139192 A 6.9999997,7.0000001 0 1 1 17.120843,56.245604 6.9999997,7.0000001 0 0 1 6.487255,47.139192 Z" />
+         style="fill:url(#linearGradient2);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path47"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
     </g>
     <g
-       transform="matrix(0.8,0,0,0.8,2.3662411,6.520154)"
-       id="g1063">
-      <g
-         id="g994"
-         transform="translate(-39.970374,20.177215)">
-        <path
-           d="M 44.970374,5.822785 A 8.993818,8.9934077 0.02042283 1 1 58.632785,17.5224 8.993818,8.9934077 0.02042283 1 1 44.970374,5.822785 Z"
-           id="path4250-71"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-        <path
-           d="M 46.49299,7.133747 A 6.9999997,7.0000001 0 1 1 57.126578,16.240159 6.9999997,7.0000001 0 0 1 46.49299,7.133747 Z"
-           id="path4250-7-3"
-           style="fill:url(#linearGradient5088);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-      </g>
+       transform="matrix(0.77869459,0,0,0.77869445,24.798173,46.097607)"
+       id="g49"
+       style="stroke-width:1.2842">
+      <path
+         style="fill:#d3d7cf;stroke:#555753;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path48"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient1);fill-opacity:1;stroke:#d3d7cf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path49"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
     </g>
     <g
-       transform="matrix(0.8,0,0,0.8,1.7587364,10.543703)"
-       id="g990">
+       transform="matrix(0.77869459,0,0,0.77869445,47.298173,23.597648)"
+       id="g14"
+       style="stroke-width:1.2842">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-71-6"
-         d="M 30.970374,45.82823 A 8.993818,8.9934077 0.02042283 1 1 44.632785,57.527845 8.993818,8.9934077 0.02042283 1 1 30.970374,45.82823 Z" />
+         style="fill:#729fcf;stroke:#0b1521;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path9"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient5064);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-7-3-2"
-         d="M 32.49299,47.139192 A 6.9999997,7.0000001 0 1 1 43.126578,56.245604 6.9999997,7.0000001 0 0 1 32.49299,47.139192 Z" />
+         style="fill:url(#linearGradient16);fill-opacity:1;stroke:#729fcf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path14"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
+    </g>
+  </g>
+  <g
+     id="g23"
+     style="display:inline"
+     transform="matrix(-1,0,0,1,65.328427,4.792872)">
+    <g
+       id="g20"
+       transform="rotate(45,11.307586,-8.9350165)">
+      <path
+         style="fill:#3465a4;stroke:#a40000;stroke-width:2;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+         d="m 34.999999,14 h 7.999999"
+         id="path19" />
+      <path
+         style="fill:#3465a4;stroke:#a40000;stroke-width:2;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+         d="m 34.999999,11 h 7.999999"
+         id="path20" />
+    </g>
+    <g
+       id="g22"
+       transform="rotate(45,-2.8345494,25.207119)">
+      <path
+         style="fill:#3465a4;stroke:#a40000;stroke-width:2;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+         d="m 34.999999,14 h 7.999999"
+         id="path21" />
+      <path
+         style="fill:#3465a4;stroke:#a40000;stroke-width:2;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+         d="m 34.999999,11 h 7.999999"
+         id="path22" />
     </g>
-    <path
-       inkscape:connector-curvature="0"
-       id="path1067"
-       d="M 16,16 H 48 V 48 H 16 Z"
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Quadrants.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Quadrants.svg
index 3b982c7910..022e7a42da 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Quadrants.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Quadrants.svg
@@ -2,294 +2,361 @@
 <!-- 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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="64"
    height="64"
-   id="svg3085"
-   sodipodi:docname="TechDraw_Quadrants.svg"
-   inkscape:version="0.92.4 (unknown)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1358"
-     inkscape:window-height="703"
-     id="namedview983"
-     showgrid="true"
-     inkscape:zoom="2.8394757"
-     inkscape:cx="-30.446358"
-     inkscape:cy="39.774609"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3085"
-     inkscape:snap-global="false"
-     showguides="false"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid985"
-       empspacing="2" />
-    <sodipodi:guide
-       position="30.30631,52.366005"
-       orientation="0,1"
-       id="guide1038"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="30.100144,12.369922"
-       orientation="0,1"
-       id="guide1040"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="51.953674,37.934428"
-       orientation="1,0"
-       id="guide1042"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="11.957592,68.240738"
-       orientation="1,0"
-       id="guide1044"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
+   id="svg4024"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs3087">
+     id="defs4026">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5062">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="0"
-         id="stop5058" />
+       id="linearGradient27">
       <stop
          style="stop-color:#204a87;stop-opacity:1"
-         offset="1"
-         id="stop5060" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3836-0">
-      <stop
-         id="stop5008"
          offset="0"
-         style="stop-color:#c4a000;stop-opacity:1;" />
+         id="stop26" />
       <stop
-         id="stop5010"
+         style="stop-color:#3465a4;stop-opacity:1"
          offset="1"
-         style="stop-color:#fce94f;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect3066"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="single_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="0"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <linearGradient
-       id="linearGradient7597">
-      <stop
-         id="stop7599"
-         style="stop-color:#000003;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop7601"
-         style="stop-color:#000003;stop-opacity:0"
-         offset="1" />
+         id="stop27" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3893">
+       id="linearGradient25">
       <stop
-         id="stop3895"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop24" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop25" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient23">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop22" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop23" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient21">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop20" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop21" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient19">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop18" />
       <stop
-         id="stop3897"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="15.71482"
-       y1="22.299377"
-       x2="34.136208"
-       y2="22.299377"
-       id="linearGradient7603"
-       xlink:href="#linearGradient7597"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3836-0-3">
-      <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
-         offset="0"
-         id="stop3838-2" />
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
          offset="1"
-         id="stop3840-5" />
+         id="stop19" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5062"
-       id="linearGradient5064"
-       x1="33.055637"
-       y1="43.596096"
-       x2="42.195377"
-       y2="57.417107"
+       xlink:href="#linearGradient9"
+       id="linearGradient31"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0000093,0,0,1,23.726548,-3.7463924)"
+       x1="9.4127188"
+       y1="55.025951"
+       x2="19.168379"
+       y2="54.948158" />
+    <linearGradient
+       id="linearGradient9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="0"
+         id="stop9" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="1"
+         id="stop10" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient9"
+       id="linearGradient24"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0000093,0,0,1,-3.7466004,23.727119)"
+       x1="35.303169"
+       y1="27.988083"
+       x2="45.294155"
+       y2="27.540279" />
+    <linearGradient
+       xlink:href="#linearGradient9"
+       id="linearGradient30"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0000093,0,0,1,51.199696,23.727118)"
+       x1="-17.144234"
+       y1="28.042284"
+       x2="-7.1670914"
+       y2="28.373131" />
+    <linearGradient
+       xlink:href="#linearGradient34"
+       id="linearGradient29"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0000085,0,0,1,23.726551,51.20063)"
+       x1="9.5944586"
+       y1="0.84526229"
+       x2="18.108517"
+       y2="0.77515554" />
+    <linearGradient
+       id="linearGradient34">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop33" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop34" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient19"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5062"
-       id="linearGradient5072"
-       x1="3.8125484"
-       y1="51.68948"
-       x2="19.800535"
-       y2="51.68948"
+       id="linearGradient4">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop4" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5062"
-       id="linearGradient5080"
-       x1="13.818283"
-       y1="25.689482"
-       x2="29.806271"
-       y2="25.689482"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient6"
+       id="linearGradient3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5062"
-       id="linearGradient5088"
-       x1="43.818283"
-       y1="11.684036"
-       x2="59.806271"
-       y2="11.684036"
-       gradientUnits="userSpaceOnUse" />
+       id="linearGradient6">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop5" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop6" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient21"
+       id="linearGradient1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       xlink:href="#linearGradient23"
+       id="linearGradient5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       xlink:href="#linearGradient25"
+       id="linearGradient7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       xlink:href="#linearGradient27"
+       id="linearGradient8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82607043,0,0,0.82533448,-4.0098079,1.346708)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <metadata
-     id="metadata3090">
+     id="metadata4029">
     <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 />
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <text
-     x="13.788582"
-     y="46.145554"
-     id="text3130"
-     xml:space="preserve"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10px;line-height:125%;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:0px;word-spacing:0px;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.28200001;marker:none;enable-background:accumulate"><tspan
-       x="13.788582"
-       y="46.145554"
-       id="tspan3132" /></text>
   <g
-     id="g3438">
-    <ellipse
-       ry="22.000866"
-       rx="22.000868"
-       cy="32"
-       cx="32"
-       id="path1917"
-       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <circle
-       r="18.709618"
-       cy="32"
-       cx="32"
-       id="path1921"
-       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:2.58076358;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       ry="17.082438"
-       rx="17.082436"
-       cy="32"
-       cx="32"
-       id="path1923"
-       style="opacity:1;vector-effect:none;fill:#eeeeec;fill-opacity:1;stroke:#d3d7cf;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       ry="14.994234"
-       rx="15.060382"
-       cy="32"
-       cx="32"
-       id="path1925"
-       style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+     id="layer3"
+     style="display:inline"
+     transform="translate(0.24999998)">
     <g
-       transform="matrix(0.8,0,0,0.8,34.558736,11.590457)"
-       id="g982">
+       id="g4428-3"
+       transform="matrix(0.1460346,0,0,0.1460346,-218.3517,-56.297513)">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-71-8"
-         d="M 14.970374,19.82823 A 8.993818,8.9934077 0.02042283 1 1 28.632785,31.527845 8.993818,8.9934077 0.02042283 1 1 14.970374,19.82823 Z" />
+         style="fill:none;stroke:#555753;stroke-width:8.27355;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient5080);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-7-3-8"
-         d="M 16.49299,21.139192 A 6.9999997,7.0000001 0 1 1 27.126578,30.245604 6.9999997,7.0000001 0 0 1 16.49299,21.139192 Z" />
+         style="fill:none;stroke:#babdb6;stroke-width:4.13677;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+      <path
+         style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2-4-1"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+      <path
+         style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3044-2-4"
+         d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+         transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
     </g>
     <g
-       transform="matrix(0.8,0,0,0.8,22.73212,-29.361449)"
-       id="g986">
+       transform="matrix(0.77869459,0,0,0.77869445,69.798173,23.597648)"
+       id="g14"
+       style="stroke-width:1.2842">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-71-1"
-         d="M 4.964639,45.82823 A 8.993818,8.9934077 0.02042283 1 1 18.62705,57.527845 8.993818,8.9934077 0.02042283 1 1 4.964639,45.82823 Z" />
+         style="fill:#729fcf;stroke:#0b1521;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path13"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient5072);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-7-3-5"
-         d="M 6.487255,47.139192 A 6.9999997,7.0000001 0 1 1 17.120843,56.245604 6.9999997,7.0000001 0 0 1 6.487255,47.139192 Z" />
+         style="fill:url(#linearGradient1);fill-opacity:1;stroke:#729fcf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path14"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
     </g>
     <g
-       transform="matrix(0.8,0,0,0.8,2.5350356,6.6530409)"
-       id="g1063">
+       transform="matrix(0.77869459,0,0,0.77869445,24.798173,23.597648)"
+       id="g3"
+       style="stroke-width:1.2842">
+      <path
+         style="fill:#729fcf;stroke:#0b1521;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path2"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient5);fill-opacity:1;stroke:#729fcf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path3"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
+    </g>
+    <g
+       transform="matrix(0.77869459,0,0,0.77869445,47.298173,1.0976485)"
+       id="g6"
+       style="stroke-width:1.2842">
+      <path
+         style="fill:#729fcf;stroke:#0b1521;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path5"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient7);fill-opacity:1;stroke:#729fcf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path6"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
+    </g>
+    <g
+       transform="matrix(0.77869459,0,0,0.77869445,47.298173,46.097648)"
+       id="g8"
+       style="stroke-width:1.2842">
+      <path
+         style="fill:#729fcf;stroke:#0b1521;stroke-width:2.56841;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path7"
+         d="M -26.310778,5.3580033 A 8.3519646,8.3515832 0.02039876 1 1 -13.623399,16.222662 8.3519646,8.3515832 0.02039876 1 1 -26.310778,5.3580033 Z" />
+      <path
+         style="fill:url(#linearGradient8);fill-opacity:1;stroke:#729fcf;stroke-width:2.56842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path8"
+         d="m -24.358888,7.0362241 a 5.782493,5.7773415 0 1 1 8.784093,7.5158349 5.782493,5.7773415 0 0 1 -8.784093,-7.5158349 z" />
+    </g>
+    <g
+       id="g18"
+       transform="translate(-0.24999998)">
       <g
-         id="g994"
-         transform="translate(-39.970374,20.177215)">
+         id="g35"
+         transform="matrix(0.70709613,0.70710678,-0.70709613,0.70710678,22.261815,-13.415797)"
+         style="display:inline;stroke-width:1.00001">
         <path
-           d="M 44.970374,5.822785 A 8.993818,8.9934077 0.02042283 1 1 58.632785,17.5224 8.993818,8.9934077 0.02042283 1 1 44.970374,5.822785 Z"
-           id="path4250-71"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
+           style="fill:#3465a4;stroke:#a40000;stroke-width:2.00002;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+           d="m 34.999999,14 h 7.999999"
+           id="path34" />
         <path
-           d="M 46.49299,7.133747 A 6.9999997,7.0000001 0 1 1 57.126578,16.240159 6.9999997,7.0000001 0 0 1 46.49299,7.133747 Z"
-           id="path4250-7-3"
-           style="fill:url(#linearGradient5088);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
+           style="fill:#3465a4;stroke:#a40000;stroke-width:2.00002;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+           d="m 34.999999,11 h 7.999999"
+           id="path35" />
+      </g>
+      <g
+         id="g37"
+         transform="matrix(0.70709613,-0.70710678,-0.70709613,-0.70710678,22.261816,77.416199)"
+         style="display:inline;stroke-width:1.00001">
+        <path
+           style="fill:#3465a4;stroke:#a40000;stroke-width:2.00002;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+           d="m 34.999999,14 h 7.999999"
+           id="path36" />
+        <path
+           style="fill:#3465a4;stroke:#a40000;stroke-width:2.00002;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+           d="m 34.999999,11 h 7.999999"
+           id="path37" />
+      </g>
+      <g
+         id="g39"
+         transform="matrix(-0.70709613,-0.70710678,0.70709613,-0.70710678,41.738178,77.416198)"
+         style="display:inline;stroke-width:1.00001">
+        <path
+           style="fill:#3465a4;stroke:#a40000;stroke-width:2.00002;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+           d="m 34.999999,14 h 7.999999"
+           id="path38" />
+        <path
+           style="fill:#3465a4;stroke:#a40000;stroke-width:2.00002;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+           d="m 34.999999,11 h 7.999999"
+           id="path39" />
+      </g>
+      <g
+         id="g41"
+         transform="matrix(-0.70709613,0.70710678,0.70709613,0.70710678,41.738179,-13.415797)"
+         style="display:inline;stroke-width:1.00001">
+        <path
+           style="fill:#3465a4;stroke:#a40000;stroke-width:2.00002;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+           d="m 34.999999,14 h 7.999999"
+           id="path40" />
+        <path
+           style="fill:#3465a4;stroke:#a40000;stroke-width:2.00002;stroke-linejoin:round;stroke-dasharray:none;paint-order:stroke markers fill"
+           d="m 34.999999,11 h 7.999999"
+           id="path41" />
       </g>
-    </g>
-    <g
-       transform="matrix(0.8,0,0,0.8,1.9275309,10.67659)"
-       id="g990">
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-71-6"
-         d="M 30.970374,45.82823 A 8.993818,8.9934077 0.02042283 1 1 44.632785,57.527845 8.993818,8.9934077 0.02042283 1 1 30.970374,45.82823 Z" />
-      <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient5064);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="path4250-7-3-2"
-         d="M 32.49299,47.139192 A 6.9999997,7.0000001 0 1 1 43.126578,56.245604 6.9999997,7.0000001 0 0 1 32.49299,47.139192 Z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_RedrawPage.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_RedrawPage.svg
index 851f98d309..6891395f2b 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_RedrawPage.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_RedrawPage.svg
@@ -1,532 +1,171 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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:xlink="http://www.w3.org/1999/xlink"
+   version="1.1"
    width="64"
    height="64"
-   id="svg11300"
-   version="1.1">
-  <title
-     id="title930">TechDraw_RedrawPage</title>
+   id="svg4024"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   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="defs3">
+     id="defs4026">
     <linearGradient
-       id="linearGradient4272">
+       id="linearGradient5">
       <stop
-         style="stop-color:#8ae234;stop-opacity:1;"
+         style="stop-color:#204a87;stop-opacity:1;"
          offset="0"
-         id="stop4274" />
-      <stop
-         style="stop-color:#8ae234;stop-opacity:0;"
-         offset="1"
-         id="stop4276" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4262">
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1;"
-         offset="0"
-         id="stop4264" />
-      <stop
-         id="stop4270"
-         offset="0.43075874"
-         style="stop-color:#4e9a06;stop-opacity:0.49803922;" />
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:0;"
-         offset="1"
-         id="stop4266" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3063">
-      <stop
-         id="stop3065"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop3067"
-         offset="1"
-         style="stop-color:#204a87;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2690">
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:1;"
-         offset="0"
-         id="stop2692" />
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:0;"
-         offset="1"
-         id="stop2694" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2682">
-      <stop
-         style="stop-color:#3977c3;stop-opacity:1;"
-         offset="0"
-         id="stop2684" />
-      <stop
-         style="stop-color:#89aedc;stop-opacity:0;"
-         offset="1"
-         id="stop2686" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2402">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop2404" />
-      <stop
-         style="stop-color:#528ac5;stop-opacity:1;"
-         offset="1"
-         id="stop2406" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2380">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="0"
-         id="stop2382" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop2384" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2871">
+         id="stop5" />
       <stop
          style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2873" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
          offset="1"
-         id="stop2875" />
+         id="stop6" />
     </linearGradient>
     <linearGradient
-       id="linearGradient2831">
+       id="linearGradient3">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="0"
+         id="stop3" />
       <stop
          style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833" />
-      <stop
-         id="stop2855"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
          offset="1"
-         id="stop2835" />
+         id="stop4" />
     </linearGradient>
     <linearGradient
-       id="linearGradient2797">
+       xlink:href="#linearGradient3866"
+       id="linearGradient3771"
+       x1="98"
+       y1="1047.3622"
+       x2="81"
+       y2="993.36218"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-1,-1,0,1052.3622,124.00001)" />
+    <linearGradient
+       id="linearGradient3866">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#d3d7cf;stop-opacity:1"
          offset="0"
-         id="stop2799" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2801" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient2797"
-       id="linearGradient1491"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649177"
-       y1="26.048164"
-       x2="52.854095"
-       y2="26.048164" />
-    <linearGradient
-       xlink:href="#linearGradient2797"
-       id="linearGradient1493"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649177"
-       y1="26.048164"
-       x2="52.854095"
-       y2="26.048164" />
-    <linearGradient
-       xlink:href="#linearGradient2871"
-       id="linearGradient1501"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       xlink:href="#linearGradient3063"
-       id="linearGradient2386"
-       x1="42.703487"
-       y1="20.547306"
-       x2="26.605606"
-       y2="33.634254"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       xlink:href="#linearGradient2402"
-       id="linearGradient2408"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588623"
-       y2="26.649363"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       xlink:href="#linearGradient2682"
-       id="linearGradient2688"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.370336,0,0,1.3589114,-0.33380651,-16.948724)" />
-    <linearGradient
-       xlink:href="#linearGradient2690"
-       id="linearGradient2696"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.370336,0,0,1.3589114,-0.33380651,-16.948724)" />
-    <linearGradient
-       xlink:href="#linearGradient2871"
-       id="linearGradient3036"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       xlink:href="#linearGradient2402"
-       id="linearGradient3038"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588623"
-       y2="26.649363" />
-    <linearGradient
-       xlink:href="#linearGradient2871"
-       id="linearGradient3040"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       xlink:href="#linearGradient2831-7"
-       id="linearGradient1486-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.370336,0,0,1.3589114,0.30396568,-17.325948)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       id="linearGradient2831-7">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833-4" />
-      <stop
-         id="stop2855-0"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835-9" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient2847-8"
-       id="linearGradient1488-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.370336,0,0,-1.3589114,64.7954,45.353844)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       id="linearGradient2847-8">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2849-8" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop2851-2" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient2380-5"
-       id="linearGradient2386-4"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2380-5">
-      <stop
-         style="stop-color:#b9cfe7;stop-opacity:1"
-         offset="0"
-         id="stop2382-5" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop2384-1" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient2380-5"
-       id="linearGradient3034-7"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       id="linearGradient3895">
-      <stop
-         style="stop-color:#b9cfe7;stop-opacity:1"
-         offset="0"
-         id="stop3897" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop3899" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient2797-1"
-       id="linearGradient3861-1"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649177"
-       y1="26.048164"
-       x2="52.854095"
-       y2="26.048164" />
-    <linearGradient
-       id="linearGradient2797-1">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2799-5" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2801-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2831-2">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833-3" />
-      <stop
-         id="stop2855-1"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3063-2">
-      <stop
-         id="stop3065-6"
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1" />
-      <stop
-         id="stop3067-0"
-         offset="1"
-         style="stop-color:#204a87;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2380-9">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="0"
-         id="stop2382-4" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop2384-6" />
-    </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient4272"
-       id="linearGradient4306"
-       gradientUnits="userSpaceOnUse"
-       x1="60.093285"
-       y1="26.518738"
-       x2="60.368435"
-       y2="18.118267"
-       gradientTransform="matrix(-0.57654091,-0.61963683,0.61963683,-0.57654091,38.266148,42.812335)" />
-    <linearGradient
-       xlink:href="#linearGradient4262"
-       id="linearGradient4308"
-       gradientUnits="userSpaceOnUse"
-       x1="43.341869"
-       y1="23.586662"
-       x2="49.500511"
-       y2="20.050343"
-       gradientTransform="matrix(-0.57654091,-0.61963683,0.61963683,-0.57654091,38.266148,42.812335)" />
-    <linearGradient
-       xlink:href="#linearGradient3775"
-       id="linearGradient3781"
-       x1="10"
-       y1="39.999996"
-       x2="53"
-       y2="25.999996"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2484102,0,0,0.9960275,-55.906842,0.0478745)" />
-    <linearGradient
-       id="linearGradient3775">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
-         offset="0"
-         id="stop3777" />
+         id="stop3868" />
       <stop
          style="stop-color:#ffffff;stop-opacity:1"
          offset="1"
-         id="stop3779" />
+         id="stop3870" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(-0.57654091,-0.61963683,0.61963683,-0.57654091,90.477469,61.98592)"
-       y2="18.118267"
-       x2="60.368435"
-       y1="26.518738"
-       x1="60.093285"
+       gradientTransform="translate(-48)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4306-2"
-       xlink:href="#linearGradient4272" />
+       y2="25.999996"
+       x2="53"
+       y1="39.999996"
+       x1="10"
+       id="linearGradient3781-7"
+       xlink:href="#linearGradient3866" />
     <linearGradient
-       gradientTransform="matrix(-0.57654091,-0.61963683,0.61963683,-0.57654091,90.477469,61.98592)"
-       y2="20.050343"
-       x2="49.500511"
-       y1="23.586662"
-       x1="43.341869"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4308-2"
-       xlink:href="#linearGradient4262" />
+       xlink:href="#linearGradient3"
+       id="linearGradient4"
+       x1="12.029247"
+       y1="19.514435"
+       x2="51.078056"
+       y2="30.621258"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       xlink:href="#linearGradient5"
+       id="linearGradient6"
+       x1="10.044393"
+       y1="19.221226"
+       x2="47.955627"
+       y2="27.740904"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <metadata
-     id="metadata4">
+     id="metadata4029">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>[bitacovir]</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source></dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
-        <dc:title>TechDraw_RedrawPage</dc:title>
-        <dc:subject>
-          <rdf:Bag />
-        </dc:subject>
-        <dc:date>02-04-2021</dc:date>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>FreeCAD LGPL2+</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>FreeCAD</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
      transform="translate(0,16)"
+     id="layer2-5"
      style="display:inline">
     <rect
        transform="rotate(-90)"
-       y="3.0359571"
-       x="-44.671146"
-       height="57.7696"
-       width="57.426865"
-       id="rect2987"
-       style="fill:#eeeeec;fill-opacity:1;stroke:#555753;stroke-width:2.2302;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       ry="6.745532" />
+       y="3"
+       x="-38.999996"
+       height="58.000004"
+       width="45.999996"
+       id="rect2987-5"
+       style="display:inline;fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <rect
-       ry="4.7776251"
-       style="display:inline;fill:#d3d7cf;fill-opacity:1;stroke:#ffffff;stroke-width:2.05866;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2987-0"
-       width="53.009724"
-       height="53.326099"
-       x="-42.477673"
-       y="5.3086758"
-       transform="rotate(-90)" />
+       transform="rotate(-90)"
+       y="5"
+       x="-36.999996"
+       height="54.000004"
+       width="41.999996"
+       id="rect2987-1-6"
+       style="display:inline;fill:url(#linearGradient3781-7);fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+    <rect
+       y="-3"
+       x="7"
+       height="38"
+       width="50"
+       id="rect3894-5"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#555753;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <rect
+       y="23"
+       x="33"
+       height="12.000004"
+       width="23.999994"
+       id="rect4664-7"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#555753;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
     <path
-       id="path4666"
-       d="m 40.150485,33.988082 15.337556,0.04316 v 0"
-       style="fill:none;stroke:#555753;stroke-width:2.2302;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="path4666-3"
+       d="m 37,27 h 15.398794 v 0"
+       style="display:inline;fill:none;stroke:#555753;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       id="path4666-7"
-       d="m 40.136433,38.981703 15.580329,0.04384 v 0"
-       style="fill:none;stroke:#555753;stroke-width:2.2302;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       style="fill:none;stroke:#555753;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 60.558491,28.981132 H 34.596226 v 15.335849"
-       id="path1172" />
+       id="path4666-7-4"
+       d="m 37,31 h 15.642526 v 0"
+       style="display:inline;fill:none;stroke:#555753;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+  <g
+     id="layer1"
+     transform="matrix(0.89501864,0,0,0.9013528,3.4668197,17.616441)"
+     style="display:inline;stroke-width:1.11336">
     <g
        id="g1170"
-       transform="rotate(180,57.811382,25.502701)">
-      <path
-         id="path4298-5"
-         d="m 90.068006,19.946036 c 0,0 -6.534844,-8.078595 -13.203526,2.482874 l -6.073545,-6.527537 c 0,0 10.394152,-8.8791281 19.277071,4.044663 z"
-         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient4306-2);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4308-2);stroke-width:1.69275;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+       transform="rotate(180,57.811382,25.502701)"
+       style="stroke-width:1.11336">
       <path
          id="path4300-5"
          d="M 70.635141,16.312073 C 82.3885,-0.43914709 102.57363,10.215511 104.61129,33.981706 l 8.18527,-0.05259 -14.501586,13.34136 -11.807768,-12.716404 c 0,0 8.648608,-0.157628 8.648608,-0.157628 C 93.405169,17.959137 81.3339,6.0767929 70.635144,16.31207 Z"
-         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
-      <g
-         id="g4302-3"
-         transform="matrix(-0.03999158,-0.76842115,-0.76765118,0.03360048,113.77303,49.969917)"
-         style="display:inline;fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:0.732809;stroke-opacity:1">
-        <path
-           id="path4304-9"
-           d="M 52.368857,42.344789 C 57.336994,33.465615 49.176003,12.601866 19.05552,12.672851 L 18.677956,5.6633463 7.4378077,19.282655 19.129354,29.167094 18.807724,20.554957 c 18.244937,0.381972 33.804002,9.457851 33.561133,21.789832 z"
-           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:2.20149;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
-      </g>
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.22673;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
+      <path
+         id="path4304-9"
+         d="M 52.368857,42.344789 C 57.336994,33.465615 49.176003,12.601866 19.05552,12.672851 L 18.677956,5.6633463 7.4378077,19.282655 19.129354,29.167094 18.807724,20.554957 c 18.244937,0.381972 33.804002,9.457851 33.561133,21.789832 z"
+         style="display:block;stroke-width:2.45105;fill:url(#linearGradient4);fill-opacity:1;stroke:#729fcf;stroke-opacity:1;color:#000000;overflow:visible;visibility:visible;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;marker:none"
+         transform="matrix(-0.03999158,-0.76842116,-0.76765119,0.03360048,113.77303,49.969917)" />
     </g>
     <g
-       id="g1178">
+       id="g1178"
+       style="stroke-width:1.11336">
       <path
-         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient4306);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient4308);stroke-width:1.69275;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-         d="m 37.856685,0.77245112 c 0,0 -6.534844,-8.07859422 -13.203526,2.48287458 l -6.073545,-6.5275374 c 0,0 10.394152,-8.8791283 19.277071,4.04466282 z"
-         id="path4298" />
-      <path
-         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#8ae234;fill-opacity:1;fill-rule:nonzero;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+         style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.22673;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
          d="M 18.42382,-2.8615117 C 30.177179,-19.612732 50.362307,-8.958074 52.399971,14.808121 l 8.185264,-0.05259 -14.501582,13.34136 -11.807768,-12.716404 c 0,0 8.648608,-0.157628 8.648608,-0.157628 C 41.193848,-1.2144478 29.122579,-13.096792 18.423823,-2.8615143 Z"
          id="path4300" />
-      <g
-         style="fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:0.732809;stroke-opacity:1"
-         transform="matrix(-0.03999158,-0.76842115,-0.76765118,0.03360048,61.561706,30.796332)"
-         id="g4302">
-        <path
-           style="color:#000000;display:block;overflow:visible;visibility:visible;fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:2.20149;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-           d="M 52.368857,42.344789 C 57.336994,33.465615 49.176003,12.601866 19.05552,12.672851 L 18.677956,5.6633463 7.4378077,19.282655 19.129354,29.167094 18.807724,20.554957 c 18.244937,0.381972 33.804002,9.457851 33.561133,21.789832 z"
-           id="path4304" />
-      </g>
+      <path
+         style="display:block;stroke-width:2.45105;fill:url(#linearGradient6);fill-opacity:1;stroke:#729fcf;stroke-opacity:1;color:#000000;overflow:visible;visibility:visible;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:21;stroke-dasharray:none;stroke-dashoffset:0;marker:none"
+         d="M 52.368857,42.344789 C 57.336994,33.465615 49.176003,12.601866 19.05552,12.672851 L 18.677956,5.6633463 7.4378077,19.282655 19.129354,29.167094 18.807724,20.554957 c 18.244937,0.381972 33.804002,9.457851 33.561133,21.789832 z"
+         id="path4304"
+         transform="matrix(-0.03999158,-0.76842116,-0.76765119,0.03360048,61.561706,30.796332)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_RichTextAnnotation.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_RichTextAnnotation.svg
index f5d0b87b14..9104cf8f4b 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_RichTextAnnotation.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_RichTextAnnotation.svg
@@ -12,26 +12,45 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs3020">
+    <linearGradient
+       id="linearGradient2">
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1;"
+         offset="0"
+         id="stop2" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="1"
+         id="stop3" />
+    </linearGradient>
     <linearGradient
        xlink:href="#linearGradient5062"
        id="linearGradient5080"
-       x1="13.818283"
-       y1="25.689482"
-       x2="29.806271"
-       y2="25.689482"
+       x1="14.414937"
+       y1="20.554096"
+       x2="30.792814"
+       y2="19.888475"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.77869191,0,0,0.77866734,35.023217,29.005203)" />
+       gradientTransform="matrix(0.60576378,0,0,0.60574383,38.793298,37.335146)" />
     <linearGradient
        id="linearGradient5062">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         style="stop-color:#babdb6;stop-opacity:1"
          offset="0"
          id="stop5058" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         style="stop-color:#888a85;stop-opacity:1"
          offset="1"
          id="stop5060" />
     </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient2"
+       id="linearGradient3"
+       x1="162.38681"
+       y1="191.20714"
+       x2="159.90944"
+       y2="144.59547"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <metadata
      id="metadata3023">
@@ -73,37 +92,47 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer2">
-    <path
-       id="path4775"
-       d="m 162.9126,191.19577 10.3923,-6 4.02628,-15.02628 3.66025,-13.66026 -14,-24.24871 -22.51666,13 14,24.24871 13.66026,3.66026 -2.56218,9.56218 -8.66025,5"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#f6efd1;fill-opacity:1;fill-rule:nonzero;stroke:#353535;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       transform="rotate(-60,-19.885003,211.41896)" />
-    <path
-       id="path3854"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#2d2d2d;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 162.19721,141.95668 8.5,14.72243 m -15.42821,-10.72243 8.5,14.72243"
-       transform="rotate(-60,-19.885003,211.41896)" />
-    <ellipse
-       ry="1.5000056"
-       rx="1.5132792"
-       style="display:inline;overflow:visible;visibility:visible;fill:#302b00;fill-opacity:1;fill-rule:evenodd;stroke:#242421;stroke-width:2.99999;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3859"
-       transform="matrix(0.87082765,0.49158843,-0.48894475,0.87231475,-193.03669,88.488562)"
-       cx="166.90031"
-       cy="-169.13" />
-    <path
-       id="path3757"
-       style="fill:none;stroke:#cacaca;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
-       d="m 147.20508,145.99023 c 4.19466,7.26693 8.38932,14.53386 12.58398,21.80079 4.02214,1.07747 8.04427,2.15494 12.06641,3.23242 1.2526,-0.72331 2.50521,-1.44662 3.75781,-2.16992 1.07682,-4.02149 2.15365,-8.04297 3.23047,-12.06446 -4.19401,-7.26627 -8.38802,-14.53255 -12.58203,-21.79883 -6.35221,3.66667 -12.70443,7.33334 -19.05664,11 z"
-       transform="rotate(-60,-19.885003,211.41896)" />
-    <path
-       style="fill:none;stroke:#2e2900;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4250-71-8"
-       d="M 46.680526,44.444799 A 7.0034133,7.0028728 0.01309763 1 1 57.319335,53.554907 7.0034133,7.0028728 0.01309763 1 1 46.680526,44.444799 Z" />
-    <path
-       style="fill:url(#linearGradient5080);fill-opacity:1;stroke:#729fcf;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4250-7-3-8"
-       d="m 47.866175,45.465602 a 5.4508431,5.4506715 0 1 1 8.280289,7.090865 5.4508431,5.4506715 0 0 1 -8.280289,-7.090865 z" />
+     id="layer2"
+     transform="translate(0,-1.000001)">
+    <g
+       id="g2"
+       transform="translate(-1.9999935)">
+      <path
+         id="path4775"
+         d="m 162.17188,193.93282 13.86507,-8.005 1.29423,-15.75833 3.66025,-13.66026 -14,-24.24871 -22.51666,13 14,24.24871 13.66026,3.66026 0.16987,10.29422 -12.12424,6.99994"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient3);fill-opacity:1;fill-rule:nonzero;stroke:#555753;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         transform="rotate(-60,-19.885003,211.41896)" />
+      <path
+         id="path3854"
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#0b1521;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 162.19721,141.95668 8.5,14.72243 m -15.42821,-10.72243 8.5,14.72243"
+         transform="rotate(-60,-19.885003,211.41896)" />
+      <ellipse
+         ry="1.5000056"
+         rx="1.5132792"
+         style="display:inline;overflow:visible;visibility:visible;fill:#302b00;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.99999;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="path3859"
+         transform="matrix(0.87082765,0.49158843,-0.48894475,0.87231475,-193.03669,88.488562)"
+         cx="166.90031"
+         cy="-169.13" />
+      <path
+         id="path3757"
+         style="display:inline;fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+         d="m 147.20508,145.99023 c 4.19466,7.26693 8.38932,14.53386 12.58398,21.80079 4.02214,1.07747 8.04427,2.15494 12.06641,3.23242 1.2526,-0.72331 2.50521,-1.44662 3.75781,-2.16992 1.07682,-4.02149 2.15365,-8.04297 3.23047,-12.06446 -4.19401,-7.26627 -8.38802,-14.53255 -12.58203,-21.79883 -6.35221,3.66667 -12.70443,7.33334 -19.05664,11 z"
+         transform="rotate(-60,-19.885003,211.41896)" />
+    </g>
+    <g
+       id="g1"
+       transform="matrix(1.2854712,0,0,1.285473,-14.844451,-17.988121)"
+       style="stroke-width:0.777924">
+      <path
+         style="fill:none;stroke:#555753;stroke-width:1.55584;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4250-71-8"
+         d="M 46.680526,44.444799 A 7.0034133,7.0028728 0.01309763 1 1 57.319335,53.554907 7.0034133,7.0028728 0.01309763 1 1 46.680526,44.444799 Z" />
+      <path
+         style="fill:url(#linearGradient5080);fill-opacity:1;stroke:#d3d7cf;stroke-width:1.55584;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4250-7-3-8"
+         d="m 47.866175,45.465602 a 5.4508431,5.4506715 0 1 1 8.280289,7.090865 5.4508431,5.4506715 0 0 1 -8.280289,-7.090865 z" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg
index d860331449..26575bd587 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_Symbol.svg
@@ -6,10 +6,6 @@
    width="64"
    height="64"
    id="svg2160"
-   inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)"
-   sodipodi:docname="TechDraw_Symbol.svg"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:svg="http://www.w3.org/2000/svg"
@@ -24,13 +20,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>TechDraw_Symbol</dc:title>
         <dc:date>2016-01-14</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -53,60 +47,20 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     id="namedview6"
-     showgrid="true"
-     inkscape:zoom="14.827146"
-     inkscape:cx="36.385964"
-     inkscape:cy="34.632424"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2160"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:showpageshadow="2"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="0"
-       originy="0"
-       spacingy="1"
-       spacingx="1"
-       units="px" />
-  </sodipodi:namedview>
   <defs
      id="defs2162">
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3900">
+       id="linearGradient2">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         style="stop-color:#204a87;stop-opacity:1;"
          offset="0"
-         id="stop3902" />
+         id="stop2" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         style="stop-color:#3465a4;stop-opacity:1;"
          offset="1"
-         id="stop3904" />
+         id="stop3" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3775">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1;"
@@ -118,7 +72,6 @@
          id="stop3779" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3775"
        id="linearGradient3781"
        x1="10"
@@ -128,7 +81,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-64,3.8146973e-6)" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3806"
        id="linearGradient3012"
        gradientUnits="userSpaceOnUse"
@@ -149,7 +101,6 @@
          style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3895"
        id="linearGradient3036"
        gradientUnits="userSpaceOnUse"
@@ -178,10 +129,8 @@
        gradientTransform="matrix(1.2166851,1.0433407,-0.52714011,0.61472119,-73.012055,-80.803852)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient3270-0-1"
-       xlink:href="#linearGradient3253-6-5"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3253-6-5" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3253-6"
        id="radialGradient3337"
        gradientUnits="userSpaceOnUse"
@@ -211,10 +160,8 @@
        gradientTransform="matrix(0.9781457,0.0053484,-0.00460223,0.8416912,-69.025653,-0.11788499)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient3293"
-       xlink:href="#linearGradient3253"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3253" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3393"
        id="linearGradient3270"
        gradientUnits="userSpaceOnUse"
@@ -242,8 +189,7 @@
        y1="1726.0585"
        x1="1669.7314"
        id="linearGradient3399"
-       xlink:href="#linearGradient3393"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3393" />
     <radialGradient
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
@@ -253,15 +199,7 @@
        cy="51.929391"
        cx="33.369828"
        id="radialGradient6822"
-       xlink:href="#linearGradient6816"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective6256"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 32 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       xlink:href="#linearGradient6816" />
     <linearGradient
        id="linearGradient6781">
       <stop
@@ -274,8 +212,7 @@
          style="stop-color:#3465a4;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       id="linearGradient6816"
-       inkscape:collect="always">
+       id="linearGradient6816">
       <stop
          id="stop6818"
          offset="0"
@@ -294,8 +231,7 @@
        gradientTransform="matrix(0.9781457,0.0053484,-0.00460223,0.8416912,-69.025653,-0.11788499)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient3270"
-       xlink:href="#linearGradient3253"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3253" />
     <linearGradient
        id="linearGradient3253">
       <stop
@@ -319,7 +255,6 @@
          id="stop3810" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3775-6"
        id="linearGradient3781-3"
        x1="10"
@@ -329,7 +264,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="translate(-64,3.7403954e-6)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3775-6">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1;"
@@ -341,13 +275,12 @@
          id="stop3779-5" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3900"
-       id="linearGradient3906"
-       x1="22"
-       y1="33"
-       x2="15"
-       y2="19"
+       xlink:href="#linearGradient2"
+       id="linearGradient3"
+       x1="12"
+       y1="27.000001"
+       x2="30"
+       y2="27.000001"
        gradientUnits="userSpaceOnUse" />
   </defs>
   <rect
@@ -383,156 +316,41 @@
   <path
      style="fill:none;stroke:#555753;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
      d="m 37,43 15.398794,0 0,0"
-     id="path4666"
-     inkscape:connector-curvature="0" />
+     id="path4666" />
   <path
      style="display:inline;fill:none;stroke:#555753;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      d="m 37,47 h 15.642526 v 0"
-     id="path4666-7"
-     inkscape:connector-curvature="0" />
-  <circle
-     style="display:none;fill:url(#linearGradient3906);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.6;stroke-opacity:1"
-     id="path3112"
-     cx="20"
-     cy="26"
-     r="10" />
-  <circle
-     transform="matrix(0.8,0,0,0.8,4,5.2)"
-     style="display:none;fill:none;fill-opacity:1;stroke:#fce94f;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.6;stroke-opacity:1"
-     id="path3112-3"
-     cx="20"
-     cy="26"
-     r="10" />
+     id="path4666-7" />
   <g
-     inkscape:label="Layer 1"
      id="layer1"
      transform="matrix(0,-0.42543722,0.42543722,0,5.2149434,62.276312)"
      style="display:inline" />
   <g
      id="g2"
-     inkscape:label="front"
      transform="matrix(1.2222222,0,0,1.5714285,1.8614946,-26.244705)"
      style="display:inline">
     <path
-       id="rect5"
-       style="font-variation-settings:normal;display:inline;opacity:1;vector-effect:none;fill:url(#linearGradient3906);fill-opacity:1;stroke:none;stroke-width:1.44314;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.432941;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
-       d="m 6.6587773,26.882995 v 12.727274 h 6.5454547 v 0.636363 h 9.818182 v -5.727273 h -6.545455 v -7.636364 z" />
-    <g
-       id="g3"
-       inkscape:label="highlight"
-       style="display:inline">
-      <rect
-         style="display:inline;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.62816;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-         id="rect11"
-         width="9"
-         height="1.2727274"
-         x="7.4769592"
-         y="28.155724" />
-      <rect
-         style="display:inline;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70056;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-         id="rect10"
-         width="9.818182"
-         height="1.2727274"
-         x="13.204232"
-         y="34.51936" />
-      <rect
-         style="display:inline;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.30257;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-         id="rect9"
-         width="18"
-         height="1.2727274"
-         x="6.6587772"
-         y="38.33754" />
-      <rect
-         style="display:inline;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.62816;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-         id="rect8"
-         width="1.6363636"
-         height="14"
-         x="8.2951412"
-         y="26.882996" />
-      <rect
-         style="display:inline;fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70056;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-         id="rect7"
-         width="1.6363636"
-         height="7.636364"
-         x="13.204232"
-         y="26.882996"
-         rx="0" />
-      <rect
-         style="fill:#fce94f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.62816;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-         id="rect1"
-         width="1.6363636"
-         height="7"
-         x="21.386051"
-         y="33.246632"
-         rx="0" />
-    </g>
-    <rect
-       style="fill:#302b00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.62816;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-       id="rect2"
-       width="9"
-       height="1.2727274"
-       x="7.4769592"
-       y="26.882996" />
-    <rect
-       style="fill:#302b00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.62816;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-       id="rect2-2"
-       width="9"
-       height="1.2727274"
-       x="14.840596"
-       y="33.246632" />
-    <rect
-       style="fill:#302b00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.30257;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-       id="rect2-8"
-       width="18"
-       height="1.2727274"
-       x="6.6587772"
-       y="39.610268" />
-    <rect
-       style="fill:#302b00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.62816;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-       id="rect3"
-       width="1.6363636"
-       height="14"
-       x="6.6587772"
-       y="26.882996" />
-    <rect
-       style="fill:#302b00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.62816;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-       id="rect4"
-       width="1.6363636"
-       height="7.0000005"
-       x="14.840596"
-       y="26.882996"
-       rx="0" />
-    <rect
-       style="fill:#302b00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.62816;stroke-dasharray:none;stroke-dashoffset:1;stroke-opacity:1"
-       id="rect4-3"
-       width="1.6363636"
-       height="7"
-       x="23.022413"
-       y="33.246632"
-       rx="0" />
+       style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:square"
+       d="M 31,37 V 27 H 21 V 17 H 11 v 20 z"
+       id="path1"
+       transform="matrix(0.81818183,0,0,0.63636367,-1.5230411,16.701177)" />
+    <path
+       style="fill:url(#linearGradient3);stroke:#729fcf;stroke-width:2;stroke-linecap:square"
+       d="m 13,19 h 6 v 10 h 10 v 6 H 13 Z"
+       id="path2"
+       transform="matrix(0.81818183,0,0,0.63636367,-1.5230411,16.701177)" />
   </g>
   <g
      id="g1"
-     inkscape:label="arrow"
-     transform="matrix(0,-0.42543722,0.42543722,0,5.2149434,62.276312)"
+     transform="matrix(0.42543722,0,0,0.42543722,5.7237122,33.214968)"
      style="display:inline">
     <path
-       inkscape:export-ydpi="4.1683898"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       sodipodi:nodetypes="cccccccc"
        id="path3343"
        d="M 35.907323,8.8968626 V 23.000001 H 3 l 10e-8,23.505231 H 35.907323 V 60.60837 L 64.1136,34.752616 Z"
-       style="display:inline;fill:url(#linearGradient3012);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:4.70105;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="display:inline;fill:url(#linearGradient3012);fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:4.70105;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       inkscape:export-ydpi="4.1683898"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       sodipodi:nodetypes="cccccccc"
        id="path3343-2"
        d="m 40.608369,19.248595 v 8.452452 H 7.7010462 V 41.804185 H 40.608369 v 8.06651 L 57.062031,34.752616 Z"
-       style="display:inline;fill:none;stroke:#8ae234;stroke-width:4.70105;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:connector-curvature="0" />
+       style="display:inline;fill:none;stroke:#8ae234;stroke-width:4.70105;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
 </svg>