diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_3PtAngleDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_3PtAngleDimension.svg
index cc3c49eac6..5103e13543 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_3PtAngleDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_3PtAngleDimension.svg
@@ -2,30 +2,20 @@
 <!-- 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"
    width="64px"
    height="64px"
    id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.3 (unknown)"
-   sodipodi:docname="TechDraw_Dimension_Angle3Pt.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
+   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="defs5823">
     <linearGradient
-       id="linearGradient3036"
-       inkscape:collect="always">
+       id="linearGradient3036">
       <stop
          id="stop3038"
          offset="0"
@@ -36,31 +26,6 @@
          style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3024"
-       inkscape:collect="always">
-      <stop
-         id="stop3026"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3028"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3905">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop3907" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop3909" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -83,7 +48,6 @@
          id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3377"
        id="linearGradient3383"
        x1="901.1875"
@@ -92,15 +56,7 @@
        y2="1190.875"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6349"
        id="radialGradient6355"
        cx="1103.6399"
@@ -111,7 +67,6 @@
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3893"
        id="linearGradient3899"
        x1="35"
@@ -120,7 +75,6 @@
        y2="16"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -132,26 +86,6 @@
          id="stop3897" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3024"
-       id="linearGradient3033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="rotate(-15.814554,94.318805,-165.39495)"
-       x1="34.093586"
-       y1="49.729877"
-       x2="33.891697"
-       y2="16.103697" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3905"
-       id="linearGradient3911"
-       x1="8.5"
-       y1="48.5"
-       x2="5.5"
-       y2="39.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3036"
        id="linearGradient3919"
        x1="9"
@@ -160,16 +94,6 @@
        y2="38"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3905"
-       id="linearGradient1033"
-       gradientUnits="userSpaceOnUse"
-       x1="8.5"
-       y1="48.5"
-       x2="5.5"
-       y2="39.5" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3036"
        id="linearGradient1035"
        gradientUnits="userSpaceOnUse"
@@ -178,16 +102,6 @@
        x2="5"
        y2="38" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3905"
-       id="linearGradient1037"
-       gradientUnits="userSpaceOnUse"
-       x1="8.5"
-       y1="48.5"
-       x2="5.5"
-       y2="39.5" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3036"
        id="linearGradient1039"
        gradientUnits="userSpaceOnUse"
@@ -195,13 +109,6 @@
        y1="50"
        x2="5"
        y2="38" />
-    <inkscape:perspective
-       id="perspective5829-0"
-       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" />
     <radialGradient
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
@@ -211,8 +118,7 @@
        cy="1424.4465"
        cx="1103.6399"
        id="radialGradient6355-9"
-       xlink:href="#linearGradient6349"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient6349" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
        y2="9"
@@ -221,50 +127,16 @@
        x1="19"
        id="linearGradient3927"
        xlink:href="#linearGradient3036"
-       inkscape:collect="always"
        gradientTransform="translate(-104,-70)" />
     <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="40"
-       x2="22"
-       y1="53"
-       x1="26"
-       id="linearGradient3949"
        xlink:href="#linearGradient3036"
-       inkscape:collect="always"
-       gradientTransform="translate(-52,-35)" />
+       id="linearGradient1035-6"
+       gradientUnits="userSpaceOnUse"
+       x1="9"
+       y1="50"
+       x2="5"
+       y2="38" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.1640625"
-     inkscape:cx="20.369975"
-     inkscape:cy="42.62064"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="716"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2993"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -273,13 +145,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>TechDraw_Dimension_Angle</dc:title>
         <dc:date>2016-04-27</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -305,164 +175,106 @@
   </metadata>
   <g
      id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     transform="matrix(0.95985006,0,0,0.89564568,3.0487634,3.4784032)">
     <g
-       id="g1271">
-      <g
-         style="opacity:0.5"
-         transform="translate(50.675539,33.702155)"
-         id="g1245">
-        <path
-           style="fill:none;stroke:#302b00;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M -43,9 -3.040157,23.114211"
-           id="path3039-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc"
-           inkscape:transform-center-x="-19.979921"
-           inkscape:transform-center-y="7.0571055" />
-        <path
-           style="fill:none;stroke:#302b00;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="m -43,9 24.465679,-34.60391"
-           id="path3039-7-4"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc"
-           inkscape:transform-center-x="-12.23284"
-           inkscape:transform-center-y="-17.301955" />
-        <path
-           style="fill:none;stroke:url(#linearGradient3949);stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M -43,9 -3.040157,23.114211"
-           id="path3039-7-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc"
-           inkscape:transform-center-x="-19.979921"
-           inkscape:transform-center-y="7.0571055" />
-        <path
-           style="fill:url(#linearGradient3927);fill-opacity:1;stroke:url(#linearGradient3927);stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="m -43,9 24.465679,-34.60391"
-           id="path3039-7-4-9"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc"
-           inkscape:transform-center-x="-12.23284"
-           inkscape:transform-center-y="-17.301955" />
-        <path
-           style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M -43,8 -2.512907,22.276442"
-           id="path3039-7-0-4"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc"
-           inkscape:transform-center-x="-19.979921"
-           inkscape:transform-center-y="7.0571055" />
-        <path
-           style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="m -42,6 22.741893,-32.286786"
-           id="path3039-7-4-9-8"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc"
-           inkscape:transform-center-x="-12.23284"
-           inkscape:transform-center-y="-17.301955" />
-      </g>
-      <g
-         transform="translate(0,-0.57357204)"
-         id="g1019">
-        <circle
-           r="6"
-           cy="44"
-           cx="7"
-           style="fill:url(#linearGradient3911);fill-opacity:1;stroke:#302b00;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path3037"
-           transform="matrix(1.3333333,0,0,1.3333331,1.6666669,-14.666655)" />
-        <circle
-           r="6"
-           cy="44"
-           cx="7"
-           style="fill:url(#linearGradient3919);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path3037-8"
-           transform="translate(4)" />
-      </g>
-      <g
-         transform="translate(35.225475,8.9083601)"
-         id="g1025">
-        <circle
-           r="6"
-           cy="44"
-           cx="7"
-           transform="matrix(1.3333333,0,0,1.3333331,1.6666669,-14.666655)"
-           id="path1021"
-           style="fill:url(#linearGradient1037);fill-opacity:1;stroke:#302b00;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-        <circle
-           r="6"
-           cy="44"
-           cx="7"
-           transform="translate(4)"
-           id="path1023"
-           style="fill:url(#linearGradient1039);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      </g>
-      <g
-         transform="translate(18.354306,-33.267178)"
-         id="g1031">
-        <circle
-           r="6"
-           cy="44"
-           cx="7"
-           style="fill:url(#linearGradient1033);fill-opacity:1;stroke:#302b00;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path1027"
-           transform="matrix(1.3333333,0,0,1.3333331,1.6666669,-14.666655)" />
-        <circle
-           r="6"
-           cy="44"
-           cx="7"
-           style="fill:url(#linearGradient1035);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path1029"
-           transform="translate(4)" />
-      </g>
-      <g
-         style="stroke:#302b00"
-         transform="matrix(1.0698613,0,0,0.99404165,-50.600755,-11.067264)"
-         id="g3024">
-        <path
-           inkscape:connector-curvature="0"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3033);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:1.9393847;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate"
-           d="m 84.507061,34.690068 2.04692,-3.436585 C 92,34 97,43 91.825155,50.852457 l -3.607584,-1.727811 c 1.409829,4.001548 1.917761,7.571141 1.955751,9.806886 l 0.03799,2.235745 1.765803,-1.371839 c 1.765802,-1.371838 4.865454,-3.213621 8.866995,-4.62345 L 97.236531,53.444176 C 105,46 98,30 89.624358,26.098604 l 2.046919,-3.436586 c -4.112628,1.042249 -7.713527,1.225354 -9.94355,1.061041 l -2.230023,-0.164314 1.206563,1.882607 c 1.206564,1.882605 2.760544,5.136088 3.802794,9.248716 z"
-           id="path3770-1"
-           sodipodi:nodetypes="ccccccccccccccc" />
-        <path
-           style="fill:none;stroke:#fce94f;stroke-width:1.9393847;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 82.42256,26.464811 3.10796,6.506965"
-           id="path3864"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#fce94f;stroke-width:1.9393847;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 91.228661,56.049545 90.744642,50.322929"
-           id="path3864-4"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#fce94f;stroke-width:1.9393847;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 82.121673,26.608365 C 100,35 97.513308,48 91.936325,53.148856"
-           id="path3866"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#fce94f;stroke-width:1.9393847;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 86.55398,31.253483 85,28"
-           id="path3868"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#fce94f;stroke-width:1.9393847;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 94.626431,49.541142 90.166916,58.93721"
-           id="path3868-8"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
-        <path
-           inkscape:connector-curvature="0"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#302b00;stroke-width:1.9393847;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate"
-           d="m 84.507061,34.690068 2.04692,-3.436585 C 92,34 97,43 91.825155,50.852457 l -3.607584,-1.727811 c 1.409829,4.001548 1.917761,7.571141 1.955751,9.806886 l 0.03799,2.235745 1.765803,-1.371839 c 1.765802,-1.371838 4.865454,-3.213621 8.866995,-4.62345 L 97.236531,53.444176 C 105,46 98,30 89.624358,26.098604 l 2.046919,-3.436586 c -4.112628,1.042249 -7.713527,1.225354 -9.94355,1.061041 l -2.230023,-0.164314 1.206563,1.882607 c 1.206564,1.882605 2.760544,5.136088 3.802794,9.248716 z"
-           id="path3770-9"
-           sodipodi:nodetypes="ccccccccccccccc" />
-      </g>
+       style="display:inline;opacity:1"
+       transform="translate(50.675539,33.702155)"
+       id="g1245">
+      <path
+         style="display:inline;fill:none;stroke:#babdb6;stroke-width:2.15705;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M -43,8 -2.512907,22.276442"
+         id="path3039-7-0-4" />
+      <path
+         style="display:inline;opacity:1;fill:none;stroke:#888a85;stroke-width:2.15705;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M -43.717323,10.034284 -3.2302303,24.310726"
+         id="path2" />
+      <path
+         style="display:inline;fill:none;stroke:#babdb6;stroke-width:2.15705;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="m -42,6 22.741893,-32.286786"
+         id="path3039-7-4-9-8" />
+      <path
+         style="display:inline;fill:none;stroke:#888a85;stroke-width:2.15705;stroke-linecap:round;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1"
+         d="M -40.236505,7.2421555 -17.494612,-25.04463"
+         id="path1" />
+    </g>
+    <g
+       transform="translate(0,-0.57357202)"
+       id="g1019">
+      <ellipse
+         cy="44.699944"
+         cx="11.409315"
+         style="fill:#fce94f;fill-opacity:1;stroke:#302b00;stroke-width:2.15688;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path3037"
+         rx="8.2980194"
+         ry="8.9701748" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient3919);fill-opacity:1;stroke:#fce94f;stroke-width:2.15705;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+         id="ellipse7"
+         d="m 11.410156,37.886719 c 3.283751,0 6.140625,2.970185 6.140625,6.8125 0,3.842314 -2.857506,6.814453 -6.140625,6.814453 -3.2831188,0 -6.1425779,-2.972723 -6.1425779,-6.814453 0,-3.84173 2.8588271,-6.8125 6.1425779,-6.8125 z" />
+    </g>
+    <g
+       transform="translate(35.225475,7.7918478)"
+       id="g1025">
+      <ellipse
+         cy="44.150116"
+         cx="10.56421"
+         id="path1021"
+         style="fill:#fce94f;fill-opacity:1;stroke:#302b00;stroke-width:2.15688;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         rx="8.2980194"
+         ry="8.9701748" />
+      <path
+         id="ellipse8"
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1039);fill-opacity:1;stroke:#fce94f;stroke-width:2.15705;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+         d="m 10.564453,37.335937 c 3.283119,0 6.140625,2.972139 6.140625,6.814454 0,3.842314 -2.857506,6.814453 -6.140625,6.814453 -3.2831189,0 -6.142578,-2.972723 -6.142578,-6.814453 0,-3.84173 2.8594591,-6.814454 6.142578,-6.814454 z" />
+    </g>
+    <g
+       transform="translate(18.354306,-33.267178)"
+       id="g1031"
+       style="display:inline">
+      <ellipse
+         cy="45.014675"
+         cx="10.766109"
+         style="fill:#fce94f;fill-opacity:1;stroke:#302b00;stroke-width:2.15688;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         id="path1027"
+         rx="8.2980194"
+         ry="8.9701748" />
+      <path
+         style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:url(#linearGradient1035);fill-opacity:1;stroke:#fce94f;stroke-width:2.15705;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1"
+         id="ellipse9"
+         d="m 10.765625,38.201172 c 3.283119,0 6.142578,2.972723 6.142578,6.814453 0,3.84173 -2.858827,6.8125 -6.142578,6.8125 -3.2837511,0 -6.140625,-2.970185 -6.140625,-6.8125 0,-3.842315 2.857506,-6.814453 6.140625,-6.814453 z" />
+    </g>
+    <g
+       id="g3024-7"
+       transform="matrix(1.1146129,0,0,1.1098604,-55.876482,-15.791192)"
+       style="stroke:#302b00">
+      <path
+         id="path3770-1-3"
+         d="m 84.507061,34.690068 2.04692,-3.436585 C 92,34 97,43 91.825155,50.852457 l -3.607584,-1.727811 1.993741,12.042631 10.632798,-5.995289 -3.607579,-1.727812 C 105,46 98,30 89.624358,26.098604 l 2.046919,-3.436586 -12.173573,0.896727 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:1.93938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate" />
+      <path
+         id="path3864"
+         d="m 82.42256,26.464811 3.10796,6.506965"
+         style="fill:none;stroke:#fce94f;stroke-width:1.93938;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3864-4"
+         d="M 91.042415,55.771462 90.021363,49.988551"
+         style="fill:none;stroke:#fce94f;stroke-width:3.87877;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path3866"
+         d="M 80.704267,25.441352 C 98.582594,33.832987 97.513308,48 91.936325,53.148856"
+         style="fill:none;stroke:#fce94f;stroke-width:1.93938;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3868"
+         d="M 86.55398,31.253483 85,28"
+         style="fill:none;stroke:#fce94f;stroke-width:1.93938;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3868-8"
+         d="M 94.57349,49.227829 90.166916,58.93721"
+         style="fill:none;stroke:#fce94f;stroke-width:1.93938;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         id="path3770-9"
+         d="m 84.507061,34.690068 2.04692,-3.436585 C 92,34 97,43 91.825155,50.852457 l -3.607584,-1.727811 1.993741,12.042631 10.632798,-5.995289 -3.607579,-1.727812 C 105,46 98,30 89.624358,26.098604 l 2.046919,-3.436586 -12.173573,0.896727 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#302b00;stroke-width:1.93938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_AngleDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_AngleDimension.svg
index cd23d81f99..0c05b901a2 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_AngleDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_AngleDimension.svg
@@ -2,101 +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"
    width="64px"
    height="64px"
    id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="TechDraw_Dimension_Angle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
+   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="defs5823">
     <linearGradient
-       id="linearGradient3042"
-       inkscape:collect="always">
-      <stop
-         id="stop3044"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3046"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3036"
-       inkscape:collect="always">
-      <stop
-         id="stop3038"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3040"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3030"
-       inkscape:collect="always">
-      <stop
-         id="stop3032"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3034"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3024"
-       inkscape:collect="always">
-      <stop
-         id="stop3026"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3028"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3929"
-       inkscape:collect="always">
-      <stop
-         id="stop3931"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3933"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3905">
-      <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
-         offset="0"
-         id="stop3907" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop3909" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -119,7 +37,6 @@
          id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3377"
        id="linearGradient3383"
        x1="901.1875"
@@ -128,15 +45,7 @@
        y2="1190.875"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6349"
        id="radialGradient6355"
        cx="1103.6399"
@@ -147,7 +56,6 @@
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3893"
        id="linearGradient3899"
        x1="35"
@@ -156,7 +64,6 @@
        y2="16"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -167,93 +74,7 @@
          offset="1"
          id="stop3897" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3024"
-       id="linearGradient3033"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9621488,-0.27252465,0.27252465,0.9621488,48.644281,19.443802)"
-       x1="34.093586"
-       y1="49.729877"
-       x2="33.891697"
-       y2="16.103697" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3905"
-       id="linearGradient3911"
-       x1="8.5"
-       y1="48.5"
-       x2="5.5"
-       y2="39.5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3036"
-       id="linearGradient3919"
-       x1="9"
-       y1="50"
-       x2="5"
-       y2="38"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3929"
-       id="linearGradient3927"
-       x1="19"
-       y1="39"
-       x2="28"
-       y2="9"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3042"
-       id="linearGradient3941"
-       x1="19"
-       y1="39"
-       x2="28"
-       y2="9"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3030"
-       id="linearGradient3949"
-       x1="26"
-       y1="53"
-       x2="22"
-       y2="40"
-       gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="20.694436"
-     inkscape:cy="23.152959"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2993"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -262,13 +83,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>TechDraw_Dimension_Angle</dc:title>
         <dc:date>2016-04-27</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -293,122 +112,72 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
        id="g3024"
        transform="matrix(1.0698613,0,0,0.99404165,-49.402756,-8.4391559)"
        style="stroke:#302b00">
       <path
