diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension.svg
index 2cffe8218..7999ef962 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="drawing_Dimension_Length_2.svg"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="TechDraw_Dimension.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"
@@ -82,17 +82,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="6.1640625"
+     inkscape:cx="-5.8710106"
+     inkscape:cy="27.619245"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -104,7 +104,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -113,56 +113,24 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 60.813432,22.102988 41.5336,3.0355522"
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 42.898801,2.1464844 39.993845,4.9562578 59.273142,24.024618 62.180051,21.214844 Z"
        id="path3781"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="ccccc" />
     <use
        x="0"
        y="0"
        xlink:href="#path3781"
        id="use3783"
-       transform="translate(-38.590377,38.536999)"
+       transform="translate(-38.246234,38.192856)"
        width="64"
        height="64"
        style="stroke-width:2.5;stroke-miterlimit:4;stroke-dasharray:none" />
-    <g
-       id="g3879"
-       transform="matrix(-0.5747829,0.57567373,-0.68055597,-0.67199887,71.514279,34.202746)"
-       style="stroke-width:3.96797942;stroke-miterlimit:4;stroke-dasharray:none">
-      <g
-         style="stroke-width:31.28480572;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="matrix(0.08906204,0.0898175,-0.09030957,0.08954997,43.311677,-176.85855)"
-         inkscape:export-ydpi="3.2478156"
-         inkscape:export-xdpi="3.2478156"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         id="g3360">
-        <g
-           style="stroke-width:42.69495594;stroke-miterlimit:4;stroke-dasharray:none"
-           transform="matrix(0.73012305,0,0,0.73539001,301.11628,321.34649)"
-           id="g3776">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3770"
-             d="M 960.96575,1368.3189 1266.6409,1061.8928"
-             style="fill:none;stroke:#000000;stroke-width:42.69495594;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:5.84008502;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             d="m 55.257881,8.9858817 c -2.860612,1.6927313 -6.235694,3.1365793 -9.53976,4.1654753 l 5.497728,5.282579 c 0.835452,-3.155399 2.571154,-6.504464 4.042032,-9.4480543 z"
-             id="path3772"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccc"
-             transform="matrix(7.3106737,0,0,7.3106737,871.10471,985.98778)" />
-        </g>
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3772-1"
-         d="m 11.581112,32.24167 c 2.183849,0.526502 4.384228,1.404058 6.460588,2.451909 L 17.96446,29.51498 c -1.92299,1.129204 -4.258882,2.00299 -6.383348,2.72669 z"
-         style="fill:none;stroke:#000000;stroke-width:3.96797942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path3770"
+       d="m 47.265989,14.890625 -4.908203,2.748047 c -1.470862,0.823487 -3.219643,1.465458 -5.029297,1.93164 l -2.6875,0.691407 2.681641,2.582031 -14.69336,14.830078 -2.679687,-2.603516 -0.53125,2.845704 c -0.296324,1.587602 -1.121055,3.457155 -1.867188,5.177734 l -2.220703,5.117188 4.888672,-2.640626 c 1.494516,-0.807343 3.344969,-1.480407 5.15625,-1.912109 l 2.738281,-0.652344 -2.763672,-2.685547 14.707031,-14.845703 2.759766,2.65625 0.513672,-2.849609 c 0.298355,-1.65278 1.002345,-3.507435 1.716797,-5.183594 l 2.21875,-5.207031 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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Angle.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Angle.svg
index 117748fa5..5dbfacd45 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Angle.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Angle.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="drawing_Dimension_Angle_Internal_1.svg"
+   inkscape:version="0.91 r13725"
+   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"
@@ -82,17 +82,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="6.1640625"
+     inkscape:cx="45.633843"
+     inkscape:cy="21.207264"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -105,7 +105,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -113,63 +113,15 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <g
-       id="g3879"
-       transform="matrix(-0.56220837,0.55678861,-0.75214771,-0.71716396,61.48667,50.440893)"
-       style="stroke-width:3.30894756;stroke-miterlimit:4;stroke-dasharray:none">
-      <g
-         style="stroke-width:26.08878899;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="matrix(0.08906204,0.0898175,-0.09030957,0.08954997,43.311677,-176.85855)"
-         inkscape:export-ydpi="3.2478156"
-         inkscape:export-xdpi="3.2478156"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         id="g3360">
-        <g
-           style="stroke-width:35.60385513;stroke-miterlimit:4;stroke-dasharray:none"
-           transform="matrix(0.73012305,0,0,0.73539001,301.11628,321.34649)"
-           id="g3776">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3770"
-             d="M 800.14882,1749.2634 1286.0362,1191.3711"
-             style="fill:none;stroke:#000000;stroke-width:35.60385513;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:35.60385513;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             d="m 700.42512,1101.2617 579.81248,104.3408"
-             id="path4163"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cc" />
-        </g>
-      </g>
-      <path
-         style="fill:none;stroke:#000000;stroke-width:3.30894756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m -7.1051047,38.252271 c 0.5611808,-1.717992 1.5808977,-3.489145 2.8307966,-5.185899 l -6.7740369,0.657788 c 1.5907824,1.328487 2.8714349,2.999829 3.9432403,4.528111 z"
-         id="path4151"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path4153"
-         d="M 8.565799,7.6673108 C 6.2973404,8.0505924 3.7836925,8.1411765 1.2673443,8.0394913 l 3.4702258,4.3811837 c 0.9510508,-1.694097 2.4334,-3.3279059 3.8282289,-4.7533642 z"
-         style="fill:none;stroke:#000000;stroke-width:3.30894756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
     <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path4103"