-         sodipodi:nodetypes="ccccccccccccccc"
          id="path3770-1"
-         d="m 84.507061,34.690068 2.04692,-3.436585 C 92,34 97,43 91.825155,50.852457 l -3.607584,-1.727811 c 1.409829,4.001548 1.917761,7.571141 1.955751,9.806886 l 0.03799,2.235745 1.765803,-1.371839 c 1.765802,-1.371838 4.865454,-3.213621 8.866995,-4.62345 L 97.236531,53.444176 C 105,46 98,30 89.624358,26.098604 l 2.046919,-3.436586 c -4.112628,1.042249 -7.713527,1.225354 -9.94355,1.061041 l -2.230023,-0.164314 1.206563,1.882607 c 1.206564,1.882605 2.760544,5.136088 3.802794,9.248716 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3033);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:1.93938470000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-         inkscape:connector-curvature="0" />
+         d="m 84.507061,34.690068 2.04692,-3.436585 C 92,34 97,43 91.825155,50.852457 l -3.607584,-1.727811 1.993741,12.042631 10.632798,-5.995289 -3.607579,-1.727812 C 105,46 98,30 89.624358,26.098604 l 2.046919,-3.436586 -12.173573,0.896727 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:1.93938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path3864"
          d="m 82.42256,26.464811 3.10796,6.506965"
          style="fill:none;stroke:#fce94f;stroke-width:1.93938470000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path3864-4"
-         d="M 91.228661,56.049545 90.744642,50.322929"
-         style="fill:none;stroke:#fce94f;stroke-width:1.93938470000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="M 91.042415,55.771462 90.021363,49.988551"
+         style="fill:none;stroke:#fce94f;stroke-width:3.87877;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path3866"
-         d="M 82.121673,26.608365 C 100,35 97.513308,48 91.936325,53.148856"
-         style="fill:none;stroke:#fce94f;stroke-width:1.93938470000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+         d="M 80.704267,25.441352 C 98.582594,33.832987 97.513308,48 91.936325,53.148856"
+         style="fill:none;stroke:#fce94f;stroke-width:1.93938;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path3868"
          d="M 86.55398,31.253483 85,28"
          style="fill:none;stroke:#fce94f;stroke-width:1.93938470000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path3868-8"
-         d="M 94.626431,49.541142 90.166916,58.93721"
-         style="fill:none;stroke:#fce94f;stroke-width:1.93938470000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         d="M 94.57349,49.227829 90.166916,58.93721"
+         style="fill:none;stroke:#fce94f;stroke-width:1.93938;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccccccccccccc"
          id="path3770-9"
-         d="m 84.507061,34.690068 2.04692,-3.436585 C 92,34 97,43 91.825155,50.852457 l -3.607584,-1.727811 c 1.409829,4.001548 1.917761,7.571141 1.955751,9.806886 l 0.03799,2.235745 1.765803,-1.371839 c 1.765802,-1.371838 4.865454,-3.213621 8.866995,-4.62345 L 97.236531,53.444176 C 105,46 98,30 89.624358,26.098604 l 2.046919,-3.436586 c -4.112628,1.042249 -7.713527,1.225354 -9.94355,1.061041 l -2.230023,-0.164314 1.206563,1.882607 c 1.206564,1.882605 2.760544,5.136088 3.802794,9.248716 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:#302b00;stroke-width:1.93938470000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-         inkscape:connector-curvature="0" />
+         d="m 84.507061,34.690068 2.04692,-3.436585 C 92,34 97,43 91.825155,50.852457 l -3.607584,-1.727811 1.993741,12.042631 10.632798,-5.995289 -3.607579,-1.727812 C 105,46 98,30 89.624358,26.098604 l 2.046919,-3.436586 -12.173573,0.896727 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#302b00;stroke-width:1.93938;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate" />
     </g>
     <path
        style="fill:none;stroke:#302b00;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 9,44 48.959843,58.114211"
-       id="path3039-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:transform-center-x="-19.979921"
-       inkscape:transform-center-y="7.0571055" />
+       id="path3039-7" />
     <path
        style="fill:none;stroke:#302b00;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 9,44 33.465679,9.3960895"
-       id="path3039-7-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:transform-center-x="-12.23284"
-       inkscape:transform-center-y="-17.301955" />
+       id="path3039-7-4" />
     <path
-       sodipodi:type="arc"
-       style="fill:url(#linearGradient3911);fill-opacity:1;stroke:#302b00;stroke-width:1.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       style="fill:none;fill-opacity:1;stroke:#302b00;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="path3037"
-       sodipodi:cx="7"
-       sodipodi:cy="44"
-       sodipodi:rx="6"
-       sodipodi:ry="6"
        d="M 13,44 A 6,6 0 1 1 1,44 6,6 0 1 1 13,44 z"
        transform="matrix(1.3333333,0,0,1.3333331,1.6666669,-14.666655)" />
     <path
-       style="fill:none;stroke:url(#linearGradient3949);stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:none;stroke:#edd400;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 9,44 48.959843,58.114211"
-       id="path3039-7-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:transform-center-x="-19.979921"
-       inkscape:transform-center-y="7.0571055" />
+       id="path3039-7-0" />
     <path
-       style="fill:url(#linearGradient3927);stroke:url(#linearGradient3941);stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       style="display:inline;fill:none;fill-opacity:1;stroke:#edd400;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 9,44 33.465679,9.39609"
-       id="path3039-7-4-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:transform-center-x="-12.23284"
-       inkscape:transform-center-y="-17.301955" />
+       id="path3039-7-4-9" />
     <path
        style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 9,43 49.487093,57.276442"
-       id="path3039-7-0-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:transform-center-x="-19.979921"
-       inkscape:transform-center-y="7.0571055" />
+       id="path3039-7-0-4" />
     <path
        style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 10,41 32.741893,8.713214"
-       id="path3039-7-4-9-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc"
-       inkscape:transform-center-x="-12.23284"
-       inkscape:transform-center-y="-17.301955" />
+       id="path3039-7-4-9-8" />
     <path
-       sodipodi:type="arc"
-       style="fill:url(#linearGradient3919);stroke:#fce94f;stroke-width:1.99999964000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"
+       style="fill:#edd400;stroke:#fce94f;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;fill-opacity:1"
        id="path3037-8"
-       sodipodi:cx="7"
-       sodipodi:cy="44"
-       sodipodi:rx="6"
-       sodipodi:ry="6"
        d="M 13,44 A 6,6 0 1 1 1,44 6,6 0 1 1 13,44 z"
        transform="translate(4,0)" />
   </g>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Balloon.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Balloon.svg
index e7558c0c9c..5eb47f83d9 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Balloon.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Balloon.svg
@@ -2,30 +2,20 @@
 <!-- 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"
    width="64px"
    height="64px"
    id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="TechDraw_Balloon_Icon.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Drawing/TechDraw_dimensions/drawing_Dimension_Diameter_2_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   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="defs5823">
     <linearGradient
-       id="linearGradient3022"
-       inkscape:collect="always">
+       id="linearGradient3022">
       <stop
          id="stop3024"
          offset="0"
@@ -36,31 +26,6 @@
          style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3016"
-       inkscape:collect="always">
-      <stop
-         id="stop3018"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3020"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3010"
-       inkscape:collect="always">
-      <stop
-         id="stop3012"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3014"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -83,7 +48,6 @@
          id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3377"
        id="linearGradient3383"
        x1="901.1875"
@@ -92,15 +56,7 @@
        y2="1190.875"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6349"
        id="radialGradient6355"
        cx="1103.6399"
@@ -111,7 +67,6 @@
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3893"
        id="linearGradient3899"
        x1="35"
@@ -120,7 +75,6 @@
        y2="16"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -139,71 +93,8 @@
        x1="36.460075"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4113-4"
-       xlink:href="#linearGradient3022"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3022"
-       id="linearGradient1610-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="rotate(9.746785,-499.4865,-325.04813)"
-       x1="36.460075"
-       y1="33.776932"
-       x2="28.485424"
-       y2="35.589352" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3016"
-       id="linearGradient1720"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.58158934,0,0,0.58158934,22.516492,4.2490672)"
-       x1="21.200001"
-       y1="4.3999996"
-       x2="44"
-       y2="59.599998" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3010"
-       id="linearGradient1722"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.62811648,0,0,0.62811648,21.027624,2.7601984)"
-       x1="39.777779"
-       y1="63.111111"
-       x2="19.777779"
-       y2="3.1111112" />
+       xlink:href="#linearGradient3022" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="-10.962072"
-     inkscape:cy="22.600565"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1051"
-     inkscape:window-x="1791"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-grids="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3046"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -212,7 +103,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
@@ -249,68 +139,47 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
        id="g1775"
        transform="translate(47.896447,-76.465553)">
       <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
          id="path1581-6-4"
          d="m -22.474556,105.51886 -11.536363,-0.0608 -0.591777,3.71103"
-         style="fill:none;stroke:#c4a000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         style="fill:none;stroke:#edd400;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
          id="path1581-3"
          d="m -22.811192,103.51158 -12.050505,-0.0608 -0.608365,3.71103"
          style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccccccc"
          id="path3770-1-8-6"
-         d="m -37.21235,105.47469 -3.724473,21.68244 -3.942262,-0.67718 c 2.448814,3.46458 3.912063,6.75987 4.55904,8.90029 l 0.646977,2.14043 1.324151,-1.80184 c 1.324154,-1.80184 3.803168,-4.41994 7.267747,-6.86876 l -3.942262,-0.67717 3.724472,-21.68245"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1610-2);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         d="m -37.21235,105.47469 -3.724473,21.68244 -3.942262,-0.67718 5.206017,11.04072 8.591898,-8.6706 -3.942262,-0.67717 3.724472,-21.68245"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path3864-4-1-2"
          d="m -39.981457,133.40911 -2.926497,-6.59057"
          style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path3866-5-4"
          d="m -35.155567,105.34331 -5.164478,30.03693"
          style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path3868-8-7-2"
          d="m -40.936823,127.15713 1.463249,3.29529"
          style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccccccc"
          id="path3770-9-9-9"
-         d="m -37.21235,105.47469 -3.724473,21.68244 -3.942262,-0.67718 c 2.448814,3.46458 3.912063,6.75987 4.55904,8.90029 l 0.646977,2.14043 1.324151,-1.80184 c 1.324154,-1.80184 3.803168,-4.41994 7.267747,-6.86876 l -3.942262,-0.67717 3.724472,-21.68245"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate"
-         inkscape:connector-curvature="0" />
+         d="m -37.21235,105.47469 -3.724473,21.68244 -3.942262,-0.67718 5.206017,11.04072 8.591898,-8.6706 -3.942262,-0.67717 3.724472,-21.68245"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path1562-3"
          d="m -32.29896,107.49045 h 11.093818"
          style="fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path1562-9-7"
          d="m -32.29896,101.49045 h 9.769435"
          style="fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
          id="path1579-7"
          d="m -37.21235,105.47469 0.687713,-3.99141 4.225677,0.007"
          style="fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
@@ -323,34 +192,24 @@
            cx="41.127354"
            style="fill:none;stroke:#302b00;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path3048-6" />
-        <circle
-           r="18.145588"
-           cy="22.859926"
-           cx="41.127354"
-           style="fill:none;stroke:#d3d7cf;stroke-width:1.39581442;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="path3048-0-8" />
         <circle
            r="17.44768"
            cy="22.859926"
            cx="41.127354"
-           style="fill:none;stroke:url(#linearGradient1720);stroke-width:1.39581454;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="fill:none;stroke:#edd400;stroke-width:1.39581454;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path3048-7-9" />
         <circle
            r="18.843494"
            cy="22.859926"
            cx="41.127354"
-           style="fill:none;stroke:url(#linearGradient1722);stroke-width:1.39581454;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="fill:none;stroke:#fce94f;stroke-width:1.39581454;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path3048-7-4-7" />
       </g>
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path1741"
          d="m -26.671875,106.5 -0.52383,-2.01563 h -5.16367 L -32.3125,106.5 Z"
-         style="fill:#c4a000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#edd400;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
          id="path1741-8"
          d="m -27.195705,104.48437 -0.27383,-1.98438 -5.41367,-0.0156 -1.121099,1.97657 z"
          style="fill:#fce94f;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DiameterDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DiameterDimension.svg
index 12019ffd94..4fcc482a10 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DiameterDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DiameterDimension.svg
@@ -2,65 +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"
    width="64px"
    height="64px"
    id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="TechDraw_Dimension_Diameter.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Drawing/TechDraw_dimensions/drawing_Dimension_Diameter_2_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   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="defs5823">
     <linearGradient
-       id="linearGradient3022"
-       inkscape:collect="always">
-      <stop
-         id="stop3024"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3026"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3016"
-       inkscape:collect="always">
-      <stop
-         id="stop3018"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3020"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3010"
-       inkscape:collect="always">
-      <stop
-         id="stop3012"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3014"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -83,7 +37,6 @@
          id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3377"
        id="linearGradient3383"
        x1="901.1875"
@@ -92,15 +45,7 @@
        y2="1190.875"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6349"
        id="radialGradient6355"
        cx="1103.6399"
@@ -111,7 +56,6 @@
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3893"
        id="linearGradient3899"
        x1="35"
@@ -120,7 +64,6 @@
        y2="16"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -131,66 +74,7 @@
          offset="1"
          id="stop3897" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,1,-1,0,64,3.24e-6)"
-       y2="35.589352"
-       x2="28.485424"
-       y1="33.776932"
-       x1="36.460075"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4113"
-       xlink:href="#linearGradient3022"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3010"
-       id="linearGradient3886"
-       x1="39.777779"
-       y1="63.111111"
-       x2="19.777779"
-       y2="3.1111112"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3016"
-       id="linearGradient3894"
-       x1="21.200001"
-       y1="4.3999996"
-       x2="44"
-       y2="59.599998"
-       gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.7173008"
-     inkscape:cx="33.834987"
-     inkscape:cy="31.431975"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3046"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -199,7 +83,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
@@ -236,87 +119,48 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4113);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-       d="m 43,25.000003 0,4 -21.999999,0 0,-4 c -3,3 -6,5 -8,6 l -2,1 2,0.999997 c 2,1 5,3 8,6 l 0,-4 L 43,35 l 0,4 c 3,-3 6,-5 8,-6 l 2,-0.999997 -2,-1 c -2,-1 -5,-3 -8,-6 z"
-       id="path3770-1"
-       sodipodi:nodetypes="ccccccccccccccc" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate"
+       d="m 43,25.000003 v 4 H 21.000001 v -4 l -10,7 10,6.999997 V 35 H 43 v 4 l 10,-6.999997 z"
+       id="path3770-1" />
     <path
        style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 49,31.000003 -6,-4"