-       sodipodi:cx="31.432192"
-       sodipodi:cy="35.934093"
-       sodipodi:rx="2.1495564"
-       sodipodi:ry="2.190114"
-       d="m 33.581748,35.934093 a 2.1495564,2.190114 0 1 1 -4.299113,0 2.1495564,2.190114 0 1 1 4.299113,0 z"
-       transform="matrix(1.2146006,0,0,1.1365524,-30.917737,3.6913368)" />
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+       d="M 38.060547 3.0507812 L 8.6640625 38.164062 C 8.2603706 38.078419 7.8456029 38.03125 7.421875 38.03125 C 4.2141579 38.03125 1.4238281 40.609722 1.4238281 43.882812 C 1.4238281 47.155904 4.2141579 49.734375 7.421875 49.734375 C 8.9465977 49.734375 10.371852 49.146428 11.453125 48.183594 L 55.767578 61.253906 L 56.701172 57.410156 L 13.365234 44.628906 C 13.397655 44.384439 13.419922 44.136503 13.419922 43.882812 C 13.419922 42.395718 12.839591 41.054892 11.910156 40.03125 L 40.988281 5.296875 L 38.060547 3.0507812 z "
+       id="path3770" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 40.395437,22.144487 c 8.435619,5.9624 13.230319,13.241729 11.518378,22.874524"
-       id="path4184"
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 33.341797,16.533203 2.099609,3.320313 c 0.876979,1.386866 1.595746,3.106524 2.140625,4.923828 l 0.833985,2.779297 2.390625,-3.0625 C 47.528511,29.602486 51.208368,35.34819 50.53125,42.875 l -3.580078,-0.826172 1.148437,2.707031 c 0.653967,1.542658 1.040788,3.435007 1.322266,5.19336 l 0.621094,3.878906 2.123047,-3.306641 c 0.886294,-1.380922 2.141831,-2.757674 3.558593,-4.019531 l 2.166016,-1.931641 -4.121094,-0.949218 c 0.931018,-8.90637 -3.577813,-16.06978 -10.935547,-21.72461 l 2.490235,-3.1875 -2.939453,-0.105468 c -1.674495,-0.05926 -3.551099,-0.506136 -5.263672,-0.994141 z"
+       id="path4151"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="csccccccccccccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Diameter.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Diameter.svg
index b96b4655e..8e72e06a2 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Diameter.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Diameter.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="drawing_Dimension_Diameter_2.svg"
+   inkscape:version="0.91 r13725"
+   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"
@@ -83,16 +83,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.328125"
-     inkscape:cx="32"
+     inkscape:cx="18.7782"
      inkscape:cy="32"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -105,7 +105,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -113,52 +113,15 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <g