-       id="path3864"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path3864" />
     <path
        style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 15.000001,31.000003 6,-4"
-       id="path3864-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path3864-4" />
     <path
        style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="m 51,31.000003 -37.999999,0"
-       id="path3866"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path3866" />
     <path
        style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 43,29.000003 3,2"
-       id="path3868"
-       inkscape:connector-curvature="0" />
+       id="path3868" />
     <path
        style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 21.000001,29.000003 -3,2"
-       id="path3868-8"
-       inkscape:connector-curvature="0" />
+       id="path3868-8" />
     <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-       d="m 43,25.000003 0,4 -21.999999,0 0,-4 c -3,3 -6,5 -8,6 l -2,1 2,0.999997 c 2,1 5,3 8,6 l 0,-4 L 43,35 l 0,4 c 3,-3 6,-5 8,-6 l 2,-0.999997 -2,-1 c -2,-1 -5,-3 -8,-6 z"
-       id="path3770-9"
-       sodipodi:nodetypes="ccccccccccccccc" />
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate"
+       d="m 43,25.000003 v 4 H 21.000001 v -4 l -10,7 10,6.999997 V 35 H 43 v 4 l 10,-6.999997 z"
+       id="path3770-9" />
     <path
-       sodipodi:type="arc"
        style="fill:none;stroke:#302b00;stroke-width:9.23076915999999950;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="path3048"
-       sodipodi:cx="32"
-       sodipodi:cy="32"
-       sodipodi:rx="30"
-       sodipodi:ry="30"
        d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
        transform="matrix(0.86666667,0,0,0.86666667,4.2666666,4.2666666)" />
     <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#d3d7cf;stroke-width:2.30769228999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path3048-0"
-       sodipodi:cx="32"
-       sodipodi:cy="32"
-       sodipodi:rx="30"
-       sodipodi:ry="30"
-       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
-       transform="matrix(0.86666667,0,0,0.86666667,4.266666,4.2666665)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:url(#linearGradient3894);stroke-width:2.39999999999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       style="fill:none;stroke:#fce94f;stroke-width:2.4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="path3048-7"
-       sodipodi:cx="32"
-       sodipodi:cy="32"
-       sodipodi:rx="30"
-       sodipodi:ry="30"
        d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
        transform="matrix(0.83333334,0,0,0.83333333,5.3333329,5.3333335)" />
     <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:url(#linearGradient3886);stroke-width:2.22222233000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       style="fill:none;stroke:#edd400;stroke-width:2.22222233;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="path3048-7-4"
-       sodipodi:cx="32"
-       sodipodi:cy="32"
-       sodipodi:rx="30"
-       sodipodi:ry="30"
        d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
        transform="matrix(0.9,0,0,0.9,3.2,3.2)" />
   </g>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension.svg
index 4a59128659..0a00f99958 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension.svg
@@ -3,16 +3,7 @@
    width="64px"
    height="64px"
    id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="1.1-beta1 (77e7b44db3, 2021-03-28)"
-   sodipodi:docname="TechDraw_Dimension.svg.2024_04_19_08_09_07.0.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Drawing/TechDraw_Dimension_Length_2_32px.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45"
-   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"
@@ -22,8 +13,7 @@
   <defs
      id="defs5823">
     <linearGradient
-       id="linearGradient3026"
-       inkscape:collect="always">
+       id="linearGradient3026">
       <stop
          id="stop3028"
          offset="0"
@@ -34,7 +24,6 @@
          style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -57,7 +46,6 @@
          id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3377"
        id="linearGradient3383"
        x1="901.1875"
@@ -66,15 +54,7 @@
        y2="1190.875"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6349"
        id="radialGradient6355"
        cx="1103.6399"
@@ -85,7 +65,6 @@
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3893"
        id="linearGradient3899"
        x1="35"
@@ -94,7 +73,6 @@
        y2="16"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -107,7 +85,6 @@
     </linearGradient>
     <linearGradient
        gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,34.704127,-9.9426796)"
-       inkscape:collect="always"
        xlink:href="#linearGradient3893-4"
        id="linearGradient3907-7"
        x1="39.949749"
@@ -116,7 +93,6 @@
        y2="4.7365441"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893-4">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -128,51 +104,14 @@
          id="stop3897-9" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3026"
        id="linearGradient927"
-       x1="16.969255"
-       y1="39.85923"
-       x2="58.005249"
-       y2="39.85923"
+       x1="19.970522"
+       y1="43.914997"
+       x2="52.894981"
+       y2="39.453655"
        gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.7173008"
-     inkscape:cx="7.9726514"
-     inkscape:cy="31.603819"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="3840"
-     inkscape:window-height="1571"
-     inkscape:window-x="-9"
-     inkscape:window-y="-9"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     objecttolerance="10.0"
-     gridtolerance="10.0"
-     guidetolerance="10.0"
-     inkscape:pagecheckerboard="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2994"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -186,7 +125,6 @@
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>TechDraw_Dimension</dc:title>
         <dc:date>2016-04-27</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -219,84 +157,81 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="g3"
+     transform="rotate(4.5967092,69.655284,33.590803)">
     <g
-       id="g1123">
+       id="g2"
+       transform="matrix(0.92173529,-0.12729608,0.12729608,0.92173529,-2.8594058,11.809667)"
+       style="stroke-width:1.07471">
       <path
-         style="fill:none;stroke:#302b00;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         id="path3"
-         sodipodi:type="arc"
-         sodipodi:cx="42.62447"
-         sodipodi:cy="32.611259"
-         sodipodi:rx="16.283468"
-         sodipodi:ry="16.283468"
-         sodipodi:start="5.3462224"
-         sodipodi:end="0.51990659"
-         sodipodi:arc-type="arc"
-         sodipodi:open="true"
-         transform="rotate(12.779233)"
-         d="m 52.268157,19.490641 a 16.283468,16.283468 0 0 1 4.488175,21.21023" />
+         style="display:inline;fill:none;stroke:#302b00;stroke-width:4.29884;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         id="path3-7"
+         d="m 55.816331,14.72591 a 17.5,17.5 0 0 1 4.823484,22.794839"
+         transform="rotate(16.045608)" />
       <path
-         style="fill:none;stroke:#302b00;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="M 54.090138,23.080858 18.968981,44.576119 56.005249,56.637604"
-         id="path1" />
+         style="display:inline;fill:none;stroke:#302b00;stroke-width:8.59768;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 58,22 19.000013,42.912993 58,58.122442"
+         id="path1-35" />
       <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         id="path3-6"
-         sodipodi:type="arc"
-         sodipodi:cx="42.62447"
-         sodipodi:cy="32.658588"
-         sodipodi:rx="16.283468"
-         sodipodi:ry="16.283468"
-         sodipodi:start="5.2511532"
-         sodipodi:end="0.51990659"
-         sodipodi:arc-type="arc"
-         sodipodi:open="true"
-         transform="rotate(12.779233)"
-         d="M 50.979121,18.681781 A 16.283468,16.283468 0 0 1 56.756332,40.7482" />
+         style="display:inline;fill:none;stroke:#edd400;stroke-width:2.14942;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         id="path3-6-1"
+         d="M 54.430992,13.856617 A 17.5,17.5 0 0 1 60.639815,37.57161"
+         transform="rotate(16.045608)" />
       <path
-         style="fill:none;stroke:url(#linearGradient927);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="M 54.090138,23.080858 18.968981,44.576119 56.005249,56.637604"
-         id="path1-3" />
+         style="display:inline;fill:none;stroke:#edd400;stroke-width:4.29884;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 58,22 19.000013,42.912993 58,58.122442"
+         id="path1-3-8" />
       <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="M 54.03712,22.151886 18.920565,43.727975 55.94574,55.594886"
-         id="path2"
-         sodipodi:nodetypes="ccc" />
+         style="display:inline;fill:none;stroke:#fce94f;stroke-width:2.14942;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 58,21 19,42 58,57"
+         id="path2-6" />
+    </g>
+    <g
+       id="g4"
+       transform="matrix(0.93090301,-0.10593993,-0.06701016,0.89124175,4.8650553,8.9985131)"
+       style="stroke-width:1.1026">
       <path
-         style="fill:none;stroke:#302b00;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="M 59.334145,21.127535 49.123924,6.3035436"
-         id="path4" />
+         style="fill:none;stroke:#302b00;stroke-width:4.41038;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 59.169988,22 45.718518,4.739707"
+         id="path4-4" />
       <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="M 59.334145,21.127535 49.123924,6.3035439"
-         id="path4-7" />
+         style="fill:none;stroke:#edd400;stroke-width:2.20519;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 59.169988,22 45.718518,4.7397073"
+         id="path4-7-8" />
+    </g>
+    <g
+       id="g4-6"
+       transform="matrix(0.93090301,-0.10593993,-0.06701016,0.89124175,-37.386566,39.418158)"
+       style="stroke-width:1.1026">
       <path
-         style="fill:none;stroke:#302b00;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="M 14.780546,48.06322 4.5703249,33.239228"
-         id="path4-2" />
+         style="fill:none;stroke:#302b00;stroke-width:4.41038;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 59.169988,22 45.718518,4.739707"
+         id="path4-2-1" />
       <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="M 14.780546,48.06322 4.5703248,33.239228"
-         id="path4-7-9" />
+         style="fill:none;stroke:#edd400;stroke-width:2.20519;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 59.169988,22 45.718518,4.7397073"
+         id="path4-7-9-2" />
+    </g>
+    <g
+       id="g6"
+       transform="matrix(0.502131,0.686801,-0.68842315,0.5009478,5.9239314,-44.625656)"
+       style="stroke-width:1.17495">
       <path
-         style="fill:none;stroke:#302b00;stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="M 39.969325,13.041079 15.273234,28.142693"
-         id="path6" />
+         style="fill:none;stroke:#302b00;stroke-width:4.69986;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 80,11 V 45"
+         id="path6-7" />
       <path
-         style="fill:#fce94f;fill-opacity:1;stroke:#302b00;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="m 38.468308,8.9727464 c 9.40717,-0.9537682 9.40717,-0.9537682 9.40717,-0.9537682 l -4.952425,8.2021028 z"
-         id="path5" />
+         style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.17496;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 75,10 C 79.811978,0 79.811978,0 79.811978,0 L 85,10 Z"
+         id="path5-8" />
       <path
-         style="fill:#fce94f;fill-opacity:1;stroke:#302b00;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="M 16.774251,32.211025 C 7.3670811,33.164794 7.3670811,33.164794 7.3670811,33.164794 L 12.319506,24.96269 Z"
-         id="path5-1" />
+         style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.17497;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 85,46 C 80.188022,56 80.188022,56 80.188022,56 L 75,46 Z"
+         id="path5-1-1" />
       <path
-         style="fill:none;stroke:#fce94f;stroke-width:2.00001;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
-         d="M 40.879356,12.483498 14.021683,28.964296"
-         id="path6-2" />
+         style="fill:none;stroke:#edd400;stroke-width:2.34993;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="m 79.998898,9.7464512 0.05754,37.0112178"
+         id="path6-2-1" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DimensionRepair.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DimensionRepair.svg
index b84d3d924d..8a67e9fa13 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DimensionRepair.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_DimensionRepair.svg
@@ -1,15 +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"
    version="1.1"
    id="svg5821"
    height="64px"
-   width="64px">
+   width="64px"
+   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="defs5823">
     <linearGradient
@@ -101,7 +101,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
@@ -145,11 +144,11 @@
        transform="translate(-0.08539082,2.8879528)"
        id="g3362">
       <path
-         style="fill:#fce94f;stroke:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.60000002;stroke-opacity:1"
+         style="fill:#edd400;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:1.60000002;stroke-opacity:1"
          d="M 45.623377,3.2319738 C 44.440635,3.3691988 43.271166,3.6952324 42.151985,4.2256428 36.785578,6.7693345 37.566633,14.713741 35.728949,18.59477 34.655613,20.861562 3.8742795,48.865635 3.8742795,48.865635 c -0.7918814,3.685437 1.0580012,6.558916 4.7551482,6.168975 0,0 30.6088773,-25.143107 33.2958053,-27.147263 2.686927,-2.004157 8.13509,3.152452 12.05453,1.293024 3.581886,-1.697357 5.858846,-5.106412 6.498287,-9.025278 l -8.667612,4.110553 -8.011671,-5.541573 0.783374,-9.7090729 8.668476,-4.1006722 C 50.894793,3.543732 48.225412,2.9300868 45.623377,3.2319738 Z M 7.9971127,49.46869 c 0.743627,-0.06506 1.390928,0.398913 1.446692,1.036308 0.05577,0.637395 -0.501134,1.206722 -1.24476,1.27178 -0.7436269,0.06506 -1.3919151,-0.398827 -1.447681,-1.036222 -0.055765,-0.637395 0.5021226,-1.206808 1.245749,-1.271866 z"
          id="path1428-3" />
       <path
-         style="fill:none;stroke:#c4a000;stroke-width:2.10642624;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:none;stroke:#fce94f;stroke-width:2.10642624;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 11.140824,50.491578 39.333516,27.034082"
          id="path3358" />
     </g>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalDimension.svg
index 32762244dd..54188ae881 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalDimension.svg
@@ -2,53 +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"
    width="64px"
    height="64px"
    id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="TechDraw_Dimension_Horizontal.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Drawing/TechDraw_dimensions/drawing_Dimension_Horizontal_2_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   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="defs5823">
     <linearGradient
-       id="linearGradient3020"
-       inkscape:collect="always">
-      <stop
-         id="stop3022"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3024"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3014"
-       inkscape:collect="always">
-      <stop
-         id="stop3016"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -71,7 +37,6 @@
          id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3377"
        id="linearGradient3383"
        x1="901.1875"
@@ -80,15 +45,7 @@
        y2="1190.875"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6349"
        id="radialGradient6355"
        cx="1103.6399"
@@ -99,7 +56,6 @@
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3893"
        id="linearGradient3899"
        x1="35"
@@ -108,7 +64,6 @@
        y2="16"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -119,76 +74,7 @@
          offset="1"
          id="stop3897" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(-1,0,0,-1,48.000001,62)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3020"
-       id="linearGradient3907"
-       x1="48"
-       y1="3.9999995"
-       x2="16"
-       y2="5.9999995"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="matrix(-1,0,0,-1,48.000001,10)"
-       y2="6.9999995"
-       x2="16"
-       y1="3.9999995"
-       x1="47"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3925"
-       xlink:href="#linearGradient3893-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3893-1">
-      <stop
-         style="stop-color:#c4a000;stop-opacity:1"
-         offset="0"
-         id="stop3895-2" />
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1"
-         offset="1"
-         id="stop3897-6" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(-1,0,0,-1,48.000001,62)"
-       y2="33"
-       x2="29"
-       y1="32"
-       x1="35"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4014"
-       xlink:href="#linearGradient3014"
-       inkscape:collect="always" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.7614951"
-     inkscape:cx="35.66424"
-     inkscape:cy="13.624103"
-     inkscape:current-layer="g3000"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2994"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -197,13 +83,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>TechDraw_Dimension_Horizontal</dc:title>
         <dc:date>2016-04-27</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -219,12 +103,6 @@
         </dc:rights>
         <cc:license
            rdf:resource="https://www.gnu.org/licenses/lgpl-3.0.en.html">https://www.gnu.org/copyleft/lesser.html</cc:license>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <dc:description>Double arrow between two bars</dc:description>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>double arrow</rdf:li>
@@ -232,78 +110,90 @@
             <rdf:li>horizontal</rdf:li>
           </rdf:Bag>
         </dc:subject>