-       id="g3879"
-       transform="matrix(-0.72834017,-0.01324018,0.00918418,-0.95636484,55.007405,63.121085)"
-       style="stroke-width:5.00531483;stroke-miterlimit:4;stroke-dasharray:none">
-      <g
-         style="stroke-width:39.46348953;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="matrix(0.08906204,0.0898175,-0.09030957,0.08954997,43.311677,-176.85855)"
-         inkscape:export-ydpi="3.2478156"
-         inkscape:export-xdpi="3.2478156"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         id="g3360">
-        <g
-           style="stroke-width:53.85655594;stroke-miterlimit:4;stroke-dasharray:none"
-           transform="matrix(0.73012305,0,0,0.73539001,301.11628,321.34649)"
-           id="g3776">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3770"
-             d="M 960.96575,1368.3189 1266.6409,1061.8928"
-             style="fill:none;stroke:#000000;stroke-width:53.85655594;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:7.36683893;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             d="m 55.257881,8.9858817 c -2.860612,1.6927313 -6.235694,3.1365793 -9.53976,4.1654753 l 5.497728,5.282579 c 0.835452,-3.155399 2.571154,-6.504464 4.042032,-9.4480543 z"
-             id="path3772"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccc"
-             transform="matrix(7.3106737,0,0,7.3106737,871.10471,985.98778)" />
-        </g>
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3772-1"
-         d="m 11.581112,32.24167 c 2.183849,0.526502 4.384228,1.404058 6.460588,2.451909 L 17.96446,29.51498 c -1.92299,1.129204 -4.258882,2.00299 -6.383348,2.72669 z"
-         style="fill:none;stroke:#000000;stroke-width:5.00531483;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
     <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#000000;stroke-width:4.01203346;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 23.189817,25.319276 -3.337891,2.46289 c -1.103297,0.814002 -2.748739,1.502143 -4.332031,2.166016 l -4.986328,2.089844 5.095703,1.804687 c 1.347299,0.477259 2.878263,1.306532 4.236328,2.275391 l 3.292969,2.347656 0.0098,-4.519531 17.423828,0.240234 0.0078,4.552734 3.332031,-2.490234 c 1.171155,-0.875252 2.741973,-1.633536 4.244141,-2.27539 l 5.042969,-2.15625 -5.199219,-1.746094 c -1.336611,-0.44879 -2.779976,-1.224125 -4.166015,-2.173828 l -3.277344,-2.244141 0.0078,4.357422 -17.404297,-0.240235 0.0098,-4.451171 z"
+       id="path3770"
+       inkscape:connector-curvature="0" />
+    <path
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+       d="m 31.918404,4.131336 c -14.69187,0 -26.6945386,12.288839 -26.6945386,27.457289 0,15.168452 12.0026686,27.45729 26.6945386,27.45729 14.691871,0 26.696519,-12.288838 26.696519,-27.45729 0,-15.16845 -12.004648,-27.457289 -26.696519,-27.457289 z m 0,4.2806279 c 12.549346,0 22.628798,10.3811381 22.628798,23.1766611 0,12.795523 -10.079452,23.176661 -22.628798,23.176661 -12.549345,0 -22.6287974,-10.381138 -22.6287974,-23.176661 0,-12.795523 10.0794524,-23.1766611 22.6287974,-23.1766611 z"
        id="path3983"
-       sodipodi:cx="41.125477"
-       sodipodi:cy="32.486691"
-       sodipodi:rx="24.3346"
-       sodipodi:ry="23.726236"
-       d="m 65.460077,32.486691 a 24.3346,23.726236 0 1 1 -48.669201,0 24.3346,23.726236 0 1 1 48.669201,0 z"
-       transform="matrix(1.0134661,0,0,1.0670309,-9.760389,-3.0752906)" />
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Horizontal.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Horizontal.svg
index ba25b3daf..7de50d7d1 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Horizontal.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Horizontal.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="drawing_Dimension_Horizontal_2.svg"
+   inkscape:version="0.91 r13725"
+   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"
@@ -83,16 +83,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.390625"
-     inkscape:cx="32"
+     inkscape:cx="18.844893"
      inkscape:cy="32"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata5826">
@@ -102,7 +102,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -111,11 +111,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 5.8526916,16.436364 5.9901614,47.966711"
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+       d="M 8.0019531,16.427734 3.703125,16.445312 3.8398438,47.976562 8.140625,47.957031 8.0019531,16.427734 Z"
        id="path3781"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       inkscape:connector-curvature="0" />
     <use
        x="0"
        y="0"
@@ -124,42 +123,9 @@
        transform="translate(51.751572,-0.56530454)"
        width="64"
        height="64" />
-    <g
-       id="g3879"
-       transform="matrix(0.72871515,0,0,1,7.7473219,0)"
-       style="stroke-width:4.10004993;stroke-miterlimit:4;stroke-dasharray:none">
-      <g
-         style="stroke-width:32.32609136;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="matrix(0.08906204,0.0898175,-0.09030957,0.08954997,43.311677,-176.85855)"
-         inkscape:export-ydpi="3.2478156"
-         inkscape:export-xdpi="3.2478156"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         id="g3360">
-        <g
-           style="stroke-width:44.11601781;stroke-miterlimit:4;stroke-dasharray:none"
-           transform="matrix(0.73012305,0,0,0.73539001,301.11628,321.34649)"
-           id="g3776">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3770"
-             d="M 960.96575,1368.3189 1266.6409,1061.8928"
-             style="fill:none;stroke:#000000;stroke-width:37.81372955;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:6.03446681;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             d="m 55.257881,8.9858817 c -2.860612,1.6927313 -6.235694,3.1365793 -9.53976,4.1654753 l 5.497728,5.282579 c 0.835452,-3.155399 2.571154,-6.504464 4.042032,-9.4480543 z"
-             id="path3772"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccc"
-             transform="matrix(7.3106737,0,0,7.3106737,871.10471,985.98778)" />
-        </g>
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3772-1"
-         d="m 11.581112,32.24167 c 2.183849,0.526502 4.384228,1.404058 6.460588,2.451909 L 17.96446,29.51498 c -1.92299,1.129204 -4.258882,2.00299 -6.383348,2.72669 z"
-         style="fill:none;stroke:#000000;stroke-width:4.10004993;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
+    <path
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+       d="M 40.675781 25.832031 L 40.705078 30.132812 L 22.595703 30.214844 L 22.548828 25.888672 L 19.740234 28.152344 C 18.534613 29.123857 16.949707 29.952995 15.445312 30.65625 L 11.457031 32.519531 L 15.636719 33.902344 C 17.010393 34.356812 18.485133 35.154056 19.898438 36.132812 L 22.681641 38.060547 L 22.636719 33.916016 L 40.730469 33.832031 L 40.759766 38.058594 L 43.574219 35.818359 C 44.725143 34.90258 46.383599 34.15002 47.957031 33.427734 L 51.898438 31.619141 L 47.804688 30.185547 C 46.421456 29.701392 44.861937 28.854118 43.472656 27.851562 L 40.675781 25.832031 z "
+       id="path3770" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Length.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Length.svg
index 2cffe8218..47261deaa 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Length.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Length.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="drawing_Dimension_Length_2.svg"
+   inkscape:version="0.91 r13725"
+   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"
@@ -83,16 +83,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.328125"
-     inkscape:cx="32"
+     inkscape:cx="18.7782"
      inkscape:cy="32"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true" />
@@ -104,7 +104,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -113,56 +113,24 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 60.813432,22.102988 41.5336,3.0355522"
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 42.898801,2.1464841 39.993845,4.9562575 59.273142,24.024618 62.180051,21.214844 Z"
        id="path3781"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       sodipodi:nodetypes="ccccc" />
     <use
        x="0"
        y="0"
        xlink:href="#path3781"
        id="use3783"
-       transform="translate(-38.590377,38.536999)"
+       transform="translate(-38.246234,38.192856)"
        width="64"
        height="64"
        style="stroke-width:2.5;stroke-miterlimit:4;stroke-dasharray:none" />
-    <g
-       id="g3879"
-       transform="matrix(-0.5747829,0.57567373,-0.68055597,-0.67199887,71.514279,34.202746)"
-       style="stroke-width:3.96797942;stroke-miterlimit:4;stroke-dasharray:none">
-      <g
-         style="stroke-width:31.28480572;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="matrix(0.08906204,0.0898175,-0.09030957,0.08954997,43.311677,-176.85855)"
-         inkscape:export-ydpi="3.2478156"
-         inkscape:export-xdpi="3.2478156"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         id="g3360">
-        <g
-           style="stroke-width:42.69495594;stroke-miterlimit:4;stroke-dasharray:none"
-           transform="matrix(0.73012305,0,0,0.73539001,301.11628,321.34649)"
-           id="g3776">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3770"
-             d="M 960.96575,1368.3189 1266.6409,1061.8928"
-             style="fill:none;stroke:#000000;stroke-width:42.69495594;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:5.84008502;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             d="m 55.257881,8.9858817 c -2.860612,1.6927313 -6.235694,3.1365793 -9.53976,4.1654753 l 5.497728,5.282579 c 0.835452,-3.155399 2.571154,-6.504464 4.042032,-9.4480543 z"
-             id="path3772"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccc"
-             transform="matrix(7.3106737,0,0,7.3106737,871.10471,985.98778)" />
-        </g>
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3772-1"
-         d="m 11.581112,32.24167 c 2.183849,0.526502 4.384228,1.404058 6.460588,2.451909 L 17.96446,29.51498 c -1.92299,1.129204 -4.258882,2.00299 -6.383348,2.72669 z"
-         style="fill:none;stroke:#000000;stroke-width:3.96797942;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
+    <path
+       inkscape:connector-curvature="0"
+       id="path3770"
+       d="m 47.265989,14.890625 -4.908203,2.748047 c -1.470862,0.823487 -3.219643,1.465458 -5.029297,1.93164 l -2.6875,0.691407 2.681641,2.582031 -14.69336,14.830078 -2.679687,-2.603516 -0.53125,2.845704 c -0.296324,1.587602 -1.121055,3.457155 -1.867188,5.177734 l -2.220703,5.117188 4.888672,-2.640626 c 1.494516,-0.807343 3.344969,-1.480407 5.15625,-1.912109 l 2.738281,-0.652344 -2.763672,-2.685547 14.707031,-14.845703 2.759766,2.65625 0.513672,-2.849609 c 0.298355,-1.65278 1.002345,-3.507435 1.716797,-5.183594 l 2.21875,-5.207031 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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Link.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Link.svg
index dfed2dfb7..48f8409ea 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Link.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Link.svg
@@ -8,10 +8,34 @@
    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">