+        <dc:description>Double arrow between two bars</dc:description>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>[agryson] Alexander Gryson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <rect
+     style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+     id="rect1-1"
+     width="7.9999995"
+     height="32"
+     x="2.0000005"
+     y="16"
+     rx="1.9999999"
+     ry="2.0645161" />
+  <rect
+     style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+     id="rect1-2-5"
+     width="7.9999995"
+     height="32"
+     x="54"
+     y="16"
+     rx="1.9999999"
+     ry="2.0645161" />
+  <rect
+     style="fill:#fce94f;fill-opacity:1;stroke:none;stroke-width:0.999996;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+     id="rect2-8"
+     width="4"
+     height="27.939342"
+     x="4"
+     y="18"
+     rx="1"
+     ry="0.99999988" />
+  <rect
+     style="fill:#fce94f;fill-opacity:1;stroke:none;stroke-width:0.999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+     id="rect2-6-8"
+     width="4"
+     height="27.999998"
+     x="56"
+     y="18"
+     rx="1"
+     ry="1" />
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g3000"
-       transform="matrix(0,-1,1,0,1.9999995,48.000001)">
-      <path
-         inkscape:connector-curvature="0"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4014);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-         d="m 23.000002,41 -4.000001,0 0,-22 4,0 c -3,-3 -5,-6 -6,-8 L 16.000002,9.0000005 15.000002,11 c -1,2 -3,5 -6.000001,8 l 4.000001,0 0,22 -4.000001,0 c 3.000001,3 5.000001,6 6.000001,8 l 1,2 0.999999,-2 c 1,-2 3,-5 6.000001,-8 z"
-         id="path3770"
-         sodipodi:nodetypes="ccccccccccccccc" />
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3907);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-         d="m 33.000001,59 0,-6 -34,0 0,6 z"
-         id="path3781-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 32.000001,55 -32,0"
-         id="path3014"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 17.000001,47 4,-6"
-         id="path3864"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 17.000001,13 4,6"
-         id="path3864-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 17.000001,49 0,-38"
-         id="path3866"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 19.000001,41 -2,3"
-         id="path3868"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 19.000001,19 -2,-3"
-         id="path3868-8"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-         d="m 23.000002,41 -4.000001,0 0,-22 4,0 c -3,-3 -5,-6 -6,-8 L 16.000002,9.0000005 15.000002,11 c -1,2 -3,5 -6.000001,8 l 4.000001,0 0,22 -4.000001,0 c 3.000001,3 5.000001,6 6.000001,8 l 1,2 0.999999,-2 c 1,-2 3,-5 6.000001,-8 z"
-         id="path3770-9"
-         sodipodi:nodetypes="ccccccccccccccc" />
-      <path
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3925);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-         d="m 33.000001,7.0000005 0,-6 -34,0 0,6 z"
-         id="path3781-1-0"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 32.000001,3.000001 -32,0"
-         id="path3014-4"
-         inkscape:connector-curvature="0" />
-    </g>
+     id="g6-5"
+     transform="matrix(0.00230768,1.0864697,-0.83955055,0.00105294,55.321929,-54.977387)"
+     style="stroke-width:1.04704">
+    <rect
+       style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1.57058;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:3.45;stroke-opacity:1"
+       id="rect4-3"
+       width="37.553383"
+       height="5.5224795"
+       x="-46.836781"
+       y="77.283447"
+       transform="matrix(9.6913757e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+       rx="1.1911108"
+       ry="0.92041326" />
+    <path
+       style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.57057;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+       d="M 74.376743,10.515111 C 79.820366,0.51684628 79.820366,0.51684628 79.820366,0.51684628 L 85.692042,10.518727 Z"
+       id="path5-2" />
+    <path
+       style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.57057;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+       d="m 85.658189,45.461925 c -5.443621,9.998132 -5.443621,9.998132 -5.443621,9.998132 L 74.34289,45.45831 Z"
+       id="path5-1-9" />
+    <rect
+       style="fill:#edd400;fill-opacity:1;stroke:none;stroke-width:3.14114;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+       id="rect3-9"
+       width="41.242214"
+       height="2.7612395"
+       x="-48.288445"
+       y="78.64576"
+       transform="matrix(9.6914399e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+       rx="2.5477815"
+       ry="1.6567436" />
   </g>
+  <path
+     style="fill:#edd400;fill-opacity:1;stroke:#edd400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+     d="m 57.000007,44.923619 c 0,-25.847236 0,-25.847236 0,-25.847236"
+     id="path2-8" />
+  <path
+     style="fill:#fce94f;fill-opacity:1;stroke:#edd400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+     d="m 5.0000002,44.922273 c 0,-25.844544 0,-25.844544 0,-25.844544"
+     id="path2-3" />
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalExtentDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalExtentDimension.svg
index 2b03704905..5c0205ea93 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalExtentDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_HorizontalExtentDimension.svg
@@ -2,907 +2,122 @@
 <!-- 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="svg249"
-   inkscape:version="0.92.4 (unknown)"
-   sodipodi:docname="TechDraw_Dimension_HExtent.svg">
-  <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="namedview91"
-     showgrid="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:zoom="8.03125"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3068"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="30,50"
-       orientation="1,0"
-       id="guide661"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="2,30"
-       orientation="0,1"
-       id="guide663"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-8,2"
-       orientation="0,1"
-       id="guide4832"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="30,62"
-       orientation="0,1"
-       id="guide4834"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="62,39"
-       orientation="1,0"
-       id="guide4836"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="2,45"
-       orientation="1,0"
-       id="guide4838"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
+   id="svg4024"
+   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">
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect4816"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="repeated"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="10"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect4810"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="repeated_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="10"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect1103"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="repeated"
-       prop_scale="0"
-       scale_y_rel="false"
-       spacing="4"
-       normal_offset="-0.2"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <radialGradient
-       cx="605.71429"
-       cy="486.64789"
-       r="117.14286"
-       fx="605.71429"
-       fy="486.64789"
-       id="radialGradient5031"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" />
-    <linearGradient
-       id="linearGradient5060">
-      <stop
-         id="stop5062"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5064"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="605.71429"
-       cy="486.64789"
-       r="117.14286"
-       fx="605.71429"
-       fy="486.64789"
-       id="radialGradient5029"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         id="stop5050"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop5056"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop5052"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507"
-       id="linearGradient5027"
-       xlink:href="#linearGradient5048"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" />
-    <linearGradient
-       id="linearGradient4542">
-      <stop
-         id="stop4544"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4546"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.306795"
-       cy="42.07798"
-       r="15.821514"
-       fx="24.306795"
-       fy="42.07798"
-       id="radialGradient4548"
-       xlink:href="#linearGradient4542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.284916,0,30.08928)" />
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop15666"
-         style="stop-color:#f8f8f8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="20.892099"
-       cy="64.567902"
-       r="5.257"
-       fx="20.892099"
-       fy="64.567902"
-       id="aigrd3"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop15573"
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop15575"
-         style="stop-color:#9a9a9a;stop-opacity:1"
-         offset="1" />
-    </radialGradient>
-    <radialGradient
-       cx="20.892099"
-       cy="114.5684"
-       r="5.256"
-       fx="20.892099"
-       fy="114.5684"
-       id="aigrd2"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop15566"
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop15568"
-         style="stop-color:#9a9a9a;stop-opacity:1"
-         offset="1" />
-    </radialGradient>
-    <linearGradient
-       id="linearGradient269">
-      <stop
-         id="stop270"
-         style="stop-color:#a3a3a3;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop271"
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         style="stop-color:#fafafa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop261"
-         style="stop-color:#bbbbbb;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12512">
-      <stop
-         id="stop12513"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12517"
-         style="stop-color:#fff520;stop-opacity:0.89108908"
-         offset="0.5" />
-      <stop
-         id="stop12514"
-         style="stop-color:#fff300;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="8.824419"
-       cy="3.7561285"
-       r="37.751713"
-       fx="8.824419"
-       fy="3.7561285"
-       id="radialGradient15656"
-       xlink:href="#linearGradient269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.968273,0,0,1.032767,3.4281936,-47.492271)" />
-    <radialGradient
-       cx="33.966679"
-       cy="35.736916"
-       r="86.70845"
-       fx="33.966679"
-       fy="35.736916"
-       id="radialGradient15658"
-       xlink:href="#linearGradient259"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.960493,0,0,1.041132,0.07464063,-48.138718)" />
-    <radialGradient
-       cx="8.1435566"
-       cy="7.2678967"
-       r="38.158695"
-       fx="8.1435566"
-       fy="7.2678967"
-       id="radialGradient15668"
-       xlink:href="#linearGradient15662"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.968273,0,0,1.032767,3.4281936,-47.492271)" />
-    <radialGradient
-       cx="20.892099"
-       cy="114.5684"
-       r="5.256"
-       fx="20.892099"
-       fy="114.5684"
-       id="radialGradient2283"
-       xlink:href="#aigrd2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)" />
-    <radialGradient
-       cx="20.892099"
-       cy="64.567902"
-       r="5.257"
-       fx="20.892099"
-       fy="64.567902"
-       id="radialGradient2285"
-       xlink:href="#aigrd3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)" />
-    <linearGradient
-       x1="18.971846"
-       y1="14.452502"
-       x2="44.524982"
-       y2="41.792759"
-       id="linearGradient4343"
-       xlink:href="#linearGradient3377-76"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3377-76">
-      <stop
-         id="stop3379-5"
-         style="stop-color:#faff2b;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4345"
-         style="stop-color:#fcb915;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop3381-7"
-         style="stop-color:#c68708;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="145.64697"
-       y1="79.160103"
-       x2="175.6825"
-       y2="108.75008"
-       id="linearGradient4349"
-       xlink:href="#linearGradient3377-76"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4482">
-      <stop
-         id="stop4484"
-         style="stop-color:#faff2b;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4486"
-         style="stop-color:#fcb915;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop4488"
-         style="stop-color:#c68708;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="135.38333"
-       cy="97.369568"
-       r="19.467436"
-       fx="135.38333"
-       fy="97.369568"
-       id="radialGradient4351"
-       xlink:href="#linearGradient3377"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)" />
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         id="stop3379"
-         style="stop-color:#faff2b;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3381"
-         style="stop-color:#ffaa00;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="45.883327"
-       cy="28.869568"
-       r="19.467436"
-       fx="45.883327"
-       fy="28.869568"
-       id="radialGradient4353"
-       xlink:href="#linearGradient3377"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4495">
-      <stop
-         id="stop4497"
-         style="stop-color:#faff2b;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4499"
-         style="stop-color:#ffaa00;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd2-2"
-       id="radialGradient2283-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
-       cx="20.892099"
-       cy="114.5684"
-       fx="20.892099"
-       fy="114.5684"
-       r="5.256" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
-       cx="20.892099"
-       id="aigrd2-2">
-      <stop
-         id="stop15566-3"
-         style="stop-color:#F0F0F0"
-         offset="0" />
-      <stop
-         id="stop15568-2"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </radialGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd3-1"
-       id="radialGradient2285-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
-       cx="20.892099"
-       cy="64.567902"
-       fx="20.892099"
-       fy="64.567902"
-       r="5.257" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
-       cx="20.892099"
-       id="aigrd3-1">
-      <stop
-         id="stop15573-6"
-         style="stop-color:#F0F0F0"
-         offset="0" />
-      <stop
-         id="stop15575-8"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </radialGradient>
-    <radialGradient
-       r="38.158695"
-       fy="7.2678967"
-       fx="8.1435566"
-       cy="7.2678967"
-       cx="8.1435566"
-       gradientTransform="matrix(1.2992848,0,0,1.4315068,3.2140525,-64.437909)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient15668-2"
-       xlink:href="#linearGradient15662-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient15662-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop15664-6" />
-      <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop15666-1" />
-    </linearGradient>
-    <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(1.3214205,0,0,1.4752426,-2.0839021,-66.146883)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient15658-4"
-       xlink:href="#linearGradient259-5"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient259-5">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop260-5" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop261-1" />
-    </linearGradient>
-    <radialGradient
-       r="37.751713"
-       fy="37.388847"
-       fx="3.3431637"
-       cy="37.388847"
-       cx="3.3431637"
-       gradientTransform="matrix(1.3321242,0,0,1.4633899,2.5298271,-65.230893)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient15656-7"
-       xlink:href="#linearGradient269-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient269-1">
-      <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop270-1" />
-      <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop271-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048-7"
-       id="linearGradient5027-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       id="linearGradient5048-7">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050-4" />
-      <stop
-         id="stop5056-0"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060-8"
-       id="radialGradient5029-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060-8">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062-8" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064-2" />
-    </linearGradient>
-    <radialGradient
-       r="117.14286"
-       fy="486.64789"
-       fx="605.71429"
-       cy="486.64789"
-       cx="605.71429"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3663"
-       xlink:href="#linearGradient5060-8"
-       inkscape:collect="always" />
-    <radialGradient
-       r="117.14286"
-       fy="486.64789"
-       fx="605.71429"
-       cy="486.64789"
-       cx="605.71429"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4227"
-       xlink:href="#linearGradient5060-8"
-       inkscape:collect="always" />
-  </defs>
+     id="defs4026" />
   <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:title></dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://agryson.net</dc:source>
-        <cc:license
-           rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>TechDraw_View</dc:title>
-        <dc:date>2016-01-14</dc:date>
-        <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>FreeCAD</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>FreeCAD LGPL2+</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer4"
-     style="display:inline"
-     transform="translate(0,16)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Shape" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Dim">
+     id="g2"
+     style="display:inline">
     <g
-       id="g5167">
+       id="g5167-0"
+       style="display:inline"
+       transform="translate(-9,8.9999803)">
       <g
-         transform="translate(0.2499995,-1.3749871)"
-         id="g1689"
-         style="">
+         transform="translate(9.25,-1.3749871)"
+         id="g1689-6">
         <path
-           style="opacity:0.5;fill:#d3d7cf;fill-opacity:1;stroke:#042a2a;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+           style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:#555753;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="M 14.75,45.144231 V 24.221153 l 18.307692,5.230771 V 50.375 Z"
-           id="path3185"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path3185-1" />
         <path
-           style="opacity:0.5;fill:#d3d7cf;fill-opacity:1;stroke:#042a2a;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:#555753;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
            d="M 14.75,24.221153 30.442308,16.375 48.750001,21.605769 33.057692,29.451924 Z"
-           id="path3973"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path3973-4" />
         <path
-           style="opacity:0.5;fill:#babdb6;fill-opacity:1;stroke:#042a2a;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:#555753;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
            d="M 33.057692,29.451924 V 50.375 L 48.750001,42.528847 V 21.605769 Z"
-           id="path3975"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path3975-5" />
+      </g>
+    </g>
+    <g
+       id="layer1-1"
+       transform="matrix(1.3333328,0,0,0.99999876,-10.666659,2.05258e-6)"
+       style="display:inline">
+      <g
+         id="g3-8"
+         transform="matrix(0,1.1499854,-0.86248833,0,64.774305,-4.799845)"
+         style="stroke-width:0.869577">
+        <path
+           style="fill:none;stroke:#302b00;stroke-width:6.95652;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58 H 52.000169"
+           id="path2-6" />
+        <path
+           style="fill:none;stroke:#fce94f;stroke-width:3.47831;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58 H 52.000169"
+           id="path3-6-3-8" />
+        <path
+           style="fill:none;stroke:#edd400;stroke-width:1.73915;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58.869556 H 52.000169"
+           id="path3-9" />
       </g>
       <g