+   id="svg5821"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="TechDraw_Dimension_Link.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="1053"
+     id="namedview17"
+     showgrid="false"
+     inkscape:zoom="2.6074563"
+     inkscape:cx="13.817712"
+     inkscape:cy="5.3783756"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg5821" />
   <defs
      id="defs5823">
     <linearGradient
@@ -64,25 +88,12 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1">
-    <g
-       transform="translate(4.5757573,3.2121213)"
-       id="g3857">
-      <path
-         d="m 34.389742,22.363636 a 14.692772,7.4545455 0 1 1 -29.3855439,0 14.692772,7.4545455 0 1 1 29.3855439,0 z"
-         transform="matrix(0.92903945,0.86946735,-0.93039705,0.99414379,21.477496,-20.085815)"
-         id="path3067"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         d="m 34.389742,22.363636 a 14.692772,7.4545455 0 1 1 -29.3855439,0 14.692772,7.4545455 0 1 1 29.3855439,0 z"
-         transform="matrix(0.92903945,0.86946735,-0.93039705,0.99414379,38.386587,-1.0555119)"
-         id="path3067-6"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-  </g>
+  <path
+     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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+     d="M 15.097656 5.65625 C 12.490665 5.6776484 10.108583 6.4687404 8.3925781 8.3027344 C 5.7758766 11.096935 5.6797062 15.271789 7.0332031 19.341797 C 8.3867001 23.411804 11.210748 27.665842 15.201172 31.400391 C 17.892377 33.919029 20.783397 35.876872 23.654297 37.226562 C 23.753898 37.604064 23.853123 37.982328 23.978516 38.359375 C 25.329519 42.42173 28.150388 46.671625 32.136719 50.402344 C 36.12305 54.133062 40.550507 56.666873 44.693359 57.746094 C 48.836211 58.825315 52.97782 58.45393 55.580078 55.671875 C 58.183834 52.891222 58.28069 48.732277 56.929688 44.669922 C 55.578683 40.607566 52.759768 36.357671 48.773438 32.626953 C 46.108605 30.132996 43.24659 28.189021 40.404297 26.841797 C 40.299552 26.437228 40.190982 26.032875 40.056641 25.628906 C 38.703144 21.558899 35.879095 17.304862 31.888672 13.570312 C 27.898248 9.8357645 23.467059 7.2980003 19.316406 6.2167969 C 18.278743 5.946496 17.241058 5.7668798 16.226562 5.6933594 C 15.846198 5.6657944 15.470084 5.6531931 15.097656 5.65625 z M 14.972656 9.7714844 C 15.935982 9.7457361 17.041595 9.8807161 18.279297 10.203125 C 21.579834 11.062882 25.526895 13.254483 29.076172 16.576172 C 31.980883 19.294626 34.132636 22.324852 35.414062 25.111328 C 34.647278 24.947102 33.882708 24.816112 33.132812 24.761719 C 30.097828 24.541579 27.279819 25.272834 25.328125 27.359375 C 24.044316 28.730405 23.371543 30.436873 23.179688 32.300781 C 21.442654 31.259349 19.685316 29.957158 18.015625 28.394531 C 14.466348 25.072842 12.017687 21.279378 10.941406 18.042969 C 9.8651259 14.806559 10.182889 12.415191 11.398438 11.117188 C 12.005797 10.467799 12.901186 10.023275 14.056641 9.8496094 C 14.345504 9.806193 14.651548 9.7800671 14.972656 9.7714844 z M 31.878906 28.763672 C 32.84666 28.737516 33.956673 28.874086 35.197266 29.197266 C 35.699774 29.32817 36.221477 29.499668 36.75 29.691406 C 36.925458 31.538508 36.529794 32.95839 35.693359 33.851562 L 35.691406 33.853516 C 34.476685 35.152294 32.113037 35.627335 28.8125 34.767578 C 28.293259 34.632321 27.754209 34.45235 27.207031 34.251953 C 27.045253 32.42528 27.443191 31.014004 28.279297 30.121094 L 28.28125 30.121094 C 28.895006 29.464931 29.796869 29.018604 30.958984 28.84375 C 31.249513 28.800037 31.556322 28.772391 31.878906 28.763672 z M 40.859375 31.681641 C 42.59226 32.722823 44.344513 34.021606 46.009766 35.580078 C 49.562992 38.905464 52.014915 42.701346 53.09375 45.945312 C 54.172585 49.189281 53.857125 51.59654 52.628906 52.908203 C 51.401394 54.220528 49.021138 54.695789 45.712891 53.833984 C 42.404643 52.972179 38.451664 50.776557 34.898438 47.451172 C 31.996596 44.735403 29.845292 41.708828 28.560547 38.921875 C 32.443835 39.758811 36.249778 39.284954 38.699219 36.666016 C 39.993859 35.282961 40.669742 33.560666 40.859375 31.681641 z "
+     id="path3067" />
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Radius.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Radius.svg
index dbc59c91b..119f260be 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Radius.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Radius.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="drawing_Dimension_Radius_5.svg"
+   inkscape:version="0.91 r13725"
+   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"
@@ -82,17 +82,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="6.1640625"
+     inkscape:cx="39.200326"
+     inkscape:cy="31.275738"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      showguides="true"
      inkscape:guide-bbox="true"
@@ -105,7 +105,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -114,61 +114,15 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#000000;stroke-width:1.80098486;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;filter-blend-mode:normal;filter-gaussianBlur-deviation:0"
+       d="m 9.308787,3.6121737 0.088207,4.7396594 C 34.525803,7.8458094 55.217491,27.715975 55.774516,52.747299 l 4.621261,-0.110133 C 59.780374,24.982532 36.869359,3.0571811 9.308787,3.6121737 Z"
        id="path3983"
-       sodipodi:cx="41.125477"
-       sodipodi:cy="32.486691"
-       sodipodi:rx="24.3346"
-       sodipodi:ry="23.726236"
-       d="M 40.635536,8.7652635 A 24.3346,23.726236 0 0 1 65.454054,31.958849"
-       transform="matrix(1.9635567,0,0,2.0138636,-70.437693,-11.668803)"
-       sodipodi:start="4.6922541"
-       sodipodi:end="6.2609363"
-       sodipodi:open="true" />
-    <g
-       id="g4124"
-       transform="translate(-14.844106,15.81749)">
-      <g
-         style="stroke-width:3.30894756;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="matrix(-0.56220837,0.55678861,-0.75214771,-0.71716396,76.330776,34.623403)"
-         id="g3879">
-        <g
-           id="g3360"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-           inkscape:export-xdpi="3.2478156"
-           inkscape:export-ydpi="3.2478156"
-           transform="matrix(0.08906204,0.0898175,-0.09030957,0.08954997,43.311677,-176.85855)"
-           style="stroke-width:26.08878899;stroke-miterlimit:4;stroke-dasharray:none">
-          <g
-             id="g3776"
-             transform="matrix(0.73012305,0,0,0.73539001,301.11628,321.34649)"
-             style="stroke-width:35.60385513;stroke-miterlimit:4;stroke-dasharray:none">
-            <path
-               style="fill:none;stroke:#000000;stroke-width:35.60385513;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-               d="M 940.31837,1387.349 1137.0972,1189.3238"
-               id="path3770"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
-          </g>
-        </g>
-        <path
-           style="fill:none;stroke:#000000;stroke-width:3.30894756;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           d="m 3.2490566,32.106785 c 2.183849,0.526502 4.384228,1.404058 6.460588,2.451909 l -0.07724,-5.178599 c -1.92299,1.129204 -4.258882,2.00299 -6.383348,2.72669 z"
-           id="path3772-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccc" />
-      </g>
-      <path
-         transform="matrix(1.2146006,0,0,1.1365524,-7.150944,-7.9892711)"
-         d="m 33.581748,35.934093 c 0,1.209567 -0.962389,2.190114 -2.149556,2.190114 -1.187167,0 -2.149557,-0.980547 -2.149557,-2.190114 0,-1.209566 0.96239,-2.190114 2.149557,-2.190114 1.187167,0 2.149556,0.980548 2.149556,2.190114 z"
-         sodipodi:ry="2.190114"
-         sodipodi:rx="2.1495564"
-         sodipodi:cy="35.934093"
-         sodipodi:cx="31.432192"
-         id="path4103"
-         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-    </g>
+       inkscape:connector-curvature="0" />
+    <path
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 38.314453,26.087891 -3.492187,1.802734 c -1.458016,0.752768 -3.233918,1.318708 -5.091797,1.703125 l -2.841797,0.587891 2.757812,2.570312 -11.46289,11.509766 c -0.619829,-0.27242 -1.296452,-0.431641 -2.001953,-0.431641 -2.652708,0 -4.958985,2.133075 -4.958985,4.839844 0,2.706769 2.306277,4.837891 4.958985,4.83789 2.652707,0 4.960937,-2.131121 4.960937,-4.83789 0,-0.707349 -0.165095,-1.371493 -0.445312,-1.972656 l 11.511718,-11.556641 2.892578,2.695313 0.359376,-2.917969 c 0.204976,-1.662961 0.815764,-3.494682 1.451171,-5.158203 z"
+       id="path3770"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccsssscccccc" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Vertical.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Vertical.svg
index 5f11879d4..38c75310f 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Vertical.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Dimension_Vertical.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="drawing_Dimension_Vertical_2.svg"
+   inkscape:version="0.91 r13725"
+   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"
@@ -82,17 +82,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="6.1640625"
+     inkscape:cx="18.285978"
+     inkscape:cy="33.483468"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata5826">
@@ -102,7 +102,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -111,55 +111,22 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:none;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 48.131774,4.4739123 16.601426,4.6110188"
+       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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 16.305899,55.715204 0.01758,4.298828 31.53125,-0.136719 -0.01953,-4.300781 -31.529297,0.138672 z"
        id="path3781"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       inkscape:connector-curvature="0" />
     <use
        x="0"
        y="0"
        xlink:href="#path3781"
        id="use3783"