-         transform="translate(-20.165215,0.3521777)"
-         id="g5049">
-        <g
-           id="g4995"
-           transform="translate(0,3.8739547)">
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path4981"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4983"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path4985"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="translate(0,3.8739547)"
-           id="g5003">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4997"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path4999"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5001"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-        <g
-           id="g5011"
-           transform="translate(0,19.193682)">
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path5005"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5007"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path5009"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="translate(0,34.513414)"
-           id="g5019">
-          <path
-             inkscape:connector-curvature="0"
-             id="path5013"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path5015"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5017"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-        <g
-           id="g5027"
-           transform="translate(0,49.833144)">
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path5021"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5023"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path5025"
-             inkscape:connector-curvature="0" />
-        </g>
+         id="g6-5-9"
+         transform="matrix(-0.00199035,-1.2494242,0.72410255,-0.00121086,17.903209,114.05952)"
+         style="display:inline;stroke-width:1.04704">
+        <rect
+           style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1.5706;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:3.45;stroke-opacity:1"
+           id="rect4-3-7"
+           width="26.929836"
+           height="4.8022251"
+           x="-32.932755"
+           y="77.683495"
+           transform="matrix(9.6913881e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+           rx="1.1911108"
+           ry="0.92041332" />
+        <path
+           style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.36574;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+           d="m 75.15739,7.5981756 4.733928,-8.9789824 5.105602,8.9813454 z"
+           id="path5-2-5" />
+        <path
+           style="display:inline;fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.36574;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+           d="m 84.973484,31.777725 c -4.733926,8.978982 -4.733926,8.978982 -4.733926,8.978982 l -5.105603,-8.981343 z"
+           id="path5-1-9-9" />
+        <rect
+           style="fill:#edd400;fill-opacity:1;stroke:none;stroke-width:3.14114;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+           id="rect3-9-9"
+           width="31.072891"
+           height="2.4011114"
+           x="-35.004284"
+           y="78.884048"
+           transform="matrix(9.6914922e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+           rx="2.5477815"
+           ry="1.2005539" />
       </g>
       <g
-         transform="translate(-0.0910865)"
-         id="g5114">
-        <g
-           transform="translate(-68.498562,0.3521777)"
-           id="g5091">
-          <g
-             id="g5057"
-             transform="translate(0,3.8739547)">
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5051"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5053"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5055"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(0,3.8739547)"
-             id="g5065">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5059"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5061"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5063"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          </g>
-          <g
-             id="g5073"
-             transform="translate(0,19.193682)">
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5067"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5069"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5071"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(0,34.513414)"
-             id="g5081">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5075"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5077"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5079"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          </g>
-          <g
-             id="g5089"
-             transform="translate(0,49.833144)">
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5083"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5085"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5087"
-               inkscape:connector-curvature="0" />
-          </g>
-        </g>
+         id="g5-8"
+         transform="matrix(0,1.149996,-0.8624962,0,99.274778,-4.7999348)"
+         style="stroke-width:0.869569">
+        <path
+           style="fill:#888a85;stroke:#302b00;stroke-width:6.95646;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58 H 52.000169"
+           id="path4-4" />
+        <path
+           style="fill:none;stroke:#fce94f;stroke-width:3.47828;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58 H 52.000169"
+           id="path5-7" />
+        <path
+           style="fill:#888a85;stroke:#edd400;stroke-width:1.73914;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58.869551 H 52.000169"
+           id="path2-0" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LandmarkDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LandmarkDimension.svg
index bcf531bf68..3855f04a07 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LandmarkDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LandmarkDimension.svg
@@ -1,15 +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"
    version="1.1"
    id="svg5821"
    height="64px"
-   width="64px">
+   width="64px"
+   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="defs5823">
     <linearGradient
@@ -170,7 +170,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
@@ -210,55 +209,95 @@
   </metadata>
   <g
      id="layer1">
-    <path
-       id="path3770-1"
-       d="m 34.62415,19.712583 2.659865,2.696146 -14.629254,14.8288 -2.659864,-2.696147 c 0,4.044219 -0.664965,7.4144 -1.329932,9.43651 L 18,46 19.994897,45.325965 c 1.994898,-0.674037 5.319728,-1.348073 9.309525,-1.348073 l -2.659864,-2.696146 14.629252,-14.828799 2.659865,2.696146 c 0,-4.044219 0.664965,-7.4144 1.329932,-9.43651 l 0.664965,-2.022108 -1.994897,0.674035 c -1.994899,0.674037 -5.319728,1.348073 -9.309525,1.348073 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4075);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif" />
-    <path
-       id="path3781-1"
-       d="m 43,3 -4,4 18,18 4,-4 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3907);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif" />
-    <path
-       id="path3014"
-       d="M 42.344143,5.2007502 58.856607,21.684535"
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path3864"
-       d="m 42.603742,19.712583 -6.649659,1.348074"
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path3864-4"
-       d="m 19.994897,42.629818 1.329932,-6.740362"
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path3866"
-       d="M 43.933675,18.36451 18.019696,44.580143"
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path3868"
-       d="m 37.284015,22.408729 3.324829,-0.674036"
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path3868-8"
-       d="m 22.654761,37.237529 -0.664966,3.37018"
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path3770-9"
-       d="M 34.857144,19.142856 37.714288,22 21.999999,37.714287 19.142857,34.857142 c 0,4.285716 -0.714285,7.857144 -1.428572,10.000002 L 17,47 19.142857,46.285716 c 2.142857,-0.714287 5.714285,-1.428572 10.000001,-1.428572 L 26.285715,42 42.000001,26.285714 l 2.857144,2.857144 c 0,-4.285716 0.714285,-7.857144 1.428571,-10.000002 L 47.000001,17 44.857145,17.714284 c -2.142858,0.714287 -5.714286,1.428572 -10.000001,1.428572 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif" />
-    <path
-       id="path3781-1-4"
-       d="m 7,39 -4,4 18,18 4,-4 z"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3065);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif" />
-    <path
-       id="path3014-8"
-       d="M 6.344143,41.20075 22.856607,57.684535"
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <g
+       id="g1">
+      <rect
+         style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+         id="rect1-9"
+         width="7.573863"
+         height="30.295454"
+         x="-28.40094"
+         y="30.107107"
+         rx="1.9999999"
+         ry="2.0645161"
+         transform="rotate(-45)" />
+      <rect
+         style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+         id="rect1-2-8"
+         width="7.573863"
+         height="30.295454"
+         x="20.82917"
+         y="30.107107"
+         rx="1.9999999"
+         ry="2.0645161"
+         transform="rotate(-45)" />
+      <rect
+         style="fill:#fce94f;fill-opacity:1;stroke:none;stroke-width:0.999994;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+         id="rect2-7"
+         width="3.786932"
+         height="26.451096"
+         x="-26.507473"
+         y="32.000572"
+         rx="0.99999994"
+         ry="0.99999982"
+         transform="rotate(-45)" />
+      <rect
+         style="fill:#fce94f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+         id="rect2-6-1"
+         width="3.786932"
+         height="26.50852"
+         x="22.722635"
+         y="32.000572"
+         rx="0.99999994"
+         ry="0.99999994"
+         transform="rotate(-45)" />
+      <g
+         id="g6-3"
+         transform="matrix(0.72887251,0.72578279,-0.56132491,0.56273466,-10.61285,-41.839654)"
+         style="stroke-width:1.10595">
+        <rect
+           style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1.65895;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:3.45;stroke-opacity:1"
+           id="rect4-4"
+           width="37.553383"
+           height="5.5224795"
+           x="-46.836781"
+           y="77.283447"
+           transform="matrix(9.6913757e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+           rx="1.2581276"
+           ry="0.9721995" />
+        <path
+           style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.65894;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+           d="M 74.376743,10.515111 C 79.820366,0.51684628 79.820366,0.51684628 79.820366,0.51684628 L 85.692042,10.518727 Z"
+           id="path5-7" />
+        <path
+           style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.65894;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+           d="m 85.658189,45.461925 c -5.443621,9.998132 -5.443621,9.998132 -5.443621,9.998132 L 74.34289,45.45831 Z"
+           id="path5-1-3" />
+        <rect
+           style="fill:#edd400;fill-opacity:1;stroke:none;stroke-width:3.31787;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+           id="rect3-6"
+           width="41.242214"
+           height="2.7612395"
+           x="-48.288445"
+           y="78.64576"
+           transform="matrix(9.6914399e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+           rx="2.6911302"
+           ry="1.7499589" />
+      </g>
+      <path
+         style="fill:#edd400;fill-opacity:1;stroke:#edd400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 57.38838,23.914826 C 40.085174,6.61162 40.085174,6.61162 40.085174,6.61162"
+         id="path2" />
+      <path
+         style="fill:#fce94f;fill-opacity:1;stroke:#edd400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="M 22.576529,58.724873 C 5.2751253,41.423471 5.2751253,41.423471 5.2751253,41.423471"
+         id="path2-3" />
+    </g>
     <g
        transform="matrix(0.75,0,0,0.75,14.248055,13.860763)"
        id="g2081">
       <path
-         style="fill:url(#linearGradient1223);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#edd400;fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 31.635019,60.674126 14.4,-26.400003 14.4,26.400003 z"
          id="path1197" />
       <g
@@ -266,11 +305,11 @@
         <path
            id="path1225"
            d="m 40.035019,50.929961 h 12"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="fill:none;fill-rule:evenodd;stroke:#302b00;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
            id="path1227"
            d="m 46.035019,44.929961 v 12"
-           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           style="fill:none;fill-rule:evenodd;stroke:#302b00;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LengthDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LengthDimension.svg
index 8800354524..be019e7129 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LengthDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LengthDimension.svg
@@ -2,65 +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"
    width="64px"
    height="64px"
    id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="TechDraw_Dimension_Length.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Drawing/TechDraw_Dimension_Length_2_32px.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
+   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="defs5823">
     <linearGradient
-       id="linearGradient3026"
-       inkscape:collect="always">
-      <stop
-         id="stop3028"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3030"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3020"
-       inkscape:collect="always">
-      <stop
-         id="stop3022"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3024"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3014"
-       inkscape:collect="always">
-      <stop
-         id="stop3016"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3018"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -83,7 +37,6 @@
          id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3377"
        id="linearGradient3383"
        x1="901.1875"
@@ -92,15 +45,7 @@
        y2="1190.875"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6349"
        id="radialGradient6355"
        cx="1103.6399"
@@ -111,7 +56,6 @@
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3893"
        id="linearGradient3899"
        x1="35"
@@ -120,7 +64,6 @@
        y2="16"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -131,29 +74,8 @@
          offset="1"
          id="stop3897" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,34.757359,-9.970563)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3014"
-       id="linearGradient3907"
-       x1="39.949749"
-       y1="10.393398"
-       x2="21.564972"
-       y2="4.7365441"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="matrix(0.66496604,0.67403632,-0.66496604,0.67403632,31.964285,-11.293087)"
-       y2="28.399185"
-       x2="25.445223"
-       y1="40.227509"
-       x1="43.288891"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4075"
-       xlink:href="#linearGradient3020"
-       inkscape:collect="always" />
     <linearGradient
        gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,34.704127,-9.9426796)"
-       inkscape:collect="always"
        xlink:href="#linearGradient3893-4"
        id="linearGradient3907-7"
        x1="39.949749"
@@ -162,7 +84,6 @@
        y2="4.7365441"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893-4">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -173,49 +94,7 @@
          offset="1"
          id="stop3897-9" />
     </linearGradient>
-    <linearGradient
-       y2="4.7365441"
-       x2="21.564972"
-       y1="10.393398"
-       x1="39.949749"
-       gradientTransform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,-1.242641,26.029437)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3065"
-       xlink:href="#linearGradient3026"
-       inkscape:collect="always" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="-1.1286011"
-     inkscape:cy="28.289936"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2994"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -224,13 +103,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>TechDraw_Dimension_Length</dc:title>
         <dc:date>2016-04-27</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -246,11 +123,6 @@
         </dc:rights>
         <cc:license
            rdf:resource="https://www.gnu.org/licenses/lgpl-3.0.en.html">https://www.gnu.org/copyleft/lesser.html</cc:license>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>double arrow</rdf:li>
@@ -259,76 +131,93 @@
           </rdf:Bag>
         </dc:subject>
         <dc:description>Double arrow at angle between two diagonal bars</dc:description>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>[agryson] Alexander Gryson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <rect
+     style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+     id="rect1-9"
+     width="7.573863"
+     height="30.295454"
+     x="-28.40094"
+     y="30.107107"
+     rx="1.9999999"
+     ry="2.0645161"
+     transform="rotate(-45)" />
+  <rect
+     style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+     id="rect1-2-8"
+     width="7.573863"
+     height="30.295454"
+     x="20.82917"
+     y="30.107107"
+     rx="1.9999999"
+     ry="2.0645161"
+     transform="rotate(-45)" />
+  <rect
+     style="fill:#fce94f;fill-opacity:1;stroke:none;stroke-width:0.999994;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+     id="rect2-7"
+     width="3.786932"
+     height="26.451096"
+     x="-26.507473"
+     y="32.000572"
+     rx="0.99999994"
+     ry="0.99999982"
+     transform="rotate(-45)" />
+  <rect
+     style="fill:#fce94f;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+     id="rect2-6-1"
+     width="3.786932"
+     height="26.50852"
+     x="22.722635"
+     y="32.000572"
+     rx="0.99999994"
+     ry="0.99999994"
+     transform="rotate(-45)" />
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="g6-3"
+     transform="matrix(0.72887251,0.72578279,-0.56132491,0.56273466,-10.61285,-41.839654)"
+     style="stroke-width:1.10595">
+    <rect
+       style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1.65895;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:3.45;stroke-opacity:1"
+       id="rect4-4"
+       width="37.553383"
+       height="5.5224795"
+       x="-46.836781"
+       y="77.283447"
+       transform="matrix(9.6913757e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+       rx="1.2581276"
+       ry="0.9721995" />
     <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient4075);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-       d="m 34.62415,19.712583 2.659865,2.696146 -14.629254,14.8288 -2.659864,-2.696147 c 0,4.044219 -0.664965,7.4144 -1.329932,9.43651 L 18,46 19.994897,45.325965 c 1.994898,-0.674037 5.319728,-1.348073 9.309525,-1.348073 l -2.659864,-2.696146 14.629252,-14.828799 2.659865,2.696146 c 0,-4.044219 0.664965,-7.4144 1.329932,-9.43651 l 0.664965,-2.022108 -1.994897,0.674035 c -1.994899,0.674037 -5.319728,1.348073 -9.309525,1.348073 z"
-       id="path3770-1"
-       sodipodi:nodetypes="ccccccccccccccc" />
+       style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.65894;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+       d="M 74.376743,10.515111 C 79.820366,0.51684628 79.820366,0.51684628 79.820366,0.51684628 L 85.692042,10.518727 Z"
+       id="path5-7" />
     <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3907);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-       d="m 43,3 -4,4 18,18 4,-4 z"
-       id="path3781-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 42.344143,5.2007502 58.856607,21.684535"
-       id="path3014"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 42.603742,19.712583 -6.649659,1.348074"
-       id="path3864"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 19.994897,42.629818 1.329932,-6.740362"
-       id="path3864-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 43.933675,18.36451 18.019696,44.580143"
-       id="path3866"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 37.284015,22.408729 3.324829,-0.674036"
-       id="path3868"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 22.654761,37.237529 -0.664966,3.37018"
-       id="path3868-8"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-       d="M 34.857144,19.142856 37.714288,22 21.999999,37.714287 19.142857,34.857142 c 0,4.285716 -0.714285,7.857144 -1.428572,10.000002 L 17,47 19.142857,46.285716 c 2.142857,-0.714287 5.714285,-1.428572 10.000001,-1.428572 L 26.285715,42 42.000001,26.285714 l 2.857144,2.857144 c 0,-4.285716 0.714285,-7.857144 1.428571,-10.000002 L 47.000001,17 44.857145,17.714284 c -2.142858,0.714287 -5.714286,1.428572 -10.000001,1.428572 z"
-       id="path3770-9"
-       sodipodi:nodetypes="ccccccccccccccc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3065);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-       d="m 7,39 -4,4 18,18 4,-4 z"
-       id="path3781-1-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 6.344143,41.20075 22.856607,57.684535"
-       id="path3014-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.65894;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+       d="m 85.658189,45.461925 c -5.443621,9.998132 -5.443621,9.998132 -5.443621,9.998132 L 74.34289,45.45831 Z"
+       id="path5-1-3" />
+    <rect
+       style="fill:#edd400;fill-opacity:1;stroke:none;stroke-width:3.31787;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+       id="rect3-6"
+       width="41.242214"
+       height="2.7612395"
+       x="-48.288445"
+       y="78.64576"
+       transform="matrix(9.6914399e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+       rx="2.6911302"
+       ry="1.7499589" />
   </g>