-       transform="translate(-0.40873655,54.752839)"
+       transform="translate(-0.56530464,-51.751572)"
        width="64"
        height="64" />
-    <g
-       id="g3879"
-       transform="matrix(-9.8010791e-6,0.79780546,-1,-1.0807445e-5,63.189164,5.0793914)"
-       style="stroke-width:3.91849721;stroke-miterlimit:4;stroke-dasharray:none">
-      <g
-         style="stroke-width:30.89467231;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="matrix(0.08906204,0.0898175,-0.09030957,0.08954997,43.311677,-176.85855)"
-         inkscape:export-ydpi="3.2478156"
-         inkscape:export-xdpi="3.2478156"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         id="g3360">
-        <g
-           style="stroke-width:42.16253362;stroke-miterlimit:4;stroke-dasharray:none"
-           transform="matrix(0.73012305,0,0,0.73539001,301.11628,321.34649)"
-           id="g3776">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3770"
-             d="M 960.96575,1368.3189 1266.6409,1061.8928"
-             style="fill:none;stroke:#000000;stroke-width:42.16253362;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:5.76725694;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             d="m 55.257881,8.9858817 c -2.860612,1.6927313 -6.235694,3.1365793 -9.53976,4.1654753 l 5.497728,5.282579 c 0.835452,-3.155399 2.571154,-6.504464 4.042032,-9.4480543 z"
-             id="path3772"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccc"
-             transform="matrix(7.3106737,0,0,7.3106737,871.10471,985.98778)" />
-        </g>
-      </g>
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3772-1"
-         d="m 11.581112,32.24167 c 2.183849,0.526502 4.384228,1.404058 6.460588,2.451909 L 17.96446,29.51498 c -1.92299,1.129204 -4.258882,2.00299 -6.383348,2.72669 z"
-         style="fill:none;stroke:#000000;stroke-width:3.91849721;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    </g>
+    <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;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 25.710196,23.041376 4.300781,-0.0293 0.08203,18.109375 -4.326172,0.04687 2.263672,2.808594 c 0.971513,1.205621 1.800651,2.790527 2.503906,4.294922 l 1.863281,3.988281 1.382813,-4.179688 c 0.454468,-1.373674 1.251712,-2.848414 2.230468,-4.261719 l 1.927735,-2.783203 -4.144531,0.04492 -0.08398,-18.09375 4.226563,-0.0293 -2.240235,-2.814453 c -0.915779,-1.150924 -1.668339,-2.80938 -2.390625,-4.382812 l -1.808593,-3.941407 -1.433594,4.09375 c -0.484155,1.383232 -1.331429,2.942751 -2.333985,4.332032 l -2.019531,2.796875 z"
+       id="path3770" />
   </g>
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Hatch.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Hatch.svg
index 2105766ab..b858b911a 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Hatch.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_Hatch.svg
@@ -9,10 +9,10 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    id="svg3542"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.91 r13725"
    width="64"
    height="64"
-   sodipodi:docname="cross.svg">
+   sodipodi:docname="TechDraw_Tree_Hatch.svg">
   <metadata
      id="metadata3552">
     <rdf:RDF>
@@ -21,7 +21,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -34,15 +34,15 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1366"
-     inkscape:window-height="694"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
      id="namedview3550"
      showgrid="true"
-     inkscape:zoom="5.0743655"
-     inkscape:cx="-0.94457999"
-     inkscape:cy="32.233289"
+     inkscape:zoom="2.5371828"
+     inkscape:cx="14.747882"
+     inkscape:cy="9.6668686"
      inkscape:window-x="0"
-     inkscape:window-y="25"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg3542">
     <inkscape:grid
@@ -77,30 +77,26 @@
     </pattern>
   </defs>
   <path
-     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 64,0 0,64"
-     id="path2998"
-     inkscape:connector-curvature="0" />
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+     d="M 35.394531 0 L 35.394531 34.318359 L 0 34.318359 L 0 64 L 64 64 L 64 0 L 35.394531 0 z "
+     id="rect4151" />
   <path
      style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 48,0 0,48"
+     d="M 64,0 35.57095,28.724654"
+     id="path2998"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 48,0 35.185574,12.8841"
      id="path3000"
-     inkscape:connector-curvature="0" />
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
   <path
      style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 16,64 64,16"
      id="path3002"
      inkscape:connector-curvature="0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 32,0 0,32"
-     id="path3004"
-     inkscape:connector-curvature="0" />
-  <path
-     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 16,0 0,16"
-     id="path3006"
-     inkscape:connector-curvature="0" />
   <path
      style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 64,32 32,64"
@@ -113,19 +109,22 @@
      inkscape:connector-curvature="0" />
   <path
      style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 0,0 64,64"
+     d="M 34.48883,34.279807 64,64"
      id="path3683"
-     inkscape:connector-curvature="0" />
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
   <path
      style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 16,0 64,48"
+     d="M 35.29981,19.439159 64,48"
      id="path3685"
-     inkscape:connector-curvature="0" />
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
   <path
      style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 32,0 64,32"
+     d="M 35.48372,3.274697 64,32"
      id="path3687"
-     inkscape:connector-curvature="0" />
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
   <path
      style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 48,0 64,16"
@@ -133,17 +132,31 @@
      inkscape:connector-curvature="0" />
   <path
      style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 0,16 48,64"
+     d="M 18.045671,34.254694 48,64"
      id="path3691"
-     inkscape:connector-curvature="0" />
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
   <path
      style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="M 0,32 32,64"
+     d="M 2.3689297,34.508279 32,64"
      id="path3693"
-     inkscape:connector-curvature="0" />
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
   <path
      style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
      d="M 0,48 16,64"
      id="path3695"
      inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 14.347263,34.140458 0,48"
+     id="path3000-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 29.51293,34.585605 0,64"
+     id="path2998-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
 </svg>
diff --git a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_PageTemplate.svg b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_PageTemplate.svg
index d361f14a0..fa06c284a 100644
--- a/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_PageTemplate.svg
+++ b/src/Mod/TechDraw/Gui/Resources/icons/TechDraw_Tree_PageTemplate.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg3052"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="TechDraw_new_TechDraw_Template_1.svg"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="TechDraw_Tree_PageTemplate.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Drawing/TechDraw_new_TechDraw_Template_1_16px.png"
@@ -125,17 +125,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.390625"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="8.761495"
+     inkscape:cx="22.605722"
+     inkscape:cy="23.793035"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1053"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:snap-global="false"
      showguides="true"
@@ -148,7 +148,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -157,7 +157,7 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:7,3.5;stroke-dashoffset:0"
+       style="fill:#ffffff;stroke:#000000;stroke-width:3.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:7, 3.50000000000000000;stroke-dashoffset:0;fill-opacity:1"
        d="m 3.5510719,3.9546028 56.7364441,0 0,55.5258512 -56.8171503,0 z"
        id="path3800"
        inkscape:connector-curvature="0"