+  <path
+     style="fill:#edd400;fill-opacity:1;stroke:#edd400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+     d="M 57.38838,23.914826 C 40.085174,6.61162 40.085174,6.61162 40.085174,6.61162"
+     id="path2" />
+  <path
+     style="fill:#fce94f;fill-opacity:1;stroke:#edd400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+     d="M 22.576529,58.724873 C 5.2751253,41.423471 5.2751253,41.423471 5.2751253,41.423471"
+     id="path2-3" />
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LinkDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LinkDimension.svg
index 6bdbb39d93..f8af3d29cc 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LinkDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_LinkDimension.svg
@@ -2,112 +2,18 @@
 <!-- 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="svg5821"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="TechDraw_LinkDimension.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     id="namedview17"
-     showgrid="true"
-     inkscape:zoom="10.429825"
-     inkscape:cx="1.6888071"
-     inkscape:cy="29.148767"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3053"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2990"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </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="defs5823">
-    <linearGradient
-       id="linearGradient3042"
-       inkscape:collect="always">
-      <stop
-         id="stop3044"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3046"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3036"
-       inkscape:collect="always">
-      <stop
-         id="stop3038"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3040"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3030"
-       inkscape:collect="always">
-      <stop
-         id="stop3032"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3034"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3018"
-       inkscape:collect="always">
-      <stop
-         id="stop3020"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3022"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3915">
-      <stop
-         style="stop-color:#c4a000;stop-opacity:1"
-         offset="0"
-         id="stop3917" />
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1"
-         offset="1"
-         id="stop3919" />
-    </linearGradient>
     <linearGradient
        id="linearGradient6349">
       <stop
@@ -150,34 +56,6 @@
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3915"
-       id="linearGradient3921"
-       x1="-6.1755753"
-       y1="60.09618"
-       x2="29.974852"
-       y2="78.423027"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3030"
-       id="linearGradient3929"
-       x1="36.246681"
-       y1="75.570137"
-       x2="-15.171693"
-       y2="65.775932"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3036"
-       id="linearGradient3921-2"
-       x1="-6.1755753"
-       y1="60.09618"
-       x2="29.974852"
-       y2="78.423027"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient3915-6">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -189,7 +67,6 @@
          id="stop3919-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3915-6"
        id="linearGradient3929-9"
        x1="36.246681"
@@ -197,45 +74,6 @@
        x2="-15.171693"
        y2="65.775932"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="65.775932"
-       x2="-15.171693"
-       y1="75.570137"
-       x1="36.246681"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3954"
-       xlink:href="#linearGradient3018"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3042"
-       id="linearGradient3921-2-6"
-       x1="-6.1755753"
-       y1="60.09618"
-       x2="29.974852"
-       y2="78.423027"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3915-6-2">
-      <stop
-         style="stop-color:#c4a000;stop-opacity:1"
-         offset="0"
-         id="stop3917-0-4" />
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1"
-         offset="1"
-         id="stop3919-4-5" />
-    </linearGradient>
-    <linearGradient
-       y2="65.775932"
-       x2="-15.171693"
-       y1="75.570137"
-       x1="36.246681"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3954-8"
-       xlink:href="#linearGradient3915-6-2"
-       inkscape:collect="always" />
   </defs>
   <metadata
      id="metadata5826">
@@ -245,7 +83,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
@@ -289,124 +126,57 @@
     <path
        transform="matrix(0.81491721,0,0,0.75817757,158.6906,-103.36454)"
        d="m 35.525422,70.644066 c 0,8.012809 -10.987994,14.508474 -24.542372,14.508474 -13.5543773,0 -24.542371,-6.495665 -24.542371,-14.508474 0,-8.012809 10.9879937,-14.508474 24.542371,-14.508474 13.554378,0 24.542372,6.495665 24.542372,14.508474 z"
-       sodipodi:ry="14.508474"
-       sodipodi:rx="24.542372"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-7-0"
-       style="fill:none;stroke:#302b00;stroke-width:10.43136310999999900;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc" />
+       style="fill:none;stroke:#302b00;stroke-width:10.43136310999999900;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     <path
        transform="matrix(0.81491721,0,0,0.75817757,128.97386,-103.44425)"
        d="m 35.525422,70.644066 c 0,8.012809 -10.987994,14.508474 -24.542372,14.508474 -13.5543773,0 -24.542371,-6.495665 -24.542371,-14.508474 0,-8.012809 10.9879937,-14.508474 24.542371,-14.508474 13.554378,0 24.542372,6.495665 24.542372,14.508474 z"
-       sodipodi:ry="14.508474"
-       sodipodi:rx="24.542372"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-4"
-       style="fill:none;stroke:#302b00;stroke-width:10.43136310999999900;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc" />
+       style="fill:none;stroke:#302b00;stroke-width:10.43136310999999900;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     <path
        transform="matrix(0.81491721,0,0,0.75817758,128.8929,-103.36985)"
        d="m 36.722392,70.644066 c 0,8.763268 -11.523896,15.867301 -25.739342,15.867301 -14.2154456,0 -25.739341,-7.104033 -25.739341,-15.867301 0,-8.763268 11.5238954,-15.867301 25.739341,-15.867301 14.215446,0 25.739342,7.104033 25.739342,15.867301 z"
-       sodipodi:ry="15.867301"
-       sodipodi:rx="25.739342"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-7-0-4-8-4"
-       style="fill:none;stroke:url(#linearGradient3954);stroke-width:2.60784078;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc" />
+       style="fill:none;stroke:#edd400;stroke-width:2.60784078;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     <path
        transform="matrix(0.81491721,0,0,0.75817758,128.8902,-103.38055)"
        d="m 34.222831,70.644066 c 0,7.437062 -10.404804,13.465993 -23.239781,13.465993 -12.834976,0 -23.23978,-6.028931 -23.23978,-13.465993 0,-7.437063 10.404804,-13.465993 23.23978,-13.465993 12.834977,0 23.239781,6.02893 23.239781,13.465993 z"
-       sodipodi:ry="13.465993"
-       sodipodi:rx="23.23978"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-7-0-4-8-2-6"
-       style="fill:none;stroke:url(#linearGradient3921-2);stroke-width:2.60784078;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc" />
+       style="fill:none;stroke:#fce94f;stroke-width:2.60784078;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     <path
        transform="matrix(0.81491721,0,0,0.75817758,158.6906,-103.36454)"
        d="m 35.525422,70.644066 c 0,8.012809 -10.987994,14.508474 -24.542372,14.508474 -13.5543773,0 -24.542371,-6.495665 -24.542371,-14.508474 0,-8.012809 10.9879937,-14.508474 24.542371,-14.508474 13.554378,0 24.542372,6.495665 24.542372,14.508474 z"
-       sodipodi:ry="14.508474"
-       sodipodi:rx="24.542372"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-7-0-4"
-       style="fill:none;stroke:#d3d7cf;stroke-width:5.21568155;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc" />
+       style="fill:none;stroke:#d3d7cf;stroke-width:5.21568155;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     <path
        transform="matrix(0.81491721,0,0,0.75817758,158.6906,-103.36454)"
        d="m -1.2031843,83.237634 c -5.727681,-1.936912 -9.8946987,-5.155703 -11.5608667,-8.93013"
-       sodipodi:ry="14.508474"
-       sodipodi:rx="24.542372"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-7-0-3"
-       style="fill:none;stroke:#302b00;stroke-width:10.43136310999999900;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc"
-       sodipodi:start="2.0904028"
-       sodipodi:end="2.8863261"
-       sodipodi:open="true" />
+       style="fill:none;stroke:#302b00;stroke-width:10.43136310999999900;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     <path
        transform="matrix(0.81491721,0,0,0.75817758,158.6906,-103.36454)"
        d="m 36.722392,70.644066 c 0,8.763268 -11.523896,15.867301 -25.739342,15.867301 -14.2154456,0 -25.739341,-7.104033 -25.739341,-15.867301 0,-8.763268 11.5238954,-15.867301 25.739341,-15.867301 14.215446,0 25.739342,7.104033 25.739342,15.867301 z"
-       sodipodi:ry="15.867301"
-       sodipodi:rx="25.739342"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-7-0-4-8"
-       style="fill:none;stroke:url(#linearGradient3929);stroke-width:2.60784078000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc" />
+       style="fill:none;stroke:#edd400;stroke-width:2.60784078;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     <path
        transform="matrix(0.81491721,0,0,0.75817758,158.6879,-103.37524)"
        d="m 34.180987,70.644066 c 0,7.259602 -10.38607,13.144672 -23.197937,13.144672 -12.8118665,0 -23.197937,-5.88507 -23.197937,-13.144672 0,-7.259602 10.3860705,-13.144673 23.197937,-13.144673 12.811867,0 23.197937,5.885071 23.197937,13.144673 z"
-       sodipodi:ry="13.144672"
-       sodipodi:rx="23.197937"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-7-0-4-8-2"
-       style="fill:none;stroke:url(#linearGradient3921);stroke-width:2.60784078000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc" />
+       style="fill:none;stroke:#fce94f;stroke-width:2.60784078;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     <path
        transform="matrix(0.81491721,0,0,0.75817758,128.97386,-103.44426)"
        d="m 24.010072,58.34815 c 4.024412,1.490037 7.231187,3.638255 9.231532,6.184199"
-       sodipodi:ry="14.508474"
-       sodipodi:rx="24.542372"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-4-8"
-       style="fill:none;stroke:#302b00;stroke-width:10.43136310999999900;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc"
-       sodipodi:start="5.2719299"
-       sodipodi:end="5.8483605"
-       sodipodi:open="true" />
+       style="fill:none;stroke:#302b00;stroke-width:10.43136310999999900;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     <path
        transform="matrix(0.81491721,0,0,0.75817758,128.8929,-103.36986)"
        d="m 19.427669,55.655033 c 9.417174,2.016221 16.098946,7.203362 17.150992,13.314523"
-       sodipodi:ry="15.867301"
-       sodipodi:rx="25.739342"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-7-0-4-8-4-1"
-       style="fill:none;stroke:url(#linearGradient3954-8);stroke-width:2.60784078;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc"
-       sodipodi:start="5.0466616"
-       sodipodi:end="6.1774563"
-       sodipodi:open="true" />
+       style="fill:none;stroke:#edd400;stroke-width:2.60784078;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     <path
        transform="matrix(0.81491721,0,0,0.75817758,128.8902,-103.38056)"
        d="m 19.075511,58.020851 c 8.468366,1.822732 14.346478,6.32385 15.072207,11.541421"
-       sodipodi:ry="13.465993"
-       sodipodi:rx="23.23978"
-       sodipodi:cy="70.644066"
-       sodipodi:cx="10.98305"
        id="path3012-7-0-4-8-2-6-2"
-       style="fill:none;stroke:url(#linearGradient3921-2-6);stroke-width:2.60784078;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       sodipodi:type="arc"
-       sodipodi:start="5.0680562"
-       sodipodi:end="6.2027634"
-       sodipodi:open="true" />
+       style="fill:none;stroke:#fce94f;stroke-width:2.60784078;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_RadiusDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_RadiusDimension.svg
index a3dfe3d6a3..adef80171b 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_RadiusDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_RadiusDimension.svg
@@ -2,65 +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"
    width="64px"
    height="64px"
    id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="TechDraw_Dimension_Radius.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Drawing/TechDraw_dimensions/drawing_Dimension_Radius_5_32px.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
+   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="defs5823">
     <linearGradient
-       id="linearGradient3029"
-       inkscape:collect="always">
-      <stop
-         id="stop3031"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3033"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3023"
-       inkscape:collect="always">
-      <stop
-         id="stop3025"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3027"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3810">
-      <stop
-         style="stop-color:#c4a000;stop-opacity:1"
-         offset="0"
-         id="stop3812" />
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1"
-         offset="1"
-         id="stop3814" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -83,7 +37,6 @@
          id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3377"
        id="linearGradient3383"
        x1="901.1875"
@@ -92,15 +45,7 @@
        y2="1190.875"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6349"
        id="radialGradient6355"
        cx="1103.6399"
@@ -110,15 +55,6 @@
        r="194.40614"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3810"
-       id="linearGradient3816"
-       x1="36.46537"
-       y1="41.998676"
-       x2="26.232946"
-       y2="-0.79146355"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        gradientTransform="matrix(0.66496604,0.67403632,-0.66496604,0.67403632,31.964285,-11.293087)"
        y2="28.399185"
@@ -127,10 +63,8 @@
        x1="43.288891"
        gradientUnits="userSpaceOnUse"
        id="linearGradient4075"
-       xlink:href="#linearGradient3893"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3893" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -149,10 +83,8 @@
        gradientTransform="matrix(0.66496604,0.67403632,-0.66496604,0.67403632,24.97449,-5.900796)"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3107"
-       xlink:href="#linearGradient3893"
-       inkscape:collect="always" />
+       xlink:href="#linearGradient3893" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3905"
        id="linearGradient3919"
        x1="9"
@@ -161,7 +93,6 @@
        y2="38"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3905">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -173,7 +104,6 @@
          id="stop3909" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3905"
        id="linearGradient3911"
        x1="8.5"
@@ -188,70 +118,8 @@
        x1="8.5"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3047"
-       xlink:href="#linearGradient3905"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3905"
-       id="linearGradient3885"
-       gradientUnits="userSpaceOnUse"
-       x1="8.5"
-       y1="48.5"
-       x2="5.5"
-       y2="39.5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3029"
-       id="linearGradient3887"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.66496604,0.67403632,-0.66496604,0.67403632,24.97449,-5.900796)"
-       x1="43.288891"
-       y1="40.227509"
-       x2="25.445223"
-       y2="28.399185" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3023"
-       id="linearGradient3889"
-       gradientUnits="userSpaceOnUse"
-       x1="9"
-       y1="50"
-       x2="5"
-       y2="38" />
+       xlink:href="#linearGradient3905" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="19.023613"
-     inkscape:cy="29.677135"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:object-paths="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2993"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -260,7 +128,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
@@ -299,112 +166,55 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#302b00;stroke-width:7.44176340000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       style="display:inline;fill:none;stroke:#302b00;stroke-width:7.44176;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path3765"
-       sodipodi:cx="16"
-       sodipodi:cy="42"
-       sodipodi:rx="40"
-       sodipodi:ry="40"
-       d="M 13.259681,2.0939773 A 40,40 0 0 1 56,42.00286"
-       sodipodi:start="4.6438273"
-       sodipodi:end="6.2832568"
-       transform="matrix(1.075014,0,0,1.075014,-4.2007839,6.8463378)"
-       sodipodi:open="true" />
+       d="M 13.259681,2.0939773 A 40,40 0 0 1 43.29928,12.763904 40,40 0 0 1 56,42.00286"
+       transform="matrix(1.075014,0,0,1.075014,-4.2007839,6.8463378)" />
     <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:url(#linearGradient3816);stroke-width:3.7208817;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       style="fill:none;stroke:#edd400;stroke-width:3.7208817;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="path3765-1"
-       sodipodi:cx="16"
-       sodipodi:cy="42"
-       sodipodi:rx="40"
-       sodipodi:ry="40"
        d="M 13.301045,2.0911584 A 40,40 0 0 1 56,42.00286"
-       sodipodi:start="4.6448638"
-       sodipodi:end="6.2832568"
-       transform="matrix(1.075014,0,0,1.075014,-4.2019855,6.8494337)"
-       sodipodi:open="true" />
+       transform="matrix(1.075014,0,0,1.075014,-4.2019855,6.8494337)" />
     <path
-       sodipodi:type="arc"
        style="fill:none;stroke:#fce94f;stroke-width:1.86044085000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        id="path3765-1-7"
-       sodipodi:cx="16"
-       sodipodi:cy="42"
-       sodipodi:rx="40"
-       sodipodi:ry="40"
        d="M 12.65826,2.1398347 A 40,40 0 0 1 55.983487,43.149238"
-       sodipodi:start="4.628748"
-       sodipodi:end="6.3119202"
-       transform="matrix(1.075014,0,0,1.075014,-3.2019855,5.8494337)"
-       sodipodi:open="true" />
+       transform="matrix(1.075014,0,0,1.075014,-3.2019855,5.8494337)" />
     <g
        id="g3874"
        transform="translate(-1.010205,1.607709)">
       <path
          transform="matrix(1.3333333,0,0,1.3333331,5.6768719,-11.274364)"
          d="m 13,44 c 0,3.313708 -2.686292,6 -6,6 -3.3137085,0 -6,-2.686292 -6,-6 0,-3.313708 2.6862915,-6 6,-6 3.313708,0 6,2.686292 6,6 z"
-         sodipodi:ry="6"
-         sodipodi:rx="6"
-         sodipodi:cy="44"
-         sodipodi:cx="7"
          id="path3037"
-         style="fill:url(#linearGradient3885);fill-opacity:1;stroke:#302b00;stroke-width:1.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         sodipodi:type="arc" />
+         style="fill:none;fill-opacity:1;stroke:#302b00;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3864-4"
-         d="m 13.005102,48.022109 1.329932,-6.740362"
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccc"
          id="path3770-1"
-         d="m 27.634355,25.104874 2.659865,2.696146 -14.629254,14.8288 -2.654761,0.762471 c 0,4.044219 -0.670068,3.955782 -1.335035,5.977892 l -0.664965,2.022108 1.994897,-0.674035 C 15,50.044219 16.020408,48.392291 20.010205,48.392291 l -0.355442,-1.718254 14.629252,-14.828799 2.659865,2.696146 c 0,-4.044219 0.664965,-7.4144 1.329932,-9.43651 l 0.664965,-2.022108 -1.994897,0.674035 c -1.994899,0.674037 -5.319728,1.348073 -9.309525,1.348073 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3887);fill-opacity:1;fill-rule:nonzero;stroke:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-         inkscape:connector-curvature="0" />
+         d="m 27.634355,25.104874 2.659865,2.696146 -14.629254,14.8288 -2.654761,0.762471 c 0,4.044219 -0.670068,3.955782 -1.335035,5.977892 l -0.664965,2.022108 1.994897,-0.674035 C 15,50.044219 16.020408,48.392291 20.010205,48.392291 l -0.355442,-1.718254 14.629252,-14.828799 2.659865,2.696146 1.994897,-11.458618 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:none;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path3864"
          d="m 35.613947,25.104874 -5.603742,1.287417"
          style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
          id="path3866"
-         d="M 36.94388,23.756801 11.029901,49.972434"
+         d="M 37.917264,23.082766 11.029901,49.972434"
          style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
          id="path3868"
-         d="m 31.010205,27.392291 2.608844,-0.265307"
-         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         d="m 29.786296,25.322727 3.832753,1.804257"
+         style="fill:none;stroke:#fce94f;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
-         id="path3868-8"
-         d="M 15.664966,42.62982 15,46"
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccc"
          id="path3770-9"
-         d="m 27.867349,24.535147 2.857144,2.857144 -15.714289,15.714287 10e-7,0.285713 c 0,4.285716 -3.571428,4.714286 -4.285715,6.857144 l 2.285715,0.142856 -0.857143,1.285716 c 2.142857,-0.714287 1.571427,-4.285716 5.857143,-4.285716 l 1.285715,0 15.714286,-15.714286 2.857144,2.857144 c 0,-4.285716 0.714285,-7.857144 1.428571,-10.000002 l 0.714285,-2.142856 -2.142856,0.714284 c -2.142858,0.714287 -5.714286,1.428572 -10.000001,1.428572 z"
-         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-         inkscape:connector-curvature="0" />
+         d="m 27.867349,24.535147 2.857144,2.857144 -15.714289,15.714287 10e-7,0.285713 c 0,4.285716 -3.571428,4.714286 -4.285715,6.857144 l 2.285715,0.142856 -0.857143,1.285716 c 2.142857,-0.714287 1.571427,-4.285716 5.857143,-4.285716 h 1.285715 l 15.714286,-15.714286 2.857144,2.857144 2.142856,-12.142858 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate" />
       <path
          transform="translate(8.010205,3.392291)"
          d="m 13,44 c 0,3.313708 -2.686292,6 -6,6 -3.3137085,0 -6,-2.686292 -6,-6 0,-3.313708 2.6862915,-6 6,-6 3.313708,0 6,2.686292 6,6 z"
-         sodipodi:ry="6"
-         sodipodi:rx="6"
-         sodipodi:cy="44"
-         sodipodi:cx="7"
          id="path3037-8"
-         style="fill:url(#linearGradient3889);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999964000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-         sodipodi:type="arc" />
+         style="fill:#edd400;fill-opacity:1;stroke:#fce94f;stroke-width:1.99999964;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalDimension.svg
index 2fed435bda..b2027ede5f 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalDimension.svg
@@ -2,53 +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"
    width="64px"
    height="64px"
    id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="TechDraw_Dimension_Vertical.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Drawing/TechDraw_dimensions/drawing_Dimension_Vertical_2_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   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="defs5823">
     <linearGradient
-       id="linearGradient3019"
-       inkscape:collect="always">
-      <stop
-         id="stop3021"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3023"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3013"
-       inkscape:collect="always">
-      <stop
-         id="stop3015"
-         offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
-      <stop
-         id="stop3017"
-         offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893">
       <stop
          style="stop-color:#c4a000;stop-opacity:1"
@@ -60,7 +26,6 @@
          id="stop3897" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
@@ -83,7 +48,6 @@
          id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3377"
        id="linearGradient3383"
        x1="901.1875"
@@ -92,15 +56,7 @@
        y2="1190.875"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient6349"
        id="radialGradient6355"
        cx="1103.6399"
@@ -111,7 +67,6 @@
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3893"
        id="linearGradient3899"
        x1="35"
@@ -120,16 +75,6 @@
        y2="16"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3013"
-       id="linearGradient3907"
-       x1="34"
-       y1="9"
-       x2="33"
-       y2="3"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3893-1"
        id="linearGradient3907-7"
        x1="34"
@@ -138,7 +83,6 @@
        y2="3"
        gradientUnits="userSpaceOnUse" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3893-1">
       <stop
          style="stop-color:#d3d7cf;stop-opacity:1"
@@ -149,45 +93,7 @@
          offset="1"
          id="stop3897-6" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0,52)"
-       y2="3"
-       x2="33"
-       y1="9"
-       x1="34"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3925"
-       xlink:href="#linearGradient3019"
-       inkscape:collect="always" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="24.811946"
-     inkscape:cy="33.755375"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2994"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -196,13 +102,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>TechDraw_Dimension_Vertical</dc:title>
         <dc:date>2016-04-27</dc:date>
         <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -216,12 +120,6 @@
             <dc:title>FreeCAD LGPL2+</dc:title>
           </cc:Agent>
         </dc:rights>
-        <cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>double arrow</rdf:li>
@@ -230,74 +128,93 @@
           </rdf:Bag>
         </dc:subject>
         <dc:description>Vertical double arrow between two bars</dc:description>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>[agryson] Alexander Gryson</dc:title>
+          </cc:Agent>
+        </dc:contributor>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="g7"
+     transform="rotate(90,31.5,31.5)">
+    <rect
+       style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+       id="rect1-25"
+       width="7.9999995"
+       height="32"
+       x="2"
+       y="15"
+       rx="1.9999999"
+       ry="2.0645161" />
+    <rect
+       style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+       id="rect1-2-4"
+       width="7.9999995"
+       height="32"
+       x="54"
+       y="15"
+       rx="1.9999999"
+       ry="2.0645161" />
+    <rect
+       style="fill:#fce94f;fill-opacity:1;stroke:none;stroke-width:0.999997;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+       id="rect2-74"
+       width="3.9999995"
+       height="28.000002"
+       x="4"
+       y="17"
+       rx="1"
+       ry="1" />
+    <rect
+       style="fill:#fce94f;fill-opacity:1;stroke:none;stroke-width:0.999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+       id="rect2-6-43"
+       width="4"
+       height="27.999996"
+       x="56"
+       y="17.000002"
+       rx="1"
+       ry="1" />
+    <g
+       id="g6-0"
+       transform="matrix(0.00230768,1.0864697,-0.83955055,0.00105294,55.321929,-54.977387)"
+       style="stroke-width:1.04704">
+      <rect
+         style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:2.0941;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:3.45"
+         id="rect1-7"
+         width="5.5224795"
+         height="38.670315"
+         x="-81.895966"
+         y="-46.200432"
+         transform="matrix(-0.99999622,-0.00274872,9.6913877e-4,-0.99999953,0,0)"
+         rx="0.92041326"
+         ry="1.1911108" />
+      <path
+         style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.57057;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="m 73.477032,10.521224 c 5.44362,-9.99826175 5.44362,-9.99826175 5.44362,-9.99826175 L 84.792326,10.52484 Z"
+         id="path5-6" />
+      <path
+         style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.57057;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+         d="m 84.757654,45.493043 c -5.44362,9.998265 -5.44362,9.998265 -5.44362,9.998265 L 73.44236,45.489428 Z"
+         id="path5-1-8" />
+      <rect
+         style="fill:#edd400;fill-opacity:1;stroke:none;stroke-width:3.14114;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+         id="rect3-1"
+         width="41.242214"
+         height="2.7612395"
+         x="-48.288445"
+         y="77.725349"
+         transform="matrix(9.6914399e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+         rx="2.5477815"
+         ry="1.6567436" />
+    </g>
     <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3899);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-       d="m 25,21 4,0 0,22 -4,0 c 3,3 5,6 6,8 l 1,2 1,-2 c 1,-2 3,-5 6,-8 l -4,0 0,-22 4,0 c -3,-3 -5,-6 -6,-8 l -1,-2 -1,2 c -1,2 -3,5 -6,8 z"
-       id="path3770"
-       sodipodi:nodetypes="ccccccccccccccc" />
+       style="fill:#fce94f;fill-opacity:1;stroke:#edd400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+       d="m 58.968639,43.987413 c 0,-26.037317 0,-26.037317 0,-26.037317"
+       id="path2-84" />
     <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3907);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-       d="m 15,3 0,6 34,0 0,-6 z"
-       id="path3781-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 16,5 48,5"
-       id="path3014"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 31,15 -4,6"
-       id="path3864"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 31,49 27,43"
-       id="path3864-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 31,13 0,38"
-       id="path3866"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 29,21 2,-3"
-       id="path3868"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 29,43 2,3"
-       id="path3868-8"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-       d="m 25,21 4,0 0,22 -4,0 c 3,3 5,6 6,8 l 1,2 1,-2 c 1,-2 3,-5 6,-8 l -4,0 0,-22 4,0 c -3,-3 -5,-6 -6,-8 l -1,-2 -1,2 c -1,2 -3,5 -6,8 z"
-       id="path3770-9"
-       sodipodi:nodetypes="ccccccccccccccc" />
-    <path
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient3925);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-       d="m 15,55 0,6 34,0 0,-6 z"
-       id="path3781-1-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 16,57 32,0"
-       id="path3014-4"
-       inkscape:connector-curvature="0" />
+       style="fill:#edd400;fill-opacity:1;stroke:#edd400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+       d="m 7.0000007,43.994238 c 0,-25.988476 0,-25.988476 0,-25.988476"
+       id="path2-3-3" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalExtentDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalExtentDimension.svg
index a166392585..60d2299f55 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalExtentDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_VerticalExtentDimension.svg
@@ -2,907 +2,122 @@
 <!-- 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="svg249"
-   inkscape:version="0.92.4 (unknown)"
-   sodipodi:docname="TechDraw_Dimension_VExtent.svg">
-  <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="namedview91"
-     showgrid="true"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:zoom="8.03125"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer2"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3068"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <sodipodi:guide
-       position="30,50"
-       orientation="1,0"
-       id="guide661"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="2,30"
-       orientation="0,1"
-       id="guide663"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-8,2"
-       orientation="0,1"
-       id="guide4832"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="30,62"
-       orientation="0,1"
-       id="guide4834"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="62,39"
-       orientation="1,0"
-       id="guide4836"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="2,45"
-       orientation="1,0"
-       id="guide4838"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
+   id="svg4024"
+   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">
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect4816"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="repeated"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="10"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect4810"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="repeated_stretched"
-       prop_scale="1"
-       scale_y_rel="false"
-       spacing="10"
-       normal_offset="0"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <inkscape:path-effect
-       effect="skeletal"
-       id="path-effect1103"
-       is_visible="true"
-       pattern="M 0,0 H 1"
-       copytype="repeated"
-       prop_scale="0"
-       scale_y_rel="false"
-       spacing="4"
-       normal_offset="-0.2"
-       tang_offset="0"
-       prop_units="false"
-       vertical_pattern="false"
-       fuse_tolerance="0" />
-    <radialGradient
-       cx="605.71429"
-       cy="486.64789"
-       r="117.14286"
-       fx="605.71429"
-       fy="486.64789"
-       id="radialGradient5031"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)" />
-    <linearGradient
-       id="linearGradient5060">
-      <stop
-         id="stop5062"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5064"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="605.71429"
-       cy="486.64789"
-       r="117.14286"
-       fx="605.71429"
-       fy="486.64789"
-       id="radialGradient5029"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         id="stop5050"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="0" />
-      <stop
-         id="stop5056"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop5052"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507"
-       id="linearGradient5027"
-       xlink:href="#linearGradient5048"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)" />
-    <linearGradient
-       id="linearGradient4542">
-      <stop
-         id="stop4544"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4546"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.306795"
-       cy="42.07798"
-       r="15.821514"
-       fx="24.306795"
-       fy="42.07798"
-       id="radialGradient4548"
-       xlink:href="#linearGradient4542"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.284916,0,30.08928)" />
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop15666"
-         style="stop-color:#f8f8f8;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="20.892099"
-       cy="64.567902"
-       r="5.257"
-       fx="20.892099"
-       fy="64.567902"
-       id="aigrd3"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop15573"
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop15575"
-         style="stop-color:#9a9a9a;stop-opacity:1"
-         offset="1" />
-    </radialGradient>
-    <radialGradient
-       cx="20.892099"
-       cy="114.5684"
-       r="5.256"
-       fx="20.892099"
-       fy="114.5684"
-       id="aigrd2"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop15566"
-         style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop15568"
-         style="stop-color:#9a9a9a;stop-opacity:1"
-         offset="1" />
-    </radialGradient>
-    <linearGradient
-       id="linearGradient269">
-      <stop
-         id="stop270"
-         style="stop-color:#a3a3a3;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop271"
-         style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         style="stop-color:#fafafa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop261"
-         style="stop-color:#bbbbbb;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12512">
-      <stop
-         id="stop12513"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop12517"
-         style="stop-color:#fff520;stop-opacity:0.89108908"
-         offset="0.5" />
-      <stop
-         id="stop12514"
-         style="stop-color:#fff300;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="8.824419"
-       cy="3.7561285"
-       r="37.751713"
-       fx="8.824419"
-       fy="3.7561285"
-       id="radialGradient15656"
-       xlink:href="#linearGradient269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.968273,0,0,1.032767,3.4281936,-47.492271)" />
-    <radialGradient
-       cx="33.966679"
-       cy="35.736916"
-       r="86.70845"
-       fx="33.966679"
-       fy="35.736916"
-       id="radialGradient15658"
-       xlink:href="#linearGradient259"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.960493,0,0,1.041132,0.07464063,-48.138718)" />
-    <radialGradient
-       cx="8.1435566"
-       cy="7.2678967"
-       r="38.158695"
-       fx="8.1435566"
-       fy="7.2678967"
-       id="radialGradient15668"
-       xlink:href="#linearGradient15662"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.968273,0,0,1.032767,3.4281936,-47.492271)" />
-    <radialGradient
-       cx="20.892099"
-       cy="114.5684"
-       r="5.256"
-       fx="20.892099"
-       fy="114.5684"
-       id="radialGradient2283"
-       xlink:href="#aigrd2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)" />
-    <radialGradient
-       cx="20.892099"
-       cy="64.567902"
-       r="5.257"
-       fx="20.892099"
-       fy="64.567902"
-       id="radialGradient2285"
-       xlink:href="#aigrd3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)" />
-    <linearGradient
-       x1="18.971846"
-       y1="14.452502"
-       x2="44.524982"
-       y2="41.792759"
-       id="linearGradient4343"
-       xlink:href="#linearGradient3377-76"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3377-76">
-      <stop
-         id="stop3379-5"
-         style="stop-color:#faff2b;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4345"
-         style="stop-color:#fcb915;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop3381-7"
-         style="stop-color:#c68708;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="145.64697"
-       y1="79.160103"
-       x2="175.6825"
-       y2="108.75008"
-       id="linearGradient4349"
-       xlink:href="#linearGradient3377-76"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4482">
-      <stop
-         id="stop4484"
-         style="stop-color:#faff2b;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4486"
-         style="stop-color:#fcb915;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop4488"
-         style="stop-color:#c68708;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="135.38333"
-       cy="97.369568"
-       r="19.467436"
-       fx="135.38333"
-       fy="97.369568"
-       id="radialGradient4351"
-       xlink:href="#linearGradient3377"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)" />
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         id="stop3379"
-         style="stop-color:#faff2b;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3381"
-         style="stop-color:#ffaa00;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="45.883327"
-       cy="28.869568"
-       r="19.467436"
-       fx="45.883327"
-       fy="28.869568"
-       id="radialGradient4353"
-       xlink:href="#linearGradient3377"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4495">
-      <stop
-         id="stop4497"
-         style="stop-color:#faff2b;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4499"
-         style="stop-color:#ffaa00;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd2-2"
-       id="radialGradient2283-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
-       cx="20.892099"
-       cy="114.5684"
-       fx="20.892099"
-       fy="114.5684"
-       r="5.256" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
-       cx="20.892099"
-       id="aigrd2-2">
-      <stop
-         id="stop15566-3"
-         style="stop-color:#F0F0F0"
-         offset="0" />
-      <stop
-         id="stop15568-2"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </radialGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd3-1"
-       id="radialGradient2285-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
-       cx="20.892099"
-       cy="64.567902"
-       fx="20.892099"
-       fy="64.567902"
-       r="5.257" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
-       cx="20.892099"
-       id="aigrd3-1">
-      <stop
-         id="stop15573-6"
-         style="stop-color:#F0F0F0"
-         offset="0" />
-      <stop
-         id="stop15575-8"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </radialGradient>
-    <radialGradient
-       r="38.158695"
-       fy="7.2678967"
-       fx="8.1435566"
-       cy="7.2678967"
-       cx="8.1435566"
-       gradientTransform="matrix(1.2992848,0,0,1.4315068,3.2140525,-64.437909)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient15668-2"
-       xlink:href="#linearGradient15662-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient15662-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop15664-6" />
-      <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop15666-1" />
-    </linearGradient>
-    <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(1.3214205,0,0,1.4752426,-2.0839021,-66.146883)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient15658-4"
-       xlink:href="#linearGradient259-5"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient259-5">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop260-5" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop261-1" />
-    </linearGradient>
-    <radialGradient
-       r="37.751713"
-       fy="37.388847"
-       fx="3.3431637"
-       cy="37.388847"
-       cx="3.3431637"
-       gradientTransform="matrix(1.3321242,0,0,1.4633899,2.5298271,-65.230893)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient15656-7"
-       xlink:href="#linearGradient269-1"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient269-1">
-      <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop270-1" />
-      <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop271-5" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048-7"
-       id="linearGradient5027-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       id="linearGradient5048-7">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050-4" />
-      <stop
-         id="stop5056-0"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060-8"
-       id="radialGradient5029-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060-8">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062-8" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064-2" />
-    </linearGradient>
-    <radialGradient
-       r="117.14286"
-       fy="486.64789"
-       fx="605.71429"
-       cy="486.64789"
-       cx="605.71429"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3663"
-       xlink:href="#linearGradient5060-8"
-       inkscape:collect="always" />
-    <radialGradient
-       r="117.14286"
-       fy="486.64789"
-       fx="605.71429"
-       cy="486.64789"
-       cx="605.71429"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4227"
-       xlink:href="#linearGradient5060-8"
-       inkscape:collect="always" />
-  </defs>
+     id="defs4026" />
   <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:title></dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://agryson.net</dc:source>
-        <cc:license
-           rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>TechDraw_View</dc:title>
-        <dc:date>2016-01-14</dc:date>
-        <dc:relation>https://www.freecad.org/wiki/index.php?title=Artwork</dc:relation>
-        <dc:publisher>
-          <cc:Agent>
-            <dc:title>FreeCAD</dc:title>
-          </cc:Agent>
-        </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_View.svg</dc:identifier>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>FreeCAD LGPL2+</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Attribution" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-      </cc:License>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer4"
-     style="display:inline"
-     transform="translate(0,16)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="Shape" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Dim">
+     id="layer1-8"
+     transform="matrix(1.3333328,0,0,0.99999876,-10.666659,2.48e-6)">
     <g
-       id="g1689"
-       transform="translate(0.2499995,-1.3749871)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3185"
-         d="M 14.75,45.144231 V 24.221153 l 18.307692,5.230771 V 50.375 Z"
-         style="opacity:0.5;fill:#d3d7cf;fill-opacity:1;stroke:#042a2a;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3973"
-         d="M 14.75,24.221153 30.442308,16.375 48.750001,21.605769 33.057692,29.451924 Z"
-         style="opacity:0.5;fill:#d3d7cf;fill-opacity:1;stroke:#042a2a;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3975"
-         d="M 33.057692,29.451924 V 50.375 L 48.750001,42.528847 V 21.605769 Z"
-         style="opacity:0.5;fill:#babdb6;fill-opacity:1;stroke:#042a2a;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+       id="g5167-7"
+       style="display:inline"
+       transform="matrix(0.7500003,0,0,1.0000012,7.9999974,-2.4800031e-6)">
+      <g
+         transform="translate(9.25,-1.3749871)"
+         id="g1689-8">
+        <path
+           style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:#555753;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+           d="M 14.75,45.144231 V 24.221153 l 18.307692,5.230771 V 50.375 Z"
+           id="path3185-1" />
+        <path
+           style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:#555753;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="M 14.75,24.221153 30.442308,16.375 48.750001,21.605769 33.057692,29.451924 Z"
+           id="path3973-0" />
+        <path
+           style="opacity:1;fill:#d3d7cf;fill-opacity:1;stroke:#555753;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="M 33.057692,29.451924 V 50.375 L 48.750001,42.528847 V 21.605769 Z"
+           id="path3975-5" />
+      </g>
     </g>
     <g
-       id="g5259"
-       transform="rotate(90,32,32.36192)">
+       id="layer1-1"
+       transform="matrix(0,-1.3333345,0.74999937,0,8.0000221,74.666675)"
+       style="display:inline">
       <g
-         transform="translate(-20.165215,0.3521777)"
-         id="g5049">
-        <g
-           id="g4995"
-           transform="translate(0,3.8739547)">
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path4981"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path4983"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path4985"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="translate(0,3.8739547)"
-           id="g5003">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4997"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path4999"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5001"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-        <g
-           id="g5011"
-           transform="translate(0,19.193682)">
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path5005"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5007"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path5009"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="translate(0,34.513414)"
-           id="g5019">
-          <path
-             inkscape:connector-curvature="0"
-             id="path5013"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path5015"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5017"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-        <g
-           id="g5027"
-           transform="translate(0,49.833144)">
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path5021"
-             inkscape:connector-curvature="0" />
-          <path
-             inkscape:connector-curvature="0"
-             id="path5023"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             d="M 76.377432,2.0477945 V 8.2645913"
-             id="path5025"
-             inkscape:connector-curvature="0" />
-        </g>
+         id="g3-8"
+         transform="matrix(0,1.1499854,-0.86248833,0,64.774305,-4.799845)"
+         style="stroke-width:0.869577">
+        <path
+           style="fill:none;stroke:#302b00;stroke-width:6.95652;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58 H 52.000169"
+           id="path2-6" />
+        <path
+           style="fill:none;stroke:#fce94f;stroke-width:3.47831;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58 H 52.000169"
+           id="path3-6-3" />
+        <path
+           style="fill:none;stroke:#edd400;stroke-width:1.73915;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58.869556 H 52.000169"
+           id="path3" />
       </g>
       <g
-         transform="translate(-0.0910865)"
-         id="g5114">
-        <g
-           transform="translate(-68.498562,0.3521777)"
-           id="g5091">
-          <g
-             id="g5057"
-             transform="translate(0,3.8739547)">
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5051"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5053"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5055"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(0,3.8739547)"
-             id="g5065">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5059"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5061"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5063"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          </g>
-          <g
-             id="g5073"
-             transform="translate(0,19.193682)">
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5067"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5069"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5071"
-               inkscape:connector-curvature="0" />
-          </g>
-          <g
-             transform="translate(0,34.513414)"
-             id="g5081">
-            <path
-               inkscape:connector-curvature="0"
-               id="path5075"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5077"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5079"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          </g>
-          <g
-             id="g5089"
-             transform="translate(0,49.833144)">
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5083"
-               inkscape:connector-curvature="0" />
-            <path
-               inkscape:connector-curvature="0"
-               id="path5085"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               style="fill:none;fill-rule:evenodd;stroke:#c4a000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-            <path
-               style="fill:none;fill-rule:evenodd;stroke:#fce94f;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               d="M 76.377432,2.0477945 V 8.2645913"
-               id="path5087"
-               inkscape:connector-curvature="0" />
-          </g>
-        </g>
+         id="g6-5"
+         transform="matrix(-0.00199035,-1.2494242,0.72410255,-0.00121086,17.903209,114.05952)"
+         style="display:inline;stroke-width:1.04704">
+        <rect
+           style="fill:#302b00;fill-opacity:1;stroke:none;stroke-width:1.5706;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:3.45;stroke-opacity:1"
+           id="rect4-3"
+           width="26.929836"
+           height="4.8022251"
+           x="-32.932755"
+           y="77.683495"
+           transform="matrix(9.6913881e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+           rx="1.1911108"
+           ry="0.92041332" />
+        <path
+           style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.36574;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+           d="m 75.15739,7.5981756 4.733928,-8.9789824 5.105602,8.9813454 z"
+           id="path5-2" />
+        <path
+           style="display:inline;fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:1.36574;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:100;stroke-dasharray:none;stroke-dashoffset:8.71;stroke-opacity:1"
+           d="m 84.973484,31.777725 c -4.733926,8.978982 -4.733926,8.978982 -4.733926,8.978982 l -5.105603,-8.981343 z"
+           id="path5-1-9" />
+        <rect
+           style="fill:#edd400;fill-opacity:1;stroke:none;stroke-width:3.14114;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:100;stroke-dashoffset:8.71"
+           id="rect3-9"
+           width="31.072891"
+           height="2.4011114"
+           x="-35.004284"
+           y="78.884048"
+           transform="matrix(9.6914922e-4,-0.99999953,0.99999622,0.0027487,0,0)"
+           rx="2.5477815"
+           ry="1.2005539" />
+      </g>
+      <g
+         id="g5-8"
+         transform="matrix(0,1.149996,-0.8624962,0,99.274778,-4.7999348)"
+         style="stroke-width:0.869569">
+        <path
+           style="fill:#888a85;stroke:#302b00;stroke-width:6.95646;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58 H 52.000169"
+           id="path4-4" />
+        <path
+           style="fill:none;stroke:#fce94f;stroke-width:3.47828;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58 H 52.000169"
+           id="path5-7" />
+        <path
+           style="fill:#888a85;stroke:#edd400;stroke-width:1.73914;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;paint-order:fill markers stroke"
+           d="M 11.999945,58.869551 H 52.000169"
+           id="path2" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_AxoLengthDimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_AxoLengthDimension.svg
index 75bbf4f737..380b340a2c 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_AxoLengthDimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/actions/TechDraw_AxoLengthDimension.svg
@@ -1,15 +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"
    version="1.1"
    id="svg5821"
    height="64px"
-   width="64px">
+   width="64px"
+   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="defs5823">
     <linearGradient
@@ -178,7 +178,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>[WandererFan]</dc:title>
@@ -220,7 +219,7 @@
      transform="translate(2.0532964,6.9603974)"
      id="g2395">
     <path
-       style="fill:url(#linearGradient2339);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 1.116452,30.859187 H 23.283739 L 23.045821,1.4353944 28.997493,1.3164354 29.235411,28.0748 40.168497,9.3164362 44.833924,12.554354 29.949166,36.572942 1.116452,36.691901 Z"
        id="path1575" />
     <g
@@ -228,15 +227,15 @@
        transform="translate(0.59479557,-1.070632)">
       <path
          id="path3770-1"
-         d="m 46.16829,19.406804 3.175193,2.064518 -11.117219,17.615783 -3.175192,-2.064519 c 0.86541,3.950541 0.937023,7.384951 0.720164,9.502516 l -0.216858,2.117563 1.804454,-1.085304 c 1.804454,-1.085306 4.908034,-2.4552 8.805414,-3.308964 l -3.175193,-2.064518 11.117218,-17.615782 3.175193,2.064518 C 56.416054,22.682074 56.344441,19.247664 56.5613,17.130099 l 0.216857,-2.117563 -1.804453,1.085304 c -1.804455,1.085307 -4.908035,2.4552 -8.805414,3.308964 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4075);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate" />
+         d="m 46.16829,19.406804 3.175193,2.064518 -11.117219,17.615783 -3.175192,-2.064519 0.503306,11.620079 10.609868,-4.394268 -3.175193,-2.064518 11.117218,-17.615782 3.175193,2.064518 -0.503307,-11.620079 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate" />
       <path
          id="path3864"
-         d="m 54.142071,17.645379 -6.207159,2.739789"
+         d="M 54.142071,17.645379 47.97515,19.890202"
          style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          id="path3864-4"
-         d="M 36.781892,44.923666 36.720553,38.61818"
+         d="m 36.781892,44.923666 -0.79438,-6.320522"
          style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          id="path3866"
@@ -252,7 +251,7 @@
          style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          id="path3770-9"
-         d="m 46.273973,18.800417 3.402354,2.179571 -11.987638,18.712942 -3.402353,-2.179572 c 0.917088,4.186444 0.983587,7.827993 0.744389,10.074063 l -0.239196,2.246067 1.940373,-1.156282 c 1.940373,-1.156285 5.276227,-2.618264 9.462671,-3.535351 l -3.402354,-2.179571 11.987636,-18.712941 3.402354,2.179571 C 57.265122,22.24247 57.198622,18.600921 57.437819,16.354851 l 0.239197,-2.246068 -1.940373,1.156282 c -1.940374,1.156286 -5.276227,2.618264 -9.46267,3.535352 z"
+         d="m 46.273973,18.800417 3.402354,2.179571 -11.987638,18.712942 -3.402353,-2.179572 0.505193,12.32013 11.403044,-4.691633 -3.402354,-2.179571 11.987636,-18.712941 3.402354,2.179571 -0.505193,-12.320131 z"
          style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:accumulate" />
     </g>
   </g>