diff --git a/src/Mod/Draft/Resources/icons/DraftWorkbench.svg b/src/Mod/Draft/Resources/icons/DraftWorkbench.svg
index 4e69418dd2..50019a76a8 100644
--- a/src/Mod/Draft/Resources/icons/DraftWorkbench.svg
+++ b/src/Mod/Draft/Resources/icons/DraftWorkbench.svg
@@ -7,237 +7,237 @@
    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="svg2980"
+   width="64px"
    height="64px"
-   width="64px">
+   id="svg2980"
+   version="1.1">
   <defs
      id="defs2982">
     <linearGradient
        id="linearGradient3890">
       <stop
-         id="stop3892"
+         style="stop-color:#c4a000;stop-opacity:1"
          offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
+         id="stop3892" />
       <stop
-         id="stop3894"
+         style="stop-color:#fce94f;stop-opacity:1"
          offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
+         id="stop3894" />
     </linearGradient>
     <linearGradient
        id="linearGradient3829">
       <stop
-         id="stop3831"
+         style="stop-color:#8f5902;stop-opacity:1"
          offset="0"
-         style="stop-color:#8f5902;stop-opacity:1" />
+         id="stop3831" />
       <stop
-         id="stop3833"
+         style="stop-color:#e9b96e;stop-opacity:1"
          offset="1"
-         style="stop-color:#e9b96e;stop-opacity:1" />
+         id="stop3833" />
     </linearGradient>
     <linearGradient
        id="linearGradient3803">
       <stop
-         id="stop3805"
+         style="stop-color:#d3d7cf;stop-opacity:1"
          offset="0"
-         style="stop-color:#d3d7cf;stop-opacity:1" />
+         id="stop3805" />
       <stop
-         id="stop3807"
+         style="stop-color:#eeeeec;stop-opacity:1"
          offset="1"
-         style="stop-color:#eeeeec;stop-opacity:1" />
+         id="stop3807" />
     </linearGradient>
     <linearGradient
        id="linearGradient3855">
       <stop
-         id="stop3857"
+         style="stop-color:#e9b96e;stop-opacity:1"
          offset="0"
-         style="stop-color:#e9b96e;stop-opacity:1" />
+         id="stop3857" />
       <stop
-         id="stop3859"
+         style="stop-color:#8f5902;stop-opacity:1"
          offset="1"
-         style="stop-color:#8f5902;stop-opacity:1" />
+         id="stop3859" />
     </linearGradient>
     <linearGradient
-       osb:paint="solid"
-       id="linearGradient3786">
+       id="linearGradient3786"
+       osb:paint="solid">
       <stop
-         id="stop3788"
+         style="stop-color:#a0eb07;stop-opacity:1;"
          offset="0"
-         style="stop-color:#a0eb07;stop-opacity:1;" />
+         id="stop3788" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864">
       <stop
-         style="stop-color:#71b2f8;stop-opacity:1;"
+         id="stop3866"
          offset="0"
-         id="stop3866" />
+         style="stop-color:#71b2f8;stop-opacity:1;" />
       <stop
-         style="stop-color:#002795;stop-opacity:1;"
+         id="stop3868"
          offset="1"
-         id="stop3868" />
+         style="stop-color:#002795;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(0.95198975,0,0,0.91651928,0.07298588,1.7291139)"
-       gradientUnits="userSpaceOnUse"
-       y2="63.578461"
-       x2="9.3772163"
-       y1="28.663757"
-       x1="5.1754909"
+       xlink:href="#linearGradient3855"
        id="linearGradient3863"
-       xlink:href="#linearGradient3855" />
-    <linearGradient
+       x1="5.1754909"
+       y1="28.663757"
+       x2="9.3772163"
+       y2="63.578461"
        gradientUnits="userSpaceOnUse"
-       y2="51.094166"
-       x2="60.769054"
-       y1="31.552309"
-       x1="3.9825215"
-       id="linearGradient3861-4"
+       gradientTransform="matrix(0.95198975,0,0,0.91651928,0.07298588,1.7291139)" />
+    <linearGradient
+       gradientTransform="translate(63.406413,58.258077)"
        xlink:href="#linearGradient3855-2"
-       gradientTransform="translate(63.406413,58.258077)" />
+       id="linearGradient3861-4"
+       x1="3.9825215"
+       y1="31.552309"
+       x2="60.769054"
+       y2="51.094166"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient3855-2">
       <stop
-         id="stop3857-1"
+         style="stop-color:#d07200;stop-opacity:1;"
          offset="0"
-         style="stop-color:#d07200;stop-opacity:1;" />
+         id="stop3857-1" />
       <stop
-         id="stop3859-6"
+         style="stop-color:#fcb200;stop-opacity:1;"
          offset="1"
-         style="stop-color:#fcb200;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="45.686504"
-       x2="23.852976"
-       y1="31.552309"
-       x1="3.9825215"
-       id="linearGradient3863-2"
-       xlink:href="#linearGradient3855-2" />
-    <linearGradient
-       id="linearGradient3880">
-      <stop
-         id="stop3882"
-         offset="0"
-         style="stop-color:#d07200;stop-opacity:1;" />
-      <stop
-         id="stop3884"
-         offset="1"
-         style="stop-color:#fcb200;stop-opacity:1;" />
+         id="stop3859-6" />
     </linearGradient>
     <linearGradient
        xlink:href="#linearGradient3855-2"
-       id="linearGradient3889"
-       gradientUnits="userSpaceOnUse"
+       id="linearGradient3863-2"
        x1="3.9825215"
        y1="31.552309"
        x2="23.852976"
        y2="45.686504"
-       gradientTransform="translate(63.406413,58.258077)" />
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
+       id="linearGradient3880">
+      <stop
+         style="stop-color:#d07200;stop-opacity:1;"
+         offset="0"
+         id="stop3882" />
+      <stop
+         style="stop-color:#fcb200;stop-opacity:1;"
+         offset="1"
+         id="stop3884" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(63.406413,58.258077)"
        y2="45.686504"
        x2="23.852976"
        y1="31.552309"
        x1="3.9825215"
-       gradientTransform="translate(63.406413,58.258077)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3921"
+       id="linearGradient3889"
        xlink:href="#linearGradient3855-2" />
     <linearGradient
+       xlink:href="#linearGradient3855-2"
+       id="linearGradient3921"
        gradientUnits="userSpaceOnUse"
-       y2="5"
-       x2="26"
-       y1="59"
-       x1="40"
+       gradientTransform="translate(63.406413,58.258077)"
+       x1="3.9825215"
+       y1="31.552309"
+       x2="23.852976"
+       y2="45.686504" />
+    <linearGradient
+       xlink:href="#linearGradient3803"
        id="linearGradient3809"
-       xlink:href="#linearGradient3803" />
+       x1="40"
+       y1="59"
+       x2="26"
+       y2="5"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="41"
-       x2="19"
-       y1="52"
-       x1="21"
+       xlink:href="#linearGradient3829"
        id="linearGradient3835"
-       xlink:href="#linearGradient3829" />
+       x1="21"
+       y1="52"
+       x2="19"
+       y2="41"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
-       gradientTransform="matrix(0.95198975,0,0,0.91651928,0.07298588,1.7291139)"
-       gradientUnits="userSpaceOnUse"
-       y2="63.578461"
-       x2="9.3772163"
-       y1="28.663757"
-       x1="5.1754909"
+       xlink:href="#linearGradient3855-5"
        id="linearGradient3863-7"
-       xlink:href="#linearGradient3855-5" />
+       x1="5.1754909"
+       y1="28.663757"
+       x2="9.3772163"
+       y2="63.578461"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.95198975,0,0,0.91651928,0.07298588,1.7291139)" />
     <linearGradient
        id="linearGradient3855-5">
       <stop
-         id="stop3857-3"
+         style="stop-color:#e9b96e;stop-opacity:1"
          offset="0"
-         style="stop-color:#e9b96e;stop-opacity:1" />
+         id="stop3857-3" />
       <stop
-         id="stop3859-5"
+         style="stop-color:#8f5902;stop-opacity:1"
          offset="1"
-         style="stop-color:#8f5902;stop-opacity:1" />
+         id="stop3859-5" />
     </linearGradient>
     <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="14"
-       x2="32"
-       y1="38"
-       x1="37"
+       xlink:href="#linearGradient3890"
        id="linearGradient3896"
-       xlink:href="#linearGradient3890" />
+       x1="37"
+       y1="38"
+       x2="32"
+       y2="14"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <g
      id="layer1">
     <rect
-       y="3"
-       x="13"
-       height="58"
-       width="48"
+       style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect3783"
-       style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       width="48"
+       height="58"
+       x="13"
+       y="3" />
     <path
-       id="path3010"
+       style="fill:url(#linearGradient3863);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="m 7,27 -4,4 0,24 4,4 4,0 0,-32 z"
-       style="fill:url(#linearGradient3863);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       id="path3010" />
     <rect
-       y="5"
-       x="15"
-       height="54"
-       width="44"
+       style="fill:none;stroke:#ffffff;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        id="rect3783-3"
-       style="fill:none;stroke:#ffffff;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       width="44"
+       height="54"
+       x="15"
+       y="5" />
     <path
-       id="path3782"
+       style="fill:url(#linearGradient3896);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="m 27,5 0,32 24,0 z m 6,18 6,8 -6,0 z"
-       style="fill:url(#linearGradient3896);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       id="path3782" />
     <path
-       id="path3010-6"
+       style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 8,29 5,31.85285 5,54.171675 7.8160622,57 9,57 9,29 z"
-       style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       id="path3010-6" />
     <path
-       id="path3012"
+       style="fill:url(#linearGradient3835);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 57,39 55,45 5,50 5,39 z"
-       style="fill:url(#linearGradient3835);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       id="path3012" />
     <path
-       id="path3012-6"
+       style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 54.220725,41 53.465976,43.178411 6.9877375,47.816062 7,41 z"
-       style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       id="path3012-6" />
     <path
-       id="path3782-2"
+       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="m 29,11 0,24 18,0 z"
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       id="path3782-2" />
   </g>
   <metadata
      id="metadata6050">
diff --git a/src/Mod/Draft/Resources/icons/Draft_2DShapeView.svg b/src/Mod/Draft/Resources/icons/Draft_2DShapeView.svg
index 2886227e5e..fb1b0be2cb 100644
--- a/src/Mod/Draft/Resources/icons/Draft_2DShapeView.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_2DShapeView.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,343 +6,257 @@
    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"
+   version="1.1"
    id="svg2766"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_2DShapeView.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2768">
     <linearGradient
        id="linearGradient3787">
       <stop
-         id="stop3789"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3789" />
       <stop
-         id="stop3791"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3791" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864">
       <stop
-         id="stop3866"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866" />
       <stop
-         id="stop3868"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868" />
     </linearGradient>
-    <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="perspective2774" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3181"
-       gradientUnits="userSpaceOnUse"
-       x1="581.26331"
-       y1="126.79625"
-       x2="609.54919"
+       gradientTransform="matrix(1.0614931,0,0,1,-540.96941,-73.37642)"
        y2="100.10708"
-       gradientTransform="matrix(1.0614931,0,0,1,-540.96941,-73.37642)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3184"
+       x2="609.54919"
+       y1="126.79625"
+       x1="581.26331"
        gradientUnits="userSpaceOnUse"
+       id="linearGradient3181"
+       xlink:href="#linearGradient3864" />
+    <linearGradient
+       y2="92.711899"
+       x2="626.31323"
+       y1="92.711899"
+       x1="605.94659"
        gradientTransform="matrix(-0.72140579,0.77867919,-0.73356972,-0.67961421,545.35072,-389.46656)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3184"
+       xlink:href="#linearGradient3864" />
+    <linearGradient
+       id="linearGradient3864-0">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3866-6" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3868-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3864-0"
+       id="linearGradient3217"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0,0,1,-643.22843,-82.445766)"
        x1="605.94659"
        y1="92.711899"
        x2="626.31323"
        y2="92.711899" />
     <linearGradient
-       id="linearGradient3864-0">
+       y2="92.711899"
+       x2="626.31323"
+       y1="92.711899"
+       x1="605.94659"
+       gradientTransform="matrix(1.1915091,0,0,1,-772.13265,-84.532596)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3184-4-0"
+       xlink:href="#linearGradient3864-0-2" />
+    <linearGradient
+       id="linearGradient3864-0-2">
       <stop
-         id="stop3866-6"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-8" />
       <stop
-         id="stop3868-2"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-3" />
     </linearGradient>
     <linearGradient
        y2="92.711899"
        x2="626.31323"
        y1="92.711899"
        x1="605.94659"
-       gradientTransform="matrix(1.0614931,0,0,1,-643.22843,-82.445766)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3217"
-       xlink:href="#linearGradient3864-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2"
-       id="linearGradient3184-4-0"
-       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1915091,0,0,1,-772.13265,-84.532596)"
-       x1="605.94659"
-       y1="92.711899"
-       x2="626.31323"
-       y2="92.711899" />
-    <linearGradient
-       id="linearGradient3864-0-2">
-      <stop
-         id="stop3866-6-8"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3868-2-3"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-9"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3184-4-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1915091,0,0,1,-772.13265,-84.532596)"
-       x1="605.94659"
-       y1="92.711899"
-       x2="626.31323"
-       y2="92.711899" />
+       xlink:href="#linearGradient3864-0-9" />
     <linearGradient
        id="linearGradient3864-0-9">
       <stop
-         id="stop3866-6-9"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9" />
       <stop
-         id="stop3868-2-4"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.0614931,0.54122665,0,1,-692.52246,-451.18305)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4054-6"
        xlink:href="#linearGradient3864-0-9-5"
-       inkscape:collect="always" />
+       id="linearGradient4054-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0.54122665,0,1,-692.52246,-451.18305)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
     <linearGradient
        id="linearGradient3864-0-9-5">
       <stop
-         id="stop3866-6-9-0"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9-0" />
       <stop
-         id="stop3868-2-4-0"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4-0" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4090"
        xlink:href="#linearGradient3864-0-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
+       id="linearGradient4090"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4090-6"
+       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-9-5-0"
-       inkscape:collect="always" />
+       id="linearGradient4090-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
     <linearGradient
        id="linearGradient3864-0-9-5-0">
       <stop
-         id="stop3866-6-9-0-2"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9-0-2" />
       <stop
-         id="stop3868-2-4-0-5"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4-0-5" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(0.80817481,0.4120665,0,0.76135663,-517.34974,-304.44262)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4124"
        xlink:href="#linearGradient3864-0-9-5-0"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.5385683,-0.86055196,0,0.96535888,-879.38043,517.26249)"
+       id="linearGradient4124"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4018-2"
+       gradientTransform="matrix(0.80817481,0.4120665,0,0.76135663,-517.34974,-304.44262)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-2-2"
-       inkscape:collect="always" />
+       id="linearGradient4018-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5385683,-0.86055196,0,0.96535888,-879.38043,517.26249)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
        id="linearGradient3864-0-2-2">
       <stop
-         id="stop3866-6-8-9"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-8-9" />
       <stop
-         id="stop3868-2-3-2"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-3-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-1"
-       id="linearGradient4073-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7401,-396.04414)"
-       x1="663.32715"
-       y1="114.56509"
+       y2="48.117603"
        x2="709.04407"
-       y2="48.117603" />
+       y1="114.56509"
+       x1="663.32715"
+       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7401,-396.04414)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4073-8"
+       xlink:href="#linearGradient3864-0-1" />
     <linearGradient
        id="linearGradient3864-0-1">
       <stop
-         id="stop3866-6-2"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-2" />
       <stop
-         id="stop3868-2-47"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-47" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7628,-417.24568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4054-8"
        xlink:href="#linearGradient3864-0-9-6"
-       inkscape:collect="always" />
+       id="linearGradient4054-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7628,-417.24568)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
     <linearGradient
        id="linearGradient3864-0-9-6">
       <stop
-         id="stop3866-6-9-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9-3" />
       <stop
-         id="stop3868-2-4-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4-7" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.0339511"
-     inkscape:cx="-0.43255474"
-     inkscape:cy="43.015355"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3033"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       color="#dd0037"
-       opacity="0.1254902"
-       empcolor="#df0039"
-       empopacity="0.25098039" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3035"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 33,35 5,49 33,59 59,45 z m 0,5 16,6 -16,8 -17,-6 z"
        id="rect3200-5-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccc" />
+       d="M 33,35 5,49 33,59 59,45 z m 0,5 16,6 -16,8 -17,-6 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 5,15 33,23 33,45 5,37 z"
        id="rect3200"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 5,15 33,23 33,45 5,37 z"
+       style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:#204a87;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 33,23 59,11 59,31 33,45 z"
        id="rect3200-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 33,23 59,11 59,31 33,45 z"
+       style="color:#000000;fill:#204a87;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 32,3 59,11 33,23 5,15 z"
        id="rect3200-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 32,3 59,11 33,23 5,15 z"
+       style="color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 7,17.640625 0,17.882813 23.992188,6.828125 0.02344,-17.835938 z"
        id="path3805"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="m 7,17.640625 0,17.882813 23.992188,6.828125 0.02344,-17.835938 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#3465a4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 35,24.257812 0,17.390625 22,-11.84375 0.0078,-15.687499 z"
        id="path3807"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="m 35,24.257812 0,17.390625 22,-11.84375 0.0078,-15.687499 z"
+       style="fill:none;stroke:#3465a4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
   <metadata
      id="metadata57">
@@ -354,7 +266,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_2DShapeView</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_AddPoint.svg b/src/Mod/Draft/Resources/icons/Draft_AddPoint.svg
index d48a54c6a9..f441cdd468 100644
--- a/src/Mod/Draft/Resources/icons/Draft_AddPoint.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_AddPoint.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,463 +6,330 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_AddPoint.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5225"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96" />
       <stop
-         id="stop3148-4"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3850"
-       x1="164.4444"
-       y1="161.22015"
-       x2="154.4444"
-       y2="131.22015"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3922"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="131.22015"
+       x2="154.4444"
+       y1="161.22015"
+       x1="164.4444"
+       id="linearGradient3850"
+       xlink:href="#linearGradient3836" />
+    <linearGradient
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.510205"
-     inkscape:cx="16.144505"
-     inkscape:cy="33.025712"
-     inkscape:current-layer="g3906"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3054"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3056"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       color="#ff0000"
-       opacity="0.1254902"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       transform="translate(-127.44439,-128.22016)"
-       id="g5199">
+       id="g5199"
+       transform="translate(-127.44439,-128.22016)">
       <path
-         style="color:#000000;fill:url(#linearGradient3850);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 154.44439,131.22016 0,10 -10,0 0,10 10,0 0,10 10,0 0,-10 10,0 0,-10 -10,0 0,-10 z"
          id="rect3558"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         d="m 154.44439,131.22016 0,10 -10,0 0,10 10,0 0,10 10,0 0,-10 10,0 0,-10 -10,0 0,-10 z"
+         style="color:#000000;fill:url(#linearGradient3850);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
-         id="g3912"
-         transform="translate(0,-21)">
+         transform="translate(0,-21)"
+         id="g3912">
         <g
-           transform="translate(0,31)"
-           id="g3856">
+           id="g3856"
+           transform="translate(0,31)">
           <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="rect3852"
-             width="58"
-             height="6"
-             x="3"
+             transform="translate(127.44439,128.22016)"
              y="37"
-             transform="translate(127.44439,128.22016)" />
+             x="3"
+             height="6"
+             width="58"
+             id="rect3852"
+             style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 59,41 5,41"
+             transform="translate(127.44439,128.22016)"
              id="path3854"
-             inkscape:connector-curvature="0"
-             transform="translate(127.44439,128.22016)" />
+             d="M 59,41 5,41"
+             style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
         <g
-           style="stroke:#3465a4;stroke-width:0.8096711"
+           transform="matrix(1.2349522,0.01894995,-0.0189508,1.2348959,-7.1881028,-111.34439)"
            id="g4312"
-           transform="matrix(1.2349522,0.01894995,-0.0189508,1.2348959,-7.1881028,-111.34439)">
+           style="stroke:#3465a4;stroke-width:0.8096711">
           <g
-             style="stroke:#3465a4;stroke-width:0.8096711"
+             id="g4248"
              transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
-             id="g4248">
+             style="stroke:#3465a4;stroke-width:0.8096711">
             <g
-               transform="translate(-3.7314339,-3.2817175)"
+               style="stroke-width:0.8096711"
                id="g3906"
-               style="stroke-width:0.8096711">
+               transform="translate(-3.7314339,-3.2817175)">
               <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z"
                  id="path4250"
-                 d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z" />
+                 style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
               <path
-                 inkscape:connector-curvature="0"
-                 style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z"
                  id="path4250-7"
-                 d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z" />
+                 style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
             </g>
           </g>
         </g>
       </g>
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 19,15 10,0 0,-10 6,0 0,10 10,0 0,6 -10,0 0,10 -6,0 0,-10 -10,0 z"
+         transform="translate(127.44439,128.22016)"
          id="path3826"
-         inkscape:connector-curvature="0"
-         transform="translate(127.44439,128.22016)" />
+         d="m 19,15 10,0 0,-10 6,0 0,10 10,0 0,6 -10,0 0,10 -6,0 0,-10 -10,0 z"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
   </g>
   <metadata
@@ -475,7 +340,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_AddPoint</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_AddToGroup.svg b/src/Mod/Draft/Resources/icons/Draft_AddToGroup.svg
index 8186adfbf5..23fdaea2e1 100644
--- a/src/Mod/Draft/Resources/icons/Draft_AddToGroup.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_AddToGroup.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,441 +6,329 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_AddToGroup.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="140.22731"
-       x2="434.73947"
-       y1="185.1304"
-       x1="394.15784"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5087"
        xlink:href="#linearGradient4247"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       id="linearGradient5087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
+       x1="394.15784"
+       y1="185.1304"
+       x2="434.73947"
+       y2="140.22731" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.176431"
-     inkscape:cx="0.12428227"
-     inkscape:cy="33.848957"
-     inkscape:current-layer="g4670"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3050"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       transform="translate(-259.85207,-132.78349)"
+       style="fill:none;stroke:#2e3436"
        id="g4670"
-       style="fill:none;stroke:#2e3436">
+       transform="translate(-259.85207,-132.78349)">
       <path
-         sodipodi:nodetypes="ccc"
-         id="path5098-3"
-         d="m 270.85207,145.78349 0,42 12,0"
          style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
+         d="m 270.85207,145.78349 0,42 12,0"
+         id="path5098-3" />
       <path
-         id="path5100-6"
-         d="m 282.85207,155.78349 -12,0"
          style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         sodipodi:nodetypes="ccc"
-         transform="translate(0,-60)"
-         id="path5098"
-         d="m 270.85207,205.78349 0,42 12,0"
-         style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path5100"
          d="m 282.85207,155.78349 -12,0"
+         id="path5100-6" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 270.85207,205.78349 0,42 12,0"
+         id="path5098"
+         transform="translate(0,-60)" />
+      <path
          style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="m 282.85207,155.78349 -12,0"
+         id="path5100" />
       <rect
-         ry="0"
-         rx="0"
-         y="135.78349"
-         x="262.85208"
-         height="10"
-         width="37.999989"
+         style="color:#000000;fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect4258-1-7-4"
-         style="color:#000000;fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         ry="0"
-         rx="0"
-         y="183.78349"
-         x="282.85208"
-         height="9.9999943"
          width="37.999989"
-         id="rect4258-1-7-4-3"
-         style="color:#000000;fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         ry="0"
-         rx="0"
-         y="151.78349"
-         x="282.85208"
-         height="10.000002"
-         width="37.999989"
-         id="rect4258-1-7-4-6"
-         style="color:#000000;fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         ry="0"
-         rx="0"
-         y="167.78349"
-         x="276.85208"
          height="10"
+         x="262.85208"
+         y="135.78349"
+         rx="0"
+         ry="0" />
+      <rect
+         style="color:#000000;fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4258-1-7-4-3"
          width="37.999989"
+         height="9.9999943"
+         x="282.85208"
+         y="183.78349"
+         rx="0"
+         ry="0" />
+      <rect
+         style="color:#000000;fill:#eeeeec;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4258-1-7-4-6"
+         width="37.999989"
+         height="10.000002"
+         x="282.85208"
+         y="151.78349"
+         rx="0"
+         ry="0" />
+      <rect
+         style="color:#000000;fill:#3465a4;stroke:#0b1521;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect4258-1-7-4-7"
-         style="color:#000000;fill:#3465a4;stroke:#0b1521;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         width="37.999989"
+         height="10"
+         x="276.85208"
+         y="167.78349"
+         rx="0"
+         ry="0" />
       <rect
-         style="fill:#3465a4;fill-opacity:1;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect3852"
-         width="34"
-         height="6"
+         y="169.78349"
          x="278.85208"
-         y="169.78349" />
+         height="6"
+         width="34"
+         id="rect3852"
+         style="fill:#3465a4;fill-opacity:1;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <rect
-         style="fill:#d3d7cf;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         y="153.78349"
+         x="284.85208"
+         height="6"
+         width="34"
          id="rect3852-5"
-         width="34"
-         height="6"
-         x="284.85208"
-         y="153.78349" />
+         style="fill:#d3d7cf;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <rect
-         style="fill:#d3d7cf;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect3852-5-3"
-         width="34"
-         height="6"
+         y="137.78349"
          x="264.85208"
-         y="137.78349" />
-      <rect
-         style="fill:#d3d7cf;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect3852-5-5"
-         width="34"
          height="6"
+         width="34"
+         id="rect3852-5-3"
+         style="fill:#d3d7cf;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="185.78349"
          x="284.85208"
-         y="185.78349" />
+         height="6"
+         width="34"
+         id="rect3852-5-5"
+         style="fill:#d3d7cf;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
   </g>
   <metadata
@@ -453,7 +339,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_AddToGroup</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Apply.svg b/src/Mod/Draft/Resources/icons/Draft_Apply.svg
index d6860c6035..d0538de359 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Apply.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Apply.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,231 +6,145 @@
    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"
+   version="1.1"
    id="svg3188"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Apply.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs3190">
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3354">
       <stop
-         style="stop-color:#2157c7;stop-opacity:1;"
+         id="stop3356"
          offset="0"
-         id="stop3356" />
+         style="stop-color:#2157c7;stop-opacity:1;" />
       <stop
-         style="stop-color:#6daaff;stop-opacity:1;"
+         id="stop3358"
          offset="1"
-         id="stop3358" />
+         style="stop-color:#6daaff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3354"
-       id="linearGradient3599"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0083598,0,0,0.712664,-29.601181,398.25477)"
+       y2="1162.2943"
+       x2="2638.95"
+       y1="1162.2943"
        x1="2392.2313"
-       y1="1162.2943"
-       x2="2638.95"
-       y2="1162.2943" />
-    <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="perspective3196" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3354-6"
-       id="linearGradient2996-3"
+       gradientTransform="matrix(1.0083598,0,0,0.712664,-29.601181,398.25477)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.15768287,0,0,0.15089213,-357.22613,-145.08225)"
-       x1="2392.2312"
-       y1="1162.2943"
+       id="linearGradient3599"
+       xlink:href="#linearGradient3354" />
+    <linearGradient
+       y2="1162.2943"
        x2="2638.95"
-       y2="1162.2943" />
+       y1="1162.2943"
+       x1="2392.2312"
+       gradientTransform="matrix(0.15768287,0,0,0.15089213,-357.22613,-145.08225)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2996-3"
+       xlink:href="#linearGradient3354-6" />
     <linearGradient
        id="linearGradient3354-6">
       <stop
-         style="stop-color:#2157c7;stop-opacity:1;"
+         id="stop3356-0"
          offset="0"
-         id="stop3356-0" />
+         style="stop-color:#2157c7;stop-opacity:1;" />
       <stop
-         style="stop-color:#6daaff;stop-opacity:1;"
+         id="stop3358-6"
          offset="1"
-         id="stop3358-6" />
+         style="stop-color:#6daaff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3909"
-       x1="43"
-       y1="22"
-       x2="48"
+       gradientUnits="userSpaceOnUse"
        y2="44"
-       gradientUnits="userSpaceOnUse" />
+       x2="48"
+       y1="22"
+       x1="43"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3895" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.1185514"
-     inkscape:cx="14.56806"
-     inkscape:cy="32.35741"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2995"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <rect
-       style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.08138323000000014;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2364"
-       width="28"
-       height="58"
-       x="3"
        y="3"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       x="3"
+       height="58"
+       width="28"
+       id="rect2364"
+       style="fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.08138323000000014;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
-       style="fill:none;stroke:#172a04;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3341"
-       width="20"
-       height="8.0000019"
-       x="7"
        y="49"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       x="7"
+       height="8.0000019"
+       width="20"
+       id="rect3341"
+       style="fill:none;stroke:#172a04;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
-       style="fill:#73d216;stroke:#8ae234;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3341-3"
-       width="16"
-       height="3.9999986"
-       x="9"
        y="51"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       x="9"
+       height="3.9999986"
+       width="16"
+       id="rect3341-3"
+       style="fill:#73d216;stroke:#8ae234;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
-       style="fill:none;stroke:#0b1521;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3341-9"
-       width="20"
-       height="8.0000019"
-       x="7"
        y="35"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       x="7"
+       height="8.0000019"
+       width="20"
+       id="rect3341-9"
+       style="fill:none;stroke:#0b1521;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
-       style="fill:#3465a4;stroke:#729fcf;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3341-3-1"
-       width="16"
-       height="3.9999986"
-       x="9"
        y="37"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       x="9"
+       height="3.9999986"
+       width="16"
+       id="rect3341-3-1"
+       style="fill:#3465a4;stroke:#729fcf;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
-       style="fill:none;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3341-2"
-       width="20"
-       height="8.0000019"
-       x="7"
        y="21"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <rect
-       style="fill:#edd400;stroke:#fce94f;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3341-3-7"
-       width="16"
-       height="3.9999986"
-       x="9"
-       y="23"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <rect
-       style="fill:none;stroke:#280000;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3341-0"
-       width="20"
-       height="8.0000019"
        x="7"
-       y="7"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       height="8.0000019"
+       width="20"
+       id="rect3341-2"
+       style="fill:none;stroke:#302b00;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
-       style="fill:#cc0000;stroke:#ef2929;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3341-3-9"
-       width="16"
-       height="3.9999986"
+       y="23"
        x="9"
+       height="3.9999986"
+       width="16"
+       id="rect3341-3-7"
+       style="fill:#edd400;stroke:#fce94f;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       y="7"
+       x="7"
+       height="8.0000019"
+       width="20"
+       id="rect3341-0"
+       style="fill:none;stroke:#280000;stroke-width:2;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
        y="9"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       x="9"
+       height="3.9999986"
+       width="16"
+       id="rect3341-3-9"
+       style="fill:#cc0000;stroke:#ef2929;stroke-width:2;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3909);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 43,15 0,10 -22,0 0,14 22,0 0,10 18,-17 z"
        id="path3343"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 43,15 0,10 -22,0 0,14 22,0 0,10 18,-17 z"
+       style="fill:url(#linearGradient3909);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 45.006611,19.642998 45,27 l -22,0 0,10 22,0 -0.0066,7.357002 L 58,32 z"
        id="path3343-2"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 45.006611,19.642998 45,27 l -22,0 0,10 22,0 -0.0066,7.357002 L 58,32 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <metadata
      id="metadata3231">
@@ -242,7 +154,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Apply</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Arc.svg b/src/Mod/Draft/Resources/icons/Draft_Arc.svg
index f0e91bde61..0d7d6b05a7 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Arc.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Arc.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,231 +6,165 @@
    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"
+   version="1.1"
    id="svg2869"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Arc.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2871">
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2368"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2877" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
-       x2="-22"
-       y2="5" />
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-9"
-       id="linearGradient3801-7"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-7"
+       xlink:href="#linearGradient3836-9" />
     <linearGradient
        id="linearGradient3836-9">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-8"
          offset="0"
-         id="stop3838-8" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-1"
          offset="1"
-         id="stop3840-1" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.8389122"
-     inkscape:cx="3.141655"
-     inkscape:cy="31.818576"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3002"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3401"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
-       inkscape:export-xdpi="6.7480335"
-       inkscape:export-ydpi="6.7480335"
-       transform="matrix(0.146567,0,0,0.146567,96.1836,-71.115448)">
+       transform="matrix(0.146567,0,0,0.146567,96.1836,-71.115448)"
+       id="g3401">
       <g
          id="g3389">
         <path
-           style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:butt;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"
-           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
            id="path2380"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsccsc" />
+           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+           style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:butt;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
-           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 10.999999,13 C 32,13 49,32 49,48"
-           id="path3892"
-           inkscape:connector-curvature="0"
            transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
-           sodipodi:nodetypes="cc" />
+           id="path3892"
+           d="M 10.999999,13 C 32,13 49,32 49,48"
+           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       </g>
     </g>
     <g
-       id="g3827"
-       transform="translate(2,-2)">
+       transform="translate(2,-2)"
+       id="g3827">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797">
+         id="g3797"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
     <g
-       transform="translate(40,-2)"
-       id="g3827-0">
+       id="g3827-0"
+       transform="translate(40,-2)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-7">
+         id="g3797-7"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-6"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-0"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
     <g
-       transform="translate(2.005735,-40)"
-       id="g3827-1">
+       id="g3827-1"
+       transform="translate(2.005735,-40)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9">
+         id="g3797-9"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
   </g>
@@ -244,7 +176,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Arc</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Arc_3Points.svg b/src/Mod/Draft/Resources/icons/Draft_Arc_3Points.svg
index 33c198785c..6a4a0fc691 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Arc_3Points.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Arc_3Points.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,233 +6,165 @@
    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"
+   version="1.1"
    id="svg2869"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="BIM_Arc_3Points.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2871">
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2368"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2877" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3801"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
-       x2="-22"
-       y2="5" />
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-9"
-       id="linearGradient3801-7"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-7"
+       xlink:href="#linearGradient3836-9" />
     <linearGradient
        id="linearGradient3836-9">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-8"
          offset="0"
-         id="stop3838-8" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-1"
          offset="1"
-         id="stop3840-1" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.8389122"
-     inkscape:cx="33.848293"
-     inkscape:cy="31.087466"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1360"
-     inkscape:window-height="739"
-     inkscape:window-x="1920"
-     inkscape:window-y="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3002"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1"
-       spacingy="1"
-       originx="0"
-       originy="0" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3401"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
-       inkscape:export-xdpi="6.7480335"
-       inkscape:export-ydpi="6.7480335"
-       transform="matrix(0.146567,0,0,0.146567,96.1836,-71.115448)">
+       transform="matrix(0.146567,0,0,0.146567,96.1836,-71.115448)"
+       id="g3401">
       <g
          id="g3389">
         <path
-           style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:butt;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"
-           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
            id="path2380"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsccsc" />
+           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+           style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:butt;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
-           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 10.999999,13 C 32,13 49,32 49,48"
-           id="path3892"
-           inkscape:connector-curvature="0"
            transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
-           sodipodi:nodetypes="cc" />
+           id="path3892"
+           d="M 10.999999,13 C 32,13 49,32 49,48"
+           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       </g>
     </g>
     <g
-       id="g3827"
-       transform="translate(29.311457,-29.463877)">
+       transform="translate(29.311457,-29.463877)"
+       id="g3827">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797">
+         id="g3797"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 Z"
            id="path4250"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 Z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 Z"
            id="path4250-7"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 Z" />
+           style="fill:url(#linearGradient3801);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
     </g>
     <g
-       transform="translate(40,-2)"
-       id="g3827-0">
+       id="g3827-0"
+       transform="translate(40,-2)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-7">
+         id="g3797-7"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-6"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-0"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
     <g
-       transform="translate(2.005735,-40)"
-       id="g3827-1">
+       id="g3827-1"
+       transform="translate(2.005735,-40)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9">
+         id="g3797-9"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Array.svg b/src/Mod/Draft/Resources/icons/Draft_Array.svg
index f686635e52..a6656b9979 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Array.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Array.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,495 +6,419 @@
    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="Draft_Array.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Draft_wb_primitives/Draft_Array/Draft_Array_Ortho_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   id="svg5821"
+   height="64px"
+   width="64px">
   <defs
      id="defs5823">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793"
          offset="0"
-         id="stop3793" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795"
          offset="1"
-         id="stop3795" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6351"
          offset="0"
-         id="stop6351" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6353"
          offset="1"
-         id="stop6353" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#0019a3;stop-opacity:1;" />
       <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#0069ff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
        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" />
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3377" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
+       r="194.40614"
+       fy="1424.4465"
+       fx="1103.6399"
+       cy="1424.4465"
+       cx="1103.6399"
+       id="radialGradient6355"
+       xlink:href="#linearGradient6349" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3797"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3797-3"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7"
          offset="0"
-         id="stop3793-7" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5"
          offset="1"
-         id="stop3795-5" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6"
-       id="linearGradient3820"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3834"
-       xlink:href="#linearGradient3791-6"
-       inkscape:collect="always" />
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3820"
+       xlink:href="#linearGradient3791-6" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-7"
-       id="linearGradient3797-3-2"
+       xlink:href="#linearGradient3791-6"
+       id="linearGradient3834"
+       gradientUnits="userSpaceOnUse"
        x1="939.98767"
        y1="1097.5122"
        x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       y2="989.77716" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-3-2"
+       xlink:href="#linearGradient3791-6-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6-7">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7-0"
          offset="0"
-         id="stop3793-7-0" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5-9"
          offset="1"
-         id="stop3795-5-9" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834-3"
        xlink:href="#linearGradient3791-6-7"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-0"
-       id="linearGradient3797-6"
+       id="linearGradient3834-3"
+       gradientUnits="userSpaceOnUse"
        x1="939.98767"
        y1="1097.5122"
        x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       y2="989.77716" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-6"
+       xlink:href="#linearGradient3791-0" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-0">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-6"
          offset="0"
-         id="stop3793-6" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-2"
          offset="1"
-         id="stop3795-2" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-0"
-       id="linearGradient3896"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3916"
-       xlink:href="#linearGradient3791-0"
-       inkscape:collect="always" />
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3896"
+       xlink:href="#linearGradient3791-0" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-9"
-       id="linearGradient3797-3-28"
+       xlink:href="#linearGradient3791-0"
+       id="linearGradient3916"
+       gradientUnits="userSpaceOnUse"
        x1="939.98767"
        y1="1097.5122"
        x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       y2="989.77716" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-3-28"
+       xlink:href="#linearGradient3791-6-9" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6-9">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7-7"
          offset="0"
-         id="stop3793-7-7" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5-3"
          offset="1"
-         id="stop3795-5-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834-6"
        xlink:href="#linearGradient3791-6-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-2"
-       id="linearGradient3797-1"
+       id="linearGradient3834-6"
+       gradientUnits="userSpaceOnUse"
        x1="939.98767"
        y1="1097.5122"
        x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       y2="989.77716" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-1"
+       xlink:href="#linearGradient3791-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-2">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-9"
          offset="0"
-         id="stop3793-9" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-3"
          offset="1"
-         id="stop3795-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-2"
-       id="linearGradient3896-1"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3916-9"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3896-1"
+       xlink:href="#linearGradient3791-2" />
+    <linearGradient
        xlink:href="#linearGradient3791-2"
-       inkscape:collect="always" />
+       id="linearGradient3916-9"
+       gradientUnits="userSpaceOnUse"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.299484"
-     inkscape:cx="35.198497"
-     inkscape:cy="28.284232"
-     inkscape:current-layer="g3360"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3010"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <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.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)"
+       id="g3360">
       <g
          id="g3799">
         <g
            id="g3956">
           <g
-             id="g3812"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0"
+             style="fill:url(#linearGradient3797);stroke:#729fcf;stroke-width:11.82571345000000029;stroke-opacity:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:miter;fill-opacity:1"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797);stroke:#729fcf;stroke-width:11.82571345000000029;stroke-opacity:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:miter;fill-opacity:1">
+             id="g3812-0">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3797);fill-opacity:1.0;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571345000000029;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6"
-               style="fill:url(#linearGradient3797);fill-opacity:1.0;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571345000000029;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(-2.5969387e-5,219.32018)"
-         id="g3799-3">
+         id="g3799-3"
+         transform="translate(-2.5969387e-5,219.32018)">
         <g
            id="g3956-5">
           <g
-             id="g3812-6"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-6">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-2"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-9"
+             style="fill:url(#linearGradient3797-3);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-3);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-9">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3834);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-1"
-               style="fill:url(#linearGradient3834);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(146.21345,-3.0142166e-5)"
-         id="g3799-6">
+         id="g3799-6"
+         transform="translate(146.21345,-3.0142166e-5)">
         <g
            id="g3956-1">
           <g
-             id="g3812-8"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-8">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-7"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-92"
+             style="fill:url(#linearGradient3797-6);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-6);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-92">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3916);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-0"
-               style="fill:url(#linearGradient3916);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(146.21345,219.32019)"
-         id="g3799-3-2">
+         id="g3799-3-2"
+         transform="translate(146.21345,219.32019)">
         <g
            id="g3956-5-3">
           <g
-             id="g3812-6-7"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-6-7">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-2-5"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-9-9"
+             style="fill:url(#linearGradient3797-3-2);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-3-2);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-9-9">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3834-3);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-1-2"
-               style="fill:url(#linearGradient3834-3);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(292.42692,-3.1029367e-7)"
-         id="g3799-4">
+         id="g3799-4"
+         transform="translate(292.42692,-3.1029367e-7)">
         <g
            id="g3956-7">
           <g
-             id="g3812-84"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-84">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-5"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-0"
+             style="fill:url(#linearGradient3797-1);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-1);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-0">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3916-9);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-3"
-               style="fill:url(#linearGradient3916-9);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(292.42692,219.32021)"
-         id="g3799-3-6">
+         id="g3799-3-6"
+         transform="translate(292.42692,219.32021)">
         <g
            id="g3956-5-1">
           <g
-             id="g3812-6-0"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-6-0">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-2-6"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-9-3"
+             style="fill:url(#linearGradient3797-3-28);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-3-28);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-9-3">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3834-6);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-1-20"
-               style="fill:url(#linearGradient3834-6);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
@@ -510,7 +432,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Array</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Sat Dec 10 18:31:32 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_AutoGroup.svg b/src/Mod/Draft/Resources/icons/Draft_AutoGroup.svg
index 987df22c1f..390e37b2c8 100644
--- a/src/Mod/Draft/Resources/icons/Draft_AutoGroup.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_AutoGroup.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,442 +6,346 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_AutoGroup.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient5034">
       <stop
-         id="stop5036"
+         style="stop-color:#ffffff;stop-opacity:1"
          offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1" />
+         id="stop5036" />
       <stop
-         id="stop5038"
+         style="stop-color:#d3d7cf;stop-opacity:1"
          offset="1.0000000"
-         style="stop-color:#d3d7cf;stop-opacity:1" />
+         id="stop5038" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-0"
-       id="linearGradient3934"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,519.98085,464.19243)"
-       x1="696.67322"
-       y1="77.046234"
+       y2="115.01974"
        x2="654.80023"
-       y2="115.01974" />
+       y1="77.046234"
+       x1="696.67322"
+       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,519.98085,464.19243)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3934"
+       xlink:href="#linearGradient3864-0-0" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3942"
-       x1="597.77283"
-       y1="44.024342"
-       x2="619.30328"
+       gradientUnits="userSpaceOnUse"
        y2="30.27434"
-       gradientUnits="userSpaceOnUse" />
+       x2="619.30328"
+       y1="44.024342"
+       x1="597.77283"
+       id="linearGradient3942"
+       xlink:href="#linearGradient3377" />
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0"
-       id="linearGradient3657"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,536.41251,472.3612)"
-       x1="696.67322"
-       y1="77.046234"
+       y2="139.40982"
        x2="650.70459"
-       y2="139.40982" />
+       y1="77.046234"
+       x1="696.67322"
+       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,536.41251,472.3612)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3657"
+       xlink:href="#linearGradient3864-0" />
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="43.717598"
-       fx="3.7745965"
-       cy="43.717598"
-       cx="3.7745965"
-       gradientTransform="matrix(4.7474974e-4,1.1562124,-1.3743496,4.6927601e-4,63.8109,7.049203)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3972"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <radialGradient
-       r="37.751713"
-       fy="43.445751"
-       fx="0.28083447"
-       cy="43.445751"
-       cx="0.28083447"
-       gradientTransform="matrix(4.7859521e-4,1.1655777,-1.3633075,4.6550565e-4,62.959207,11.086395)"
+       id="radialGradient3972"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3974"
+       gradientTransform="matrix(4.7474974e-4,1.1562124,-1.3743496,4.6927601e-4,63.8109,7.049203)"
+       cx="3.7745965"
+       cy="43.717598"
+       fx="3.7745965"
+       fy="43.717598"
+       r="86.70845" />
+    <radialGradient
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient3974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.7859521e-4,1.1655777,-1.3633075,4.6550565e-4,62.959207,11.086395)"
+       cx="0.28083447"
+       cy="43.445751"
+       fx="0.28083447"
+       fy="43.445751"
+       r="37.751713" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3909"
-       x1="43"
-       y1="22"
-       x2="48"
+       gradientUnits="userSpaceOnUse"
        y2="44"
-       gradientUnits="userSpaceOnUse" />
+       x2="48"
+       y1="22"
+       x1="43"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3895" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="translate(-17,5)"
-       y2="44"
-       x2="48"
-       y1="22"
-       x1="43"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3023"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-17,5)"
-       y2="31"
-       x2="53"
-       y1="37"
-       x1="29"
+       id="linearGradient3023"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3023-3"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientTransform="translate(-17,5)" />
+    <linearGradient
        xlink:href="#linearGradient3895-5"
-       inkscape:collect="always" />
+       id="linearGradient3023-3"
+       gradientUnits="userSpaceOnUse"
+       x1="29"
+       y1="37"
+       x2="53"
+       y2="31"
+       gradientTransform="translate(-17,5)" />
     <linearGradient
        id="linearGradient3895-5">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897-6"
          offset="0"
-         id="stop3897-6" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899-2"
          offset="1"
-         id="stop3899-2" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="31"
-       x2="53"
-       y1="37"
-       x1="29"
-       gradientTransform="translate(-17,4)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3978"
        xlink:href="#linearGradient3895-5"
-       inkscape:collect="always" />
+       id="linearGradient3978"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-17,4)"
+       x1="29"
+       y1="37"
+       x2="53"
+       y2="31" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5034"
-       id="linearGradient5032"
-       x1="17"
-       y1="11"
-       x2="23"
+       gradientUnits="userSpaceOnUse"
        y2="53"
-       gradientUnits="userSpaceOnUse" />
+       x2="23"
+       y1="11"
+       x1="17"
+       id="linearGradient5032"
+       xlink:href="#linearGradient5034" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.0297109"
-     inkscape:cx="24.948099"
-     inkscape:cy="39.946378"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="873"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3071"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient5032);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       d="M 19.578125,8 5.4042969,8.0058594 C 5.1706901,8.005955 4.9823344,8.2113736 4.9824219,8.4667969 l 0.00391,7.9042971 c -2.596e-4,0.01067 -0.00391,0.02052 -0.00391,0.03125 L 5,55.617188 C 5.0003146,56.383475 5.677268,57.000287 6.5175781,57 L 57.5,56.982422 c 0.84031,-2.87e-4 1.517893,-0.618479 1.517578,-1.384766 L 59,16.382812 C 58.999685,15.616525 58.322732,14.999713 57.482422,15 H 25 L 20,8.4609375 C 19.999913,8.2055142 19.811732,7.9999044 19.578125,8 Z"
        id="rect15391"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccc" />
+       d="M 19.578125,8 5.4042969,8.0058594 C 5.1706901,8.005955 4.9823344,8.2113736 4.9824219,8.4667969 l 0.00391,7.9042971 c -2.596e-4,0.01067 -0.00391,0.02052 -0.00391,0.03125 L 5,55.617188 C 5.0003146,56.383475 5.677268,57.000287 6.5175781,57 L 57.5,56.982422 c 0.84031,-2.87e-4 1.517893,-0.618479 1.517578,-1.384766 L 59,16.382812 C 58.999685,15.616525 58.322732,14.999713 57.482422,15 H 25 L 20,8.4609375 C 19.999913,8.2055142 19.811732,7.9999044 19.578125,8 Z"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient5032);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       d="M 18.578125,10 H 7.421875 C 7.1882682,10.000096 6.9999125,10.205514 7,10.460938 L 7.00391,15.96875 7,16 v 38 c 0,1 0,1 1,1 h 48 c 1,0 1,0 1,-1 V 18 c 0,-1 0,-1 -1,-1 H 24 L 19,10.460938 C 18.999913,10.205514 18.811732,9.9999044 18.578125,10 Z"
        id="rect15391-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccc" />
+       d="M 18.578125,10 H 7.421875 C 7.1882682,10.000096 6.9999125,10.205514 7,10.460938 L 7.00391,15.96875 7,16 v 38 c 0,1 0,1 1,1 h 48 c 1,0 1,0 1,-1 V 18 c 0,-1 0,-1 -1,-1 H 24 L 19,10.460938 C 18.999913,10.205514 18.811732,9.9999044 18.578125,10 Z"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
     <g
-       id="g4636"
-       transform="rotate(90,38,36)">
+       transform="rotate(90,38,36)"
+       id="g4636">
       <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343"
-         d="m 30,19 0,10 -23,0 0,14 23,0 0,10 18,-17 z"
          style="fill:url(#linearGradient3978);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
+         d="m 30,19 0,10 -23,0 0,14 23,0 0,10 18,-17 z"
+         id="path3343" />
     </g>
     <path
-       inkscape:export-ydpi="4.1683898"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       sodipodi:nodetypes="cccccccc"
-       id="path3343-2"
-       d="M 50.357002,30.006611 43,30 43,7 33,7 33,30 25.642998,29.9934 38,43 z"
        style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
+       d="M 50.357002,30.006611 43,30 43,7 33,7 33,30 25.642998,29.9934 38,43 z"
+       id="path3343-2" />
   </g>
   <metadata
      id="metadata4251">
@@ -453,7 +355,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:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_AutoGroup_off.svg b/src/Mod/Draft/Resources/icons/Draft_AutoGroup_off.svg
index 960768c4cc..ef6b836177 100644
--- a/src/Mod/Draft/Resources/icons/Draft_AutoGroup_off.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_AutoGroup_off.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,438 +6,342 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_AutoGroup_off.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient4680">
       <stop
-         id="stop4676"
+         style="stop-color:#ef2929;stop-opacity:1"
          offset="0"
-         style="stop-color:#ef2929;stop-opacity:1" />
+         id="stop4676" />
       <stop
-         id="stop4678"
+         style="stop-color:#a40000;stop-opacity:1"
          offset="1"
-         style="stop-color:#a40000;stop-opacity:1" />
+         id="stop4678" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-0"
-       id="linearGradient3934"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,519.98085,464.19243)"
-       x1="696.67322"
-       y1="77.046234"
+       y2="115.01974"
        x2="654.80023"
-       y2="115.01974" />
+       y1="77.046234"
+       x1="696.67322"
+       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,519.98085,464.19243)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3934"
+       xlink:href="#linearGradient3864-0-0" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3942"
-       x1="597.77283"
-       y1="44.024342"
-       x2="619.30328"
+       gradientUnits="userSpaceOnUse"
        y2="30.27434"
-       gradientUnits="userSpaceOnUse" />
+       x2="619.30328"
+       y1="44.024342"
+       x1="597.77283"
+       id="linearGradient3942"
+       xlink:href="#linearGradient3377" />
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0"
-       id="linearGradient3657"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,536.41251,472.3612)"
-       x1="696.67322"
-       y1="77.046234"
+       y2="139.40982"
        x2="650.70459"
-       y2="139.40982" />
+       y1="77.046234"
+       x1="696.67322"
+       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,536.41251,472.3612)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3657"
+       xlink:href="#linearGradient3864-0" />
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="43.717598"
-       fx="3.7745965"
-       cy="43.717598"
-       cx="3.7745965"
-       gradientTransform="matrix(4.7474974e-4,1.1562124,-1.3743496,4.6927601e-4,63.8109,7.049203)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3972"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <radialGradient
-       r="37.751713"
-       fy="43.445751"
-       fx="0.28083447"
-       cy="43.445751"
-       cx="0.28083447"
-       gradientTransform="matrix(4.7859521e-4,1.1655777,-1.3633075,4.6550565e-4,62.959207,11.086395)"
+       id="radialGradient3972"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3974"
+       gradientTransform="matrix(4.7474974e-4,1.1562124,-1.3743496,4.6927601e-4,63.8109,7.049203)"
+       cx="3.7745965"
+       cy="43.717598"
+       fx="3.7745965"
+       fy="43.717598"
+       r="86.70845" />
+    <radialGradient
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient3974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.7859521e-4,1.1655777,-1.3633075,4.6550565e-4,62.959207,11.086395)"
+       cx="0.28083447"
+       cy="43.445751"
+       fx="0.28083447"
+       fy="43.445751"
+       r="37.751713" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3909"
-       x1="43"
-       y1="22"
-       x2="48"
+       gradientUnits="userSpaceOnUse"
        y2="44"
-       gradientUnits="userSpaceOnUse" />
+       x2="48"
+       y1="22"
+       x1="43"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3895" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="translate(-17,5)"
-       y2="44"
-       x2="48"
-       y1="22"
-       x1="43"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3023"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="translate(-17,5)"
-       y2="31"
-       x2="53"
-       y1="37"
-       x1="29"
+       id="linearGradient3023"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3023-3"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientTransform="translate(-17,5)" />
+    <linearGradient
        xlink:href="#linearGradient3895-6"
-       inkscape:collect="always" />
+       id="linearGradient3023-3"
+       gradientUnits="userSpaceOnUse"
+       x1="29"
+       y1="37"
+       x2="53"
+       y2="31"
+       gradientTransform="translate(-17,5)" />
     <linearGradient
        id="linearGradient3895-6">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897-7"
          offset="0"
-         id="stop3897-7" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899-5"
          offset="1"
-         id="stop3899-5" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="31"
-       x2="53"
-       y1="37"
-       x1="29"
-       gradientTransform="matrix(0,1,-1,0,70,-19)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3978"
        xlink:href="#linearGradient3895-6"
-       inkscape:collect="always" />
+       id="linearGradient3978"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1,-1,0,70,-19)"
+       x1="29"
+       y1="37"
+       x2="53"
+       y2="31" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4680"
-       id="linearGradient4505"
-       x1="21"
-       y1="10"
-       x2="41"
+       gradientUnits="userSpaceOnUse"
        y2="54"
-       gradientUnits="userSpaceOnUse" />
+       x2="41"
+       y1="10"
+       x1="21"
+       id="linearGradient4505"
+       xlink:href="#linearGradient4680" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.0297108"
-     inkscape:cx="12.770237"
-     inkscape:cy="32.170282"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="873"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3071"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient4505);fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       d="M 19.578125,8 5.4042969,8.0058594 C 5.1706901,8.005955 4.9823344,8.2113736 4.9824219,8.4667969 l 0.00391,7.9042971 c -2.596e-4,0.01067 -0.00391,0.02052 -0.00391,0.03125 L 5,55.617188 C 5.0003146,56.383475 5.677268,57.000287 6.5175781,57 L 57.5,56.982422 c 0.84031,-2.87e-4 1.517893,-0.618479 1.517578,-1.384766 L 59,16.382812 C 58.999685,15.616525 58.322732,14.999713 57.482422,15 H 25 L 20,8.4609375 C 19.999913,8.2055142 19.811732,7.9999044 19.578125,8 Z"
        id="rect15391"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccc" />
+       d="M 19.578125,8 5.4042969,8.0058594 C 5.1706901,8.005955 4.9823344,8.2113736 4.9824219,8.4667969 l 0.00391,7.9042971 c -2.596e-4,0.01067 -0.00391,0.02052 -0.00391,0.03125 L 5,55.617188 C 5.0003146,56.383475 5.677268,57.000287 6.5175781,57 L 57.5,56.982422 c 0.84031,-2.87e-4 1.517893,-0.618479 1.517578,-1.384766 L 59,16.382812 C 58.999685,15.616525 58.322732,14.999713 57.482422,15 H 25 L 20,8.4609375 C 19.999913,8.2055142 19.811732,7.9999044 19.578125,8 Z"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient4505);fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       d="M 18.578125,10 H 7.421875 C 7.1882682,10.000096 6.9999125,10.205514 7,10.460938 L 7.00391,15.96875 7,16 v 38 c 0,1 0,1 1,1 h 48 c 1,0 1,0 1,-1 V 18 c 0,-1 0,-1 -1,-1 H 24 L 19,10.460938 C 18.999913,10.205514 18.811732,9.9999044 18.578125,10 Z"
        id="rect15391-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccc" />
+       d="M 18.578125,10 H 7.421875 C 7.1882682,10.000096 6.9999125,10.205514 7,10.460938 L 7.00391,15.96875 7,16 v 38 c 0,1 0,1 1,1 h 48 c 1,0 1,0 1,-1 V 18 c 0,-1 0,-1 -1,-1 H 24 L 19,10.460938 C 18.999913,10.205514 18.811732,9.9999044 18.578125,10 Z"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
     <path
-       inkscape:export-ydpi="4.1683898"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       sodipodi:nodetypes="cccccccc"
-       id="path3343"
-       d="M 55,28 45,28 45,5 31,5 31,28 21,28 38,46 z"
        style="fill:url(#linearGradient3978);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
+       d="M 55,28 45,28 45,5 31,5 31,28 21,28 38,46 z"
+       id="path3343" />
     <path
-       inkscape:export-ydpi="4.1683898"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       sodipodi:nodetypes="cccccccc"
-       id="path3343-2"
-       d="M 50.357002,30.006611 43,30 43,7 33,7 33,30 25.642998,29.9934 38,43 z"
        style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
+       d="M 50.357002,30.006611 43,30 43,7 33,7 33,30 25.642998,29.9934 38,43 z"
+       id="path3343-2" />
   </g>
   <metadata
      id="metadata4251">
@@ -449,7 +351,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:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_AutoGroup_on.svg b/src/Mod/Draft/Resources/icons/Draft_AutoGroup_on.svg
index cb20fb89d0..bab1228c99 100644
--- a/src/Mod/Draft/Resources/icons/Draft_AutoGroup_on.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_AutoGroup_on.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,410 +6,316 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_AutoGroup_on.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient4680">
       <stop
-         id="stop4676"
+         style="stop-color:#8ae234;stop-opacity:1"
          offset="0"
-         style="stop-color:#8ae234;stop-opacity:1" />
+         id="stop4676" />
       <stop
-         id="stop4678"
+         style="stop-color:#4e9a06;stop-opacity:1"
          offset="1"
-         style="stop-color:#4e9a06;stop-opacity:1" />
+         id="stop4678" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-0"
-       id="linearGradient3934"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,519.98085,464.19243)"
-       x1="696.67322"
-       y1="77.046234"
+       y2="115.01974"
        x2="654.80023"
-       y2="115.01974" />
+       y1="77.046234"
+       x1="696.67322"
+       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,519.98085,464.19243)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3934"
+       xlink:href="#linearGradient3864-0-0" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3942"
-       x1="597.77283"
-       y1="44.024342"
-       x2="619.30328"
+       gradientUnits="userSpaceOnUse"
        y2="30.27434"
-       gradientUnits="userSpaceOnUse" />
+       x2="619.30328"
+       y1="44.024342"
+       x1="597.77283"
+       id="linearGradient3942"
+       xlink:href="#linearGradient3377" />
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0"
-       id="linearGradient3657"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,536.41251,472.3612)"
-       x1="696.67322"
-       y1="77.046234"
+       y2="139.40982"
        x2="650.70459"
-       y2="139.40982" />
+       y1="77.046234"
+       x1="696.67322"
+       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,536.41251,472.3612)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3657"
+       xlink:href="#linearGradient3864-0" />
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="43.717598"
-       fx="3.7745965"
-       cy="43.717598"
-       cx="3.7745965"
-       gradientTransform="matrix(4.7474974e-4,1.1562124,-1.3743496,4.6927601e-4,63.8109,7.049203)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3972"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <radialGradient
-       r="37.751713"
-       fy="43.445751"
-       fx="0.28083447"
-       cy="43.445751"
-       cx="0.28083447"
-       gradientTransform="matrix(4.7859521e-4,1.1655777,-1.3633075,4.6550565e-4,62.959207,11.086395)"
+       id="radialGradient3972"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3974"
+       gradientTransform="matrix(4.7474974e-4,1.1562124,-1.3743496,4.6927601e-4,63.8109,7.049203)"
+       cx="3.7745965"
+       cy="43.717598"
+       fx="3.7745965"
+       fy="43.717598"
+       r="86.70845" />
+    <radialGradient
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient3974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(4.7859521e-4,1.1655777,-1.3633075,4.6550565e-4,62.959207,11.086395)"
+       cx="0.28083447"
+       cy="43.445751"
+       fx="0.28083447"
+       fy="43.445751"
+       r="37.751713" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3909"
-       x1="43"
-       y1="22"
-       x2="48"
+       gradientUnits="userSpaceOnUse"
        y2="44"
-       gradientUnits="userSpaceOnUse" />
+       x2="48"
+       y1="22"
+       x1="43"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3895" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="translate(-17,5)"
-       y2="31"
-       x2="53"
-       y1="37"
-       x1="29"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3023"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
+       id="linearGradient3023"
+       gradientUnits="userSpaceOnUse"
+       x1="29"
+       y1="37"
+       x2="53"
+       y2="31"
+       gradientTransform="translate(-17,5)" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4680"
-       id="linearGradient3961"
-       x1="26"
-       y1="18"
-       x2="36"
+       gradientUnits="userSpaceOnUse"
        y2="54"
-       gradientUnits="userSpaceOnUse" />
+       x2="36"
+       y1="18"
+       x1="26"
+       id="linearGradient3961"
+       xlink:href="#linearGradient4680" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.3849698"
-     inkscape:cx="43.752091"
-     inkscape:cy="27.521206"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="873"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3071"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient3961);fill-opacity:1;fill-rule:nonzero;stroke:#172a04;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       d="M 19.578125,8 5.4042969,8.0058594 C 5.1706901,8.005955 4.9823344,8.2113736 4.9824219,8.4667969 l 0.00391,7.9042971 c -2.596e-4,0.01067 -0.00391,0.02052 -0.00391,0.03125 L 5,55.617188 C 5.0003146,56.383475 5.677268,57.000287 6.5175781,57 L 57.5,56.982422 c 0.84031,-2.87e-4 1.517893,-0.618479 1.517578,-1.384766 L 59,16.382812 C 58.999685,15.616525 58.322732,14.999713 57.482422,15 H 25 L 20,8.4609375 C 19.999913,8.2055142 19.811732,7.9999044 19.578125,8 Z"
        id="rect15391"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccc" />
+       d="M 19.578125,8 5.4042969,8.0058594 C 5.1706901,8.005955 4.9823344,8.2113736 4.9824219,8.4667969 l 0.00391,7.9042971 c -2.596e-4,0.01067 -0.00391,0.02052 -0.00391,0.03125 L 5,55.617188 C 5.0003146,56.383475 5.677268,57.000287 6.5175781,57 L 57.5,56.982422 c 0.84031,-2.87e-4 1.517893,-0.618479 1.517578,-1.384766 L 59,16.382812 C 58.999685,15.616525 58.322732,14.999713 57.482422,15 H 25 L 20,8.4609375 C 19.999913,8.2055142 19.811732,7.9999044 19.578125,8 Z"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient3961);fill-opacity:1;fill-rule:nonzero;stroke:#172a04;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
-       d="M 18.578125,10 H 7.421875 C 7.1882682,10.000096 6.9999125,10.205514 7,10.460938 L 7.00391,15.96875 7,16 v 38 c 0,1 0,1 1,1 h 48 c 1,0 1,0 1,-1 V 18 c 0,-1 0,-1 -1,-1 H 24 L 19,10.460938 C 18.999913,10.205514 18.811732,9.9999044 18.578125,10 Z"
        id="rect15391-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccc" />
+       d="M 18.578125,10 H 7.421875 C 7.1882682,10.000096 6.9999125,10.205514 7,10.460938 L 7.00391,15.96875 7,16 v 38 c 0,1 0,1 1,1 h 48 c 1,0 1,0 1,-1 V 18 c 0,-1 0,-1 -1,-1 H 24 L 19,10.460938 C 18.999913,10.205514 18.811732,9.9999044 18.578125,10 Z"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none" />
     <g
-       id="g4636"
-       transform="matrix(0,1,-1,0,75,-2)">
+       transform="matrix(0,1,-1,0,75,-2)"
+       id="g4636">
       <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343"
-         d="M 30,20 V 30 L 7,30 V 44 H 30 V 54 L 48,37 z"
          style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
+         d="M 30,20 V 30 L 7,30 V 44 H 30 V 54 L 48,37 z"
+         id="path3343" />
       <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2"
-         d="M 32.006611,24.642998 32,32 H 9 V 42 H 32 L 31.9934,49.357002 45,37 z"
          style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
+         d="M 32.006611,24.642998 32,32 H 9 V 42 H 32 L 31.9934,49.357002 45,37 z"
+         id="path3343-2" />
     </g>
   </g>
   <metadata
@@ -422,7 +326,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:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_BSpline.svg b/src/Mod/Draft/Resources/icons/Draft_BSpline.svg
index 4a2d9b8be3..852899b896 100644
--- a/src/Mod/Draft/Resources/icons/Draft_BSpline.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_BSpline.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,136 +6,32 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_BSpline.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-3" />
     <linearGradient
-       id="linearGradient3144-3"
-       inkscape:collect="always">
+       id="linearGradient3144-3">
       <stop
-         id="stop3146-0"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
+         id="stop3146-0" />
       <stop
-         id="stop3148-1"
+         style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3144-6">
-      <stop
-         id="stop3146-9"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3148-2"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3701">
-      <stop
-         id="stop3703"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3705"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3708">
-      <stop
-         id="stop3710"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3712"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-1" />
     </linearGradient>
     <radialGradient
        r="34.345188"
@@ -147,193 +41,219 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3723"
-       xlink:href="#linearGradient3144-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
+       id="radialGradient3598"
+       xlink:href="#linearGradient3144-3" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       id="radialGradient3684"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3144-6">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3146-9" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3148-2" />
+    </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3686"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3701">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3703" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3705" />
+    </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3708">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3710" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3712" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-6"
+       id="radialGradient3723"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-0"
-       id="linearGradient3801-1-4"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-4"
+       xlink:href="#linearGradient3836-0-0" />
     <linearGradient
        id="linearGradient3836-0-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-9"
          offset="0"
-         id="stop3838-2-9" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-4"
          offset="1"
-         id="stop3840-5-4" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-5"
-       id="linearGradient3801-1-5"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-5"
+       xlink:href="#linearGradient3836-0-5" />
     <linearGradient
        id="linearGradient3836-0-5">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-1"
          offset="0"
-         id="stop3838-2-1" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-7"
          offset="1"
-         id="stop3840-5-7" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.353096"
-     inkscape:cx="16.223506"
-     inkscape:cy="32.997278"
-     inkscape:current-layer="Draft_bspline"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3012"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="Draft_bspline"
-       transform="matrix(0.89711225,0.52065392,-0.5123597,0.91163494,32.103176,-164.6499)">
+       transform="matrix(0.89711225,0.52065392,-0.5123597,0.91163494,32.103176,-164.6499)"
+       id="Draft_bspline">
       <path
-         style="fill:url(#radialGradient3684);fill-opacity:1;stroke:none"
-         id="path2184-8"
+         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
          transform="matrix(-0.12861646,0.07494312,-0.07494312,-0.12861646,157.77202,248.64722)"
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+         id="path2184-8"
+         style="fill:url(#radialGradient3684);fill-opacity:1;stroke:none" />
       <path
-         style="fill:url(#radialGradient3686);fill-opacity:1;stroke:none"
-         id="path2190-1"
+         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
          transform="matrix(-0.1297658,0.07293493,-0.07293493,-0.1297658,161.18859,218.30699)"
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+         id="path2190-1"
+         style="fill:url(#radialGradient3686);fill-opacity:1;stroke:none" />
       <path
-         style="fill:url(#radialGradient3723);fill-opacity:1;stroke:none"
-         id="path2200-1"
+         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
          transform="matrix(-0.13513931,0.06241822,-0.06241822,-0.13513931,185.57335,240.07726)"
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+         id="path2200-1"
+         style="fill:url(#radialGradient3723);fill-opacity:1;stroke:none" />
       <path
-         style="fill:none;stroke:#2e3436;stroke-width:8.00000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 11,42 C 10.999999,11.000002 49.999999,1.797244e-6 50,46"
-         id="path3035"
-         inkscape:connector-curvature="0"
          transform="matrix(0.84052566,-0.48004191,0.47239466,0.82713577,50.79619,151.59869)"
-         sodipodi:nodetypes="cc" />
+         id="path3035"
+         d="M 11,42 C 10.999999,11.000002 49.999999,1.797244e-6 50,46"
+         style="fill:none;stroke:#2e3436;stroke-width:8.00000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#d3d7cf;stroke-width:3.84082924000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 79.882548,181.05793 C 65.238314,155.41673 92.822468,127.5966 114.55263,165.64484"
          id="path3035-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="M 79.882548,181.05793 C 65.238314,155.41673 92.822468,127.5966 114.55263,165.64484"
+         style="fill:none;stroke:#d3d7cf;stroke-width:3.84082924000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:1.92041457;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 79.042022,181.53798 C 63.925393,155.06963 92.71821,125.46228 115.39315,165.1648"
          id="path3035-1-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="M 79.042022,181.53798 C 63.925393,155.06963 92.71821,125.46228 115.39315,165.1648"
+         style="fill:none;stroke:#ffffff;stroke-width:1.92041457;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <g
-         transform="matrix(0.84052566,-0.48004191,0.47239466,0.82713577,49.655706,110.56669)"
-         id="g3827-1-8">
+         id="g3827-1-8"
+         transform="matrix(0.84052566,-0.48004191,0.47239466,0.82713577,49.655706,110.56669)">
         <g
-           transform="translate(31.322131,40.570289)"
-           id="g3797-9-8">
+           id="g3797-9-8"
+           transform="translate(31.322131,40.570289)">
           <path
-             inkscape:connector-curvature="0"
-             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
              id="path4250-71-2"
-             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3801-1-4);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
              id="path4250-7-3-4"
-             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+             style="fill:url(#linearGradient3801-1-4);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
       <g
-         transform="matrix(0.84052566,-0.48004191,0.47239466,0.82713577,80.846586,130.04856)"
-         id="g3827-1-1">
+         id="g3827-1-1"
+         transform="matrix(0.84052566,-0.48004191,0.47239466,0.82713577,80.846586,130.04856)">
         <g
-           transform="translate(31.322131,40.570289)"
-           id="g3797-9-1">
+           id="g3797-9-1"
+           transform="translate(31.322131,40.570289)">
           <path
-             inkscape:connector-curvature="0"
-             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
              id="path4250-71-5"
-             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3801-1-5);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
              id="path4250-7-3-2"
-             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+             style="fill:url(#linearGradient3801-1-5);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
     </g>
     <g
-       transform="translate(-2.6307677e-7,-10.005445)"
-       id="g3827-1">
+       id="g3827-1"
+       transform="translate(-2.6307677e-7,-10.005445)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9">
+         id="g3797-9"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
   </g>
@@ -345,7 +265,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_BSpline</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_BezCurve.svg b/src/Mod/Draft/Resources/icons/Draft_BezCurve.svg
index 89bc0e93cb..08655657ea 100644
--- a/src/Mod/Draft/Resources/icons/Draft_BezCurve.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_BezCurve.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,399 +6,312 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_BezCurve.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3600"
+       xlink:href="#linearGradient3144-3" />
     <linearGradient
-       id="linearGradient3144-3"
-       inkscape:collect="always">
+       id="linearGradient3144-3">
       <stop
-         id="stop3146-0"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
+         id="stop3146-0" />
       <stop
-         id="stop3148-1"
+         style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
+         id="stop3148-1" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3598"
+       xlink:href="#linearGradient3144-3" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
     <linearGradient
        id="linearGradient3144-6-6">
       <stop
-         id="stop3146-9-1"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9-1" />
       <stop
-         id="stop3148-2-7"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2-7" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3164"
-       gradientUnits="userSpaceOnUse"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
        gradientTransform="matrix(-0.15378341,-0.00107304,7.3761212e-4,-0.10916121,65.069908,86.593234)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6-6"
-       id="radialGradient3960"
        gradientUnits="userSpaceOnUse"
+       id="radialGradient3164"
+       xlink:href="#linearGradient3144-6" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
        gradientTransform="matrix(-0.15378341,-0.00107304,7.3761212e-4,-0.10916121,44.086014,80.606342)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6-1"
-       id="radialGradient3118-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       id="radialGradient3960"
+       xlink:href="#linearGradient3144-6-6" />
+    <radialGradient
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3118-3"
+       xlink:href="#linearGradient3144-6-1" />
     <linearGradient
        id="linearGradient3144-6-1">
       <stop
-         id="stop3146-9-3"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9-3" />
       <stop
-         id="stop3148-2-5"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2-5" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6-4"
-       id="radialGradient4026-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4026-5"
+       xlink:href="#linearGradient3144-6-4" />
     <linearGradient
        id="linearGradient3144-6-4">
       <stop
-         id="stop3146-9-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9-9" />
       <stop
-         id="stop3148-2-1"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2-1" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6-4"
-       id="radialGradient4097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
-       cx="286.94281"
-       cy="835.12842"
-       fx="286.94281"
+       r="34.345188"
        fy="835.12842"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
+       fx="286.94281"
+       cy="835.12842"
+       cx="286.94281"
+       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
        gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       id="radialGradient4097"
+       xlink:href="#linearGradient3144-6-4" />
+    <linearGradient
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-6"
-       id="linearGradient3801-1-3"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-3"
+       xlink:href="#linearGradient3836-0-6" />
     <linearGradient
        id="linearGradient3836-0-6">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-7"
          offset="0"
-         id="stop3838-2-7" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-5"
          offset="1"
-         id="stop3840-5-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.838912"
-     inkscape:cx="15.157105"
-     inkscape:cy="28.692716"
-     inkscape:current-layer="g4117"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3034"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
        id="g4117">
       <path
-         inkscape:connector-curvature="0"
-         id="path4034-3"
+         style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 55,50 53,15"
-         style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         id="path4034-3" />
       <path
-         inkscape:connector-curvature="0"
-         id="path4030-9"
+         style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 9,50 11,15"
-         style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         id="path4030-9" />
       <path
-         inkscape:connector-curvature="0"
-         id="path4030"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 9,49 11,15"
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         id="path4030" />
       <rect
-         y="5"
-         x="7"
-         height="10"
-         width="10"
+         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#2e2900;stroke-width:2;stroke-linecap:butt;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"
          id="rect3190"
-         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#2e2900;stroke-width:2;stroke-linecap:butt;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
-         inkscape:connector-curvature="0"
-         id="path4034"
-         d="M 55,49 53,15"
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
-      <g
-         id="g3166-4"
-         transform="translate(41.740915,4.3123332)"
-         style="stroke:#2e3436;stroke-width:2;fill:#d3d7cf">
-        <g
-           id="g4040"
-           style="stroke:#2e3436;stroke-width:2;fill:#d3d7cf">
-          <path
-             inkscape:connector-curvature="0"
-             d="m 9,49 6,0 c 0,-30 34,-30 34,0 l 6,0 C 55,11 9,11 9,49 z"
-             id="path3714"
-             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;color:#000000;fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-             transform="translate(-41.740915,-4.3123332)"
-             sodipodi:nodetypes="ccccc" />
-        </g>
-      </g>
-      <rect
-         y="7"
-         x="9"
-         height="6"
-         width="6"
-         id="rect3190-2-2"
-         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;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" />
-      <rect
-         y="5"
-         x="47"
-         height="10"
          width="10"
-         id="rect3190-7"
-         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#2e2900;stroke-width:2;stroke-linecap:butt;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" />
-      <rect
-         y="7"
-         x="49"
-         height="6"
-         width="6"
-         id="rect3190-2-2-0"
-         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;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" />
+         height="10"
+         x="7"
+         y="5" />
       <path
          style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 11,49 C 11,14 53,14 53,49"
+         d="M 55,49 53,15"
+         id="path4034" />
+      <g
+         style="stroke:#2e3436;stroke-width:2;fill:#d3d7cf"
+         transform="translate(41.740915,4.3123332)"
+         id="g3166-4">
+        <g
+           style="stroke:#2e3436;stroke-width:2;fill:#d3d7cf"
+           id="g4040">
+          <path
+             transform="translate(-41.740915,-4.3123332)"
+             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;color:#000000;fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+             id="path3714"
+             d="m 9,49 6,0 c 0,-30 34,-30 34,0 l 6,0 C 55,11 9,11 9,49 z" />
+        </g>
+      </g>
+      <rect
+         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;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"
+         id="rect3190-2-2"
+         width="6"
+         height="6"
+         x="9"
+         y="7" />
+      <rect
+         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#2e2900;stroke-width:2;stroke-linecap:butt;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"
+         id="rect3190-7"
+         width="10"
+         height="10"
+         x="47"
+         y="5" />
+      <rect
+         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;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"
+         id="rect3190-2-2-0"
+         width="6"
+         height="6"
+         x="49"
+         y="7" />
+      <path
          id="path3915"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="M 11,49 C 11,14 53,14 53,49"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <g
-       id="g3057"
-       transform="translate(33.327866,-1.429711)">
+       transform="translate(33.327866,-1.429711)"
+       id="g3057">
       <g
-         id="g3827-1"
-         transform="translate(-33.322131,1.429711)">
+         transform="translate(-33.322131,1.429711)"
+         id="g3827-1">
         <g
-           id="g3797-9"
-           transform="translate(31.322131,40.570289)">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9">
           <path
-             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
-             id="path4250-71"
              style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             inkscape:connector-curvature="0" />
+             id="path4250-71"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
           <path
-             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
-             id="path4250-7-3"
              style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             inkscape:connector-curvature="0" />
+             id="path4250-7-3"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
         </g>
       </g>
     </g>
     <g
-       transform="translate(73.327866,-1.429711)"
-       id="g3057-3">
+       id="g3057-3"
+       transform="translate(73.327866,-1.429711)">
       <g
-         id="g3827-1-5"
-         transform="translate(-33.322131,1.429711)">
+         transform="translate(-33.322131,1.429711)"
+         id="g3827-1-5">
         <g
-           id="g3797-9-6"
-           transform="translate(31.322131,40.570289)">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-6">
           <path
-             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
-             id="path4250-71-2"
              style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             inkscape:connector-curvature="0" />
+             id="path4250-71-2"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
           <path
-             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
-             id="path4250-7-3-9"
              style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             inkscape:connector-curvature="0" />
+             id="path4250-7-3-9"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
         </g>
       </g>
     </g>
@@ -413,7 +324,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_BezCurve</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Fri Jan 17 12:22:46 2014 -0500</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_BezSharpNode.svg b/src/Mod/Draft/Resources/icons/Draft_BezSharpNode.svg
index 4191964354..d2edff3673 100644
--- a/src/Mod/Draft/Resources/icons/Draft_BezSharpNode.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_BezSharpNode.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,475 +6,415 @@
    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="svg3612"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_BezSharpNode.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     id="namedview67"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:zoom="12.968847"
-     inkscape:cx="4.4020509"
-     inkscape:cy="34.307968"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3044"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
+   height="64"
+   width="64"
+   version="1.1">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient3688"
-       xlink:href="#linearGradient3144-6"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+       xlink:href="#linearGradient3144-6"
+       id="radialGradient3688"
+       fy="672.79736"
+       fx="225.26402"
+       r="34.345188"
+       cy="672.79736"
+       cx="225.26402" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         offset="0"
          style="stop-color:#0619c0;stop-opacity:1"
-         offset="0" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         offset="1"
          style="stop-color:#379cfb;stop-opacity:1"
-         offset="1" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         offset="0"
          style="stop-color:#ffaa00;stop-opacity:1"
-         offset="0" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         offset="1"
          style="stop-color:#faff2b;stop-opacity:1"
-         offset="1" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         offset="0"
          style="stop-color:#0619c0;stop-opacity:1"
-         offset="0" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         offset="1"
          style="stop-color:#379cfb;stop-opacity:1"
-         offset="1" />
+         id="stop3868-7" />
     </linearGradient>
     <linearGradient
        id="linearGradient5048">
       <stop
-         id="stop5050"
+         offset="0"
          style="stop-color:#000000;stop-opacity:0"
-         offset="0" />
+         id="stop5050" />
       <stop
-         id="stop5056"
+         offset="0.5"
          style="stop-color:#000000;stop-opacity:1"
-         offset="0.5" />
+         id="stop5056" />
       <stop
-         id="stop5052"
+         offset="1"
          style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
+         id="stop5052" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         offset="0"
          style="stop-color:#0619c0;stop-opacity:1"
-         offset="0" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         offset="1"
          style="stop-color:#379cfb;stop-opacity:1"
-         offset="1" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       cx="20.892099"
-       cy="114.5684"
-       r="5.256"
-       fx="20.892099"
-       fy="114.5684"
+       gradientUnits="userSpaceOnUse"
        id="aigrd2"
-       gradientUnits="userSpaceOnUse">
+       fy="114.5684"
+       fx="20.892099"
+       r="5.256"
+       cy="114.5684"
+       cx="20.892099">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1"
          style="stop-color:#9a9a9a;stop-opacity:1"
-         offset="1" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       cx="20.892099"
-       cy="64.567902"
-       r="5.257"
-       fx="20.892099"
-       fy="64.567902"
+       gradientUnits="userSpaceOnUse"
        id="aigrd3"
-       gradientUnits="userSpaceOnUse">
+       fy="64.567902"
+       fx="20.892099"
+       r="5.257"
+       cy="64.567902"
+       cx="20.892099">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1"
          style="stop-color:#9a9a9a;stop-opacity:1"
-         offset="1" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         id="stop15664"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop15664" />
       <stop
-         id="stop15666"
+         offset="1"
          style="stop-color:#f8f8f8;stop-opacity:1"
-         offset="1" />
+         id="stop15666" />
     </linearGradient>
     <radialGradient
-       cx="33.966679"
-       cy="35.736916"
-       r="86.70845"
-       fx="33.966679"
-       fy="35.736916"
-       id="radialGradient4452"
-       xlink:href="#linearGradient259"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)" />
+       xlink:href="#linearGradient259"
+       id="radialGradient4452"
+       fy="35.736916"
+       fx="33.966679"
+       r="86.70845"
+       cy="35.736916"
+       cx="33.966679" />
     <linearGradient
        id="linearGradient259">
       <stop
-         id="stop260"
+         offset="0"
          style="stop-color:#fafafa;stop-opacity:1"
-         offset="0" />
+         id="stop260" />
       <stop
-         id="stop261"
+         offset="1"
          style="stop-color:#bbbbbb;stop-opacity:1"
-         offset="1" />
+         id="stop261" />
     </linearGradient>
     <radialGradient
-       cx="8.824419"
-       cy="3.7561285"
-       r="37.751713"
-       fx="8.824419"
-       fy="3.7561285"
-       id="radialGradient4454"
-       xlink:href="#linearGradient269"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)" />
+       xlink:href="#linearGradient269"
+       id="radialGradient4454"
+       fy="3.7561285"
+       fx="8.824419"
+       r="37.751713"
+       cy="3.7561285"
+       cx="8.824419" />
     <linearGradient
        id="linearGradient269">
       <stop
-         id="stop270"
+         offset="0"
          style="stop-color:#a3a3a3;stop-opacity:1"
-         offset="0" />
+         id="stop270" />
       <stop
-         id="stop271"
+         offset="1"
          style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="1" />
+         id="stop271" />
     </linearGradient>
     <linearGradient
        id="linearGradient4095">
       <stop
-         id="stop4097"
+         offset="0"
          style="stop-color:#005bff;stop-opacity:1"
-         offset="0" />
+         id="stop4097" />
       <stop
-         id="stop4099"
+         offset="1"
          style="stop-color:#c1e3f7;stop-opacity:1"
-         offset="1" />
+         id="stop4099" />
     </linearGradient>
     <linearGradient
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
-       id="linearGradient4253"
-       xlink:href="#linearGradient4247"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       xlink:href="#linearGradient4247"
+       id="linearGradient4253"
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         id="stop4249"
+         offset="0"
          style="stop-color:#2e8207;stop-opacity:1"
-         offset="0" />
+         id="stop4249" />
       <stop
-         id="stop4251"
+         offset="1"
          style="stop-color:#52ff00;stop-opacity:1"
-         offset="1" />
+         id="stop4251" />
     </linearGradient>
     <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4317"
-       xlink:href="#linearGradient3144-8"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+       xlink:href="#linearGradient3144-8"
+       id="radialGradient4317"
+       fy="672.79736"
+       fx="225.26402"
+       r="34.345188"
+       cy="672.79736"
+       cx="225.26402" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96" />
       <stop
-         id="stop3148-4"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3922"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
+       y2="485.54004"
+       x2="54.509644"
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3904"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
-       x1="11.390151"
-       y1="453.55045"
-       x2="54.509644"
-       y2="485.54004" />
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-6"
-       id="linearGradient3904-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3904-3"
+       xlink:href="#linearGradient3836-6" />
     <linearGradient
        id="linearGradient3836-6">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838-0"
          offset="0"
-         id="stop3838-0" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840-6"
          offset="1"
-         id="stop3840-6" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="475.68085"
-       x2="43.486729"
-       y1="453.55045"
-       x1="11.390151"
-       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3836-6"
        id="linearGradient3923"
-       xlink:href="#linearGradient3836-6"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="475.68085"
-       x2="43.486729"
-       y1="453.55045"
-       x1="11.390151"
-       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3923-8"
-       xlink:href="#linearGradient3836-6-7"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3836-6-7">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop3838-0-9" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="1"
-         id="stop3840-6-2" />
-    </linearGradient>
-    <linearGradient
-       y2="475.68085"
-       x2="43.486729"
-       y1="453.55045"
-       x1="11.390151"
-       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3967"
-       xlink:href="#linearGradient3836-6-7"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-6"
-       id="linearGradient3990"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
        x1="11.390151"
        y1="453.55045"
        x2="43.486729"
        y2="475.68085" />
+    <linearGradient
+       xlink:href="#linearGradient3836-6-7"
+       id="linearGradient3923-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="43.486729"
+       y2="475.68085" />
+    <linearGradient
+       id="linearGradient3836-6-7">
+      <stop
+         id="stop3838-0-9"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1;" />
+      <stop
+         id="stop3840-6-2"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3836-6-7"
+       id="linearGradient3967"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="43.486729"
+       y2="475.68085" />
+    <linearGradient
+       y2="475.68085"
+       x2="43.486729"
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3990"
+       xlink:href="#linearGradient3836-6" />
   </defs>
   <g
      id="layer1">
     <path
-       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 57,35 34,49"
        id="path3992-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 7,51 24,0"
-       id="path3994-5"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 57,35 34,49"
-       id="path3992"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3994-5"
        d="m 7,51 24,0"
+       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3992"
+       d="M 57,35 34,49"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3994"
-       inkscape:connector-curvature="0" />
+       d="m 7,51 24,0"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       d="M 6,6 C 19,22 -3.747183,48.338335 31.636364,48.363637 61.272846,26.482175 43,17 58,6"
-       id="path3179-9"
        style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       id="path3179-9"
+       d="M 6,6 C 19,22 -3.747183,48.338335 31.636364,48.363637 61.272846,26.482175 43,17 58,6" />
     <path
-       d="M 6,6 C 19,22 -3.7471829,48.338335 31.636364,48.363637 61.272846,26.482175 43,17 58,6"
-       id="path3179"
        style="fill:none;stroke:#eeeeec;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       id="path3179"
+       d="M 6,6 C 19,22 -3.7471829,48.338335 31.636364,48.363637 61.272846,26.482175 43,17 58,6" />
   </g>
   <g
-     id="g3900"
-     transform="translate(52.020267,18.050833)">
+     transform="translate(52.020267,18.050833)"
+     id="g3900">
     <path
-       d="M -24.85434,22.102082 A 8.993818,8.9934077 0.02042283 1 1 -11.191929,33.801697 8.993818,8.9934077 0.02042283 1 1 -24.85434,22.102082 z"
-       id="path4250-3"
        style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
+       id="path4250-3"
+       d="M -24.85434,22.102082 A 8.993818,8.9934077 0.02042283 1 1 -11.191929,33.801697 8.993818,8.9934077 0.02042283 1 1 -24.85434,22.102082 z" />
     <path
-       d="m -23.331724,23.413044 a 6.9999997,7.0000001 0 1 1 10.633588,9.106412 6.9999997,7.0000001 0 0 1 -10.633588,-9.106412 z"
-       id="path4250-7"
        style="fill:url(#linearGradient3904);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
+       id="path4250-7"
+       d="m -23.331724,23.413044 a 6.9999997,7.0000001 0 1 1 10.633588,9.106412 6.9999997,7.0000001 0 0 1 -10.633588,-9.106412 z" />
   </g>
   <g
-     id="g3900-2"
-     transform="matrix(0.45224439,0,0,0.45224439,39.150796,0.35891479)">
+     transform="matrix(0.45224439,0,0,0.45224439,39.150796,0.35891479)"
+     id="g3900-2">
     <g
-       id="g3946"
-       transform="translate(-53.068536,84.0255)">
+       transform="translate(-53.068536,84.0255)"
+       id="g3946">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z"
          id="path4250-3-6"
-         d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z" />
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient3990);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z"
          id="path4250-7-1"
-         d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z" />
+         style="fill:url(#linearGradient3990);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       transform="translate(57.491155,48.646399)"
-       id="g3946-0">
+       id="g3946-0"
+       transform="translate(57.491155,48.646399)">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z"
          id="path4250-3-6-2"
-         d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z" />
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient3967);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z"
          id="path4250-7-1-3"
-         d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z" />
+         style="fill:url(#linearGradient3967);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
   </g>
   <metadata
@@ -487,7 +425,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_BezSharpNode</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Sun Feb 2 18:22:27 2014 +0100</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_BezSymNode.svg b/src/Mod/Draft/Resources/icons/Draft_BezSymNode.svg
index 7296ca3a2d..7a1ab690d9 100644
--- a/src/Mod/Draft/Resources/icons/Draft_BezSymNode.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_BezSymNode.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,310 +6,252 @@
    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="svg3612"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_BezSymNode.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     id="namedview67"
-     showgrid="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:zoom="25.937694"
-     inkscape:cx="28.359904"
-     inkscape:cy="26.991916"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3044"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
+   height="64"
+   width="64"
+   version="1.1">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient3688"
-       xlink:href="#linearGradient3144-6"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+       xlink:href="#linearGradient3144-6"
+       id="radialGradient3688"
+       fy="672.79736"
+       fx="225.26402"
+       r="34.345188"
+       cy="672.79736"
+       cx="225.26402" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         offset="0"
          style="stop-color:#0619c0;stop-opacity:1"
-         offset="0" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         offset="1"
          style="stop-color:#379cfb;stop-opacity:1"
-         offset="1" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         offset="0"
          style="stop-color:#ffaa00;stop-opacity:1"
-         offset="0" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         offset="1"
          style="stop-color:#faff2b;stop-opacity:1"
-         offset="1" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         offset="0"
          style="stop-color:#0619c0;stop-opacity:1"
-         offset="0" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         offset="1"
          style="stop-color:#379cfb;stop-opacity:1"
-         offset="1" />
+         id="stop3868-7" />
     </linearGradient>
     <linearGradient
        id="linearGradient5048">
       <stop
-         id="stop5050"
+         offset="0"
          style="stop-color:#000000;stop-opacity:0"
-         offset="0" />
+         id="stop5050" />
       <stop
-         id="stop5056"
+         offset="0.5"
          style="stop-color:#000000;stop-opacity:1"
-         offset="0.5" />
+         id="stop5056" />
       <stop
-         id="stop5052"
+         offset="1"
          style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
+         id="stop5052" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         offset="0"
          style="stop-color:#0619c0;stop-opacity:1"
-         offset="0" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         offset="1"
          style="stop-color:#379cfb;stop-opacity:1"
-         offset="1" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       cx="20.892099"
-       cy="114.5684"
-       r="5.256"
-       fx="20.892099"
-       fy="114.5684"
+       gradientUnits="userSpaceOnUse"
        id="aigrd2"
-       gradientUnits="userSpaceOnUse">
+       fy="114.5684"
+       fx="20.892099"
+       r="5.256"
+       cy="114.5684"
+       cx="20.892099">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1"
          style="stop-color:#9a9a9a;stop-opacity:1"
-         offset="1" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       cx="20.892099"
-       cy="64.567902"
-       r="5.257"
-       fx="20.892099"
-       fy="64.567902"
+       gradientUnits="userSpaceOnUse"
        id="aigrd3"
-       gradientUnits="userSpaceOnUse">
+       fy="64.567902"
+       fx="20.892099"
+       r="5.257"
+       cy="64.567902"
+       cx="20.892099">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1"
          style="stop-color:#9a9a9a;stop-opacity:1"
-         offset="1" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         id="stop15664"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop15664" />
       <stop
-         id="stop15666"
+         offset="1"
          style="stop-color:#f8f8f8;stop-opacity:1"
-         offset="1" />
+         id="stop15666" />
     </linearGradient>
     <radialGradient
-       cx="33.966679"
-       cy="35.736916"
-       r="86.70845"
-       fx="33.966679"
-       fy="35.736916"
-       id="radialGradient4452"
-       xlink:href="#linearGradient259"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)" />
+       xlink:href="#linearGradient259"
+       id="radialGradient4452"
+       fy="35.736916"
+       fx="33.966679"
+       r="86.70845"
+       cy="35.736916"
+       cx="33.966679" />
     <linearGradient
        id="linearGradient259">
       <stop
-         id="stop260"
+         offset="0"
          style="stop-color:#fafafa;stop-opacity:1"
-         offset="0" />
+         id="stop260" />
       <stop
-         id="stop261"
+         offset="1"
          style="stop-color:#bbbbbb;stop-opacity:1"
-         offset="1" />
+         id="stop261" />
     </linearGradient>
     <radialGradient
-       cx="8.824419"
-       cy="3.7561285"
-       r="37.751713"
-       fx="8.824419"
-       fy="3.7561285"
-       id="radialGradient4454"
-       xlink:href="#linearGradient269"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)" />
+       xlink:href="#linearGradient269"
+       id="radialGradient4454"
+       fy="3.7561285"
+       fx="8.824419"
+       r="37.751713"
+       cy="3.7561285"
+       cx="8.824419" />
     <linearGradient
        id="linearGradient269">
       <stop
-         id="stop270"
+         offset="0"
          style="stop-color:#a3a3a3;stop-opacity:1"
-         offset="0" />
+         id="stop270" />
       <stop
-         id="stop271"
+         offset="1"
          style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="1" />
+         id="stop271" />
     </linearGradient>
     <linearGradient
        id="linearGradient4095">
       <stop
-         id="stop4097"
+         offset="0"
          style="stop-color:#005bff;stop-opacity:1"
-         offset="0" />
+         id="stop4097" />
       <stop
-         id="stop4099"
+         offset="1"
          style="stop-color:#c1e3f7;stop-opacity:1"
-         offset="1" />
+         id="stop4099" />
     </linearGradient>
     <linearGradient
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
-       id="linearGradient4253"
-       xlink:href="#linearGradient4247"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       xlink:href="#linearGradient4247"
+       id="linearGradient4253"
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         id="stop4249"
+         offset="0"
          style="stop-color:#2e8207;stop-opacity:1"
-         offset="0" />
+         id="stop4249" />
       <stop
-         id="stop4251"
+         offset="1"
          style="stop-color:#52ff00;stop-opacity:1"
-         offset="1" />
+         id="stop4251" />
     </linearGradient>
     <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4317"
-       xlink:href="#linearGradient3144-8"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+       xlink:href="#linearGradient3144-8"
+       id="radialGradient4317"
+       fy="672.79736"
+       fx="225.26402"
+       r="34.345188"
+       cy="672.79736"
+       cx="225.26402" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3148-4"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3904"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
-       x1="11.390151"
-       y1="453.55045"
-       x2="54.509644"
-       y2="485.54004" />
-    <linearGradient
-       id="linearGradient3836">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3146-96" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3148-4" />
     </linearGradient>
     <linearGradient
        y2="485.54004"
@@ -320,145 +260,144 @@
        x1="11.390151"
        gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4066"
-       xlink:href="#linearGradient3836"
-       inkscape:collect="always" />
+       id="linearGradient3904"
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       y2="475.68085"
-       x2="43.486729"
-       y1="453.55045"
-       x1="11.390151"
-       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       id="linearGradient3836">
+      <stop
+         id="stop3838"
+         offset="0"
+         style="stop-color:#3465a4;stop-opacity:1;" />
+      <stop
+         id="stop3840"
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3836"
+       id="linearGradient4066"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3967"
+       gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
        xlink:href="#linearGradient3836-6-7"
-       inkscape:collect="always" />
+       id="linearGradient3967"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="43.486729"
+       y2="475.68085" />
     <linearGradient
        id="linearGradient3836-6-7">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838-0-9"
          offset="0"
-         id="stop3838-0-9" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840-6-2"
          offset="1"
-         id="stop3840-6-2" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="475.68085"
-       x2="43.486729"
-       y1="453.55045"
-       x1="11.390151"
-       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4104"
        xlink:href="#linearGradient3836-6-7"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="475.68085"
-       x2="43.486729"
-       y1="453.55045"
-       x1="11.390151"
-       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       id="linearGradient4104"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3967-6"
+       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="43.486729"
+       y2="475.68085" />
+    <linearGradient
        xlink:href="#linearGradient3836-6-7-2"
-       inkscape:collect="always" />
+       id="linearGradient3967-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="43.486729"
+       y2="475.68085" />
     <linearGradient
        id="linearGradient3836-6-7-2">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838-0-9-9"
          offset="0"
-         id="stop3838-0-9-9" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840-6-2-1"
          offset="1"
-         id="stop3840-6-2-1" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="475.68085"
-       x2="43.486729"
-       y1="453.55045"
-       x1="11.390151"
-       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4104-2"
        xlink:href="#linearGradient3836-6-7-2"
-       inkscape:collect="always" />
+       id="linearGradient4104-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="43.486729"
+       y2="475.68085" />
   </defs>
   <g
      id="layer1">
     <path
-       d="M 6,6 C 14.181819,20.181818 14.575174,49.121665 31,49 47.424826,48.878335 49.818182,20.303031 58,6"
-       id="path3179"
        style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc" />
+       id="path3179"
+       d="M 6,6 C 14.181819,20.181818 14.575174,49.121665 31,49 47.424826,48.878335 49.818182,20.303031 58,6" />
     <path
-       d="m 7,51 48,0"
-       id="path3082"
        style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path3082"
+       d="m 7,51 48,0" />
     <path
-       d="M 6,6 C 14.181819,20.181818 14.575174,49.121665 31,49 47.424826,48.878335 49.818182,20.303031 58,6"
-       id="path3179-7"
        style="fill:none;stroke:#eeeeec;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc" />
+       id="path3179-7"
+       d="M 6,6 C 14.181819,20.181818 14.575174,49.121665 31,49 47.424826,48.878335 49.818182,20.303031 58,6" />
     <path
-       d="M 7,6 C 15,20 15.575102,48 31,48 46.424448,48 49.389827,19.481292 57,6"
-       id="path3179-7-5"
        style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc" />
+       id="path3179-7-5"
+       d="M 7,6 C 15,20 15.575102,48 31,48 46.424448,48 49.389827,19.481292 57,6" />
     <path
-       d="m 7,51 48,0"
-       id="path3082-3"
        style="fill:none;stroke:#eeeeec;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       id="path3082-3"
+       d="m 7,51 48,0" />
     <g
-       id="g3900"
-       transform="translate(49.026002,22.050833)">
+       transform="translate(49.026002,22.050833)"
+       id="g3900">
       <path
-         d="M -24.85434,22.102082 A 8.993818,8.9934077 0.02042283 1 1 -11.191929,33.801697 8.993818,8.9934077 0.02042283 1 1 -24.85434,22.102082 z"
-         id="path4250-3"
          style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
+         id="path4250-3"
+         d="M -24.85434,22.102082 A 8.993818,8.9934077 0.02042283 1 1 -11.191929,33.801697 8.993818,8.9934077 0.02042283 1 1 -24.85434,22.102082 z" />
       <path
-         d="m -23.331724,23.413044 a 6.9999997,7.0000001 0 1 1 10.633588,9.106412 6.9999997,7.0000001 0 0 1 -10.633588,-9.106412 z"
-         id="path4250-7"
          style="fill:url(#linearGradient4066);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
+         id="path4250-7"
+         d="m -23.331724,23.413044 a 6.9999997,7.0000001 0 1 1 10.633588,9.106412 6.9999997,7.0000001 0 0 1 -10.633588,-9.106412 z" />
     </g>
     <g
-       transform="matrix(0.45224439,0,0,0.45224439,63.150848,38.358769)"
-       id="g3946-0">
+       id="g3946-0"
+       transform="matrix(0.45224439,0,0,0.45224439,63.150848,38.358769)">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z"
          id="path4250-3-6-2"
-         d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z" />
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient4104);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z"
          id="path4250-7-1-3"
-         d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z" />
+         style="fill:url(#linearGradient4104);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       transform="matrix(0.45224439,0,0,0.45224439,15.150848,38.358769)"
-       id="g3946-0-7">
+       id="g3946-0-7"
+       transform="matrix(0.45224439,0,0,0.45224439,15.150848,38.358769)">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z"
          id="path4250-3-6-2-0"
-         d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z" />
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient4104-2);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z"
          id="path4250-7-1-3-9"
-         d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z" />
+         style="fill:url(#linearGradient4104-2);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
   </g>
   <metadata
@@ -469,7 +408,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_BezSymNode</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Thu Jan 30 09:16:37 2014 -0500</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_BezTanNode.svg b/src/Mod/Draft/Resources/icons/Draft_BezTanNode.svg
index b5ffec5644..96f37b5f45 100644
--- a/src/Mod/Draft/Resources/icons/Draft_BezTanNode.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_BezTanNode.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,428 +6,372 @@
    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="svg3612"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_BezTanNode.svg">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     id="namedview67"
-     showgrid="true"
-     inkscape:zoom="25.937694"
-     inkscape:cx="28.755792"
-     inkscape:cy="32.737045"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg3612"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3094"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
+   height="64"
+   width="64"
+   version="1.1">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient3688"
-       xlink:href="#linearGradient3144-6"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+       xlink:href="#linearGradient3144-6"
+       id="radialGradient3688"
+       fy="672.79736"
+       fx="225.26402"
+       r="34.345188"
+       cy="672.79736"
+       cx="225.26402" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         offset="0"
          style="stop-color:#0619c0;stop-opacity:1"
-         offset="0" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         offset="1"
          style="stop-color:#379cfb;stop-opacity:1"
-         offset="1" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         offset="0"
          style="stop-color:#ffaa00;stop-opacity:1"
-         offset="0" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         offset="1"
          style="stop-color:#faff2b;stop-opacity:1"
-         offset="1" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         offset="0"
          style="stop-color:#0619c0;stop-opacity:1"
-         offset="0" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         offset="1"
          style="stop-color:#379cfb;stop-opacity:1"
-         offset="1" />
+         id="stop3868-7" />
     </linearGradient>
     <linearGradient
        id="linearGradient5048">
       <stop
-         id="stop5050"
+         offset="0"
          style="stop-color:#000000;stop-opacity:0"
-         offset="0" />
+         id="stop5050" />
       <stop
-         id="stop5056"
+         offset="0.5"
          style="stop-color:#000000;stop-opacity:1"
-         offset="0.5" />
+         id="stop5056" />
       <stop
-         id="stop5052"
+         offset="1"
          style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
+         id="stop5052" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         offset="0"
          style="stop-color:#0619c0;stop-opacity:1"
-         offset="0" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         offset="1"
          style="stop-color:#379cfb;stop-opacity:1"
-         offset="1" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       cx="20.892099"
-       cy="114.5684"
-       r="5.256"
-       fx="20.892099"
-       fy="114.5684"
+       gradientUnits="userSpaceOnUse"
        id="aigrd2"
-       gradientUnits="userSpaceOnUse">
+       fy="114.5684"
+       fx="20.892099"
+       r="5.256"
+       cy="114.5684"
+       cx="20.892099">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1"
          style="stop-color:#9a9a9a;stop-opacity:1"
-         offset="1" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       cx="20.892099"
-       cy="64.567902"
-       r="5.257"
-       fx="20.892099"
-       fy="64.567902"
+       gradientUnits="userSpaceOnUse"
        id="aigrd3"
-       gradientUnits="userSpaceOnUse">
+       fy="64.567902"
+       fx="20.892099"
+       r="5.257"
+       cy="64.567902"
+       cx="20.892099">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#f0f0f0;stop-opacity:1"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1"
          style="stop-color:#9a9a9a;stop-opacity:1"
-         offset="1" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         id="stop15664"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop15664" />
       <stop
-         id="stop15666"
+         offset="1"
          style="stop-color:#f8f8f8;stop-opacity:1"
-         offset="1" />
+         id="stop15666" />
     </linearGradient>
     <radialGradient
-       cx="33.966679"
-       cy="35.736916"
-       r="86.70845"
-       fx="33.966679"
-       fy="35.736916"
-       id="radialGradient4452"
-       xlink:href="#linearGradient259"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)" />
+       xlink:href="#linearGradient259"
+       id="radialGradient4452"
+       fy="35.736916"
+       fx="33.966679"
+       r="86.70845"
+       cy="35.736916"
+       cx="33.966679" />
     <linearGradient
        id="linearGradient259">
       <stop
-         id="stop260"
+         offset="0"
          style="stop-color:#fafafa;stop-opacity:1"
-         offset="0" />
+         id="stop260" />
       <stop
-         id="stop261"
+         offset="1"
          style="stop-color:#bbbbbb;stop-opacity:1"
-         offset="1" />
+         id="stop261" />
     </linearGradient>
     <radialGradient
-       cx="8.824419"
-       cy="3.7561285"
-       r="37.751713"
-       fx="8.824419"
-       fy="3.7561285"
-       id="radialGradient4454"
-       xlink:href="#linearGradient269"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)" />
+       xlink:href="#linearGradient269"
+       id="radialGradient4454"
+       fy="3.7561285"
+       fx="8.824419"
+       r="37.751713"
+       cy="3.7561285"
+       cx="8.824419" />
     <linearGradient
        id="linearGradient269">
       <stop
-         id="stop270"
+         offset="0"
          style="stop-color:#a3a3a3;stop-opacity:1"
-         offset="0" />
+         id="stop270" />
       <stop
-         id="stop271"
+         offset="1"
          style="stop-color:#4c4c4c;stop-opacity:1"
-         offset="1" />
+         id="stop271" />
     </linearGradient>
     <linearGradient
        id="linearGradient4095">
       <stop
-         id="stop4097"
+         offset="0"
          style="stop-color:#005bff;stop-opacity:1"
-         offset="0" />
+         id="stop4097" />
       <stop
-         id="stop4099"
+         offset="1"
          style="stop-color:#c1e3f7;stop-opacity:1"
-         offset="1" />
+         id="stop4099" />
     </linearGradient>
     <linearGradient
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
-       id="linearGradient4253"
-       xlink:href="#linearGradient4247"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       xlink:href="#linearGradient4247"
+       id="linearGradient4253"
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         id="stop4249"
+         offset="0"
          style="stop-color:#2e8207;stop-opacity:1"
-         offset="0" />
+         id="stop4249" />
       <stop
-         id="stop4251"
+         offset="1"
          style="stop-color:#52ff00;stop-opacity:1"
-         offset="1" />
+         id="stop4251" />
     </linearGradient>
     <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4317"
-       xlink:href="#linearGradient3144-8"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+       xlink:href="#linearGradient3144-8"
+       id="radialGradient4317"
+       fy="672.79736"
+       fx="225.26402"
+       r="34.345188"
+       cy="672.79736"
+       cx="225.26402" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96" />
       <stop
-         id="stop3148-4"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4" />
     </linearGradient>
     <linearGradient
-       y2="475.68085"
-       x2="43.486729"
-       y1="453.55045"
-       x1="11.390151"
-       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4104-2"
        xlink:href="#linearGradient3836-6-7-2"
-       inkscape:collect="always" />
+       id="linearGradient4104-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="43.486729"
+       y2="475.68085" />
     <linearGradient
        id="linearGradient3836-6-7-2">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838-0-9-9"
          offset="0"
-         id="stop3838-0-9-9" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840-6-2-1"
          offset="1"
-         id="stop3840-6-2-1" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="475.68085"
-       x2="43.486729"
-       y1="453.55045"
-       x1="11.390151"
-       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4104"
        xlink:href="#linearGradient3836-6-7"
-       inkscape:collect="always" />
+       id="linearGradient4104"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.09187035,-0.08168588,0.07867548,-0.09538562,-52.403314,74.666518)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="43.486729"
+       y2="475.68085" />
     <linearGradient
        id="linearGradient3836-6-7">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838-0-9"
          offset="0"
-         id="stop3838-0-9" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840-6-2"
          offset="1"
-         id="stop3840-6-2" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="485.54004"
-       x2="54.509644"
-       y1="453.55045"
-       x1="11.390151"
-       gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4066"
        xlink:href="#linearGradient3836"
-       inkscape:collect="always" />
+       id="linearGradient4066"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.14542185,-0.12929023,0.12453566,-0.15097382,-72.432453,101.90107)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="54.509644"
+       y2="485.54004" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
   </defs>
   <g
      id="layer1">
     <path
-       d="M 6,6 C 14,20 14.575174,48.121665 31,48 47.424826,47.878335 49,20 58,6"
-       id="path3179"
        style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc" />
+       id="path3179"
+       d="M 6,6 C 14,20 14.575174,48.121665 31,48 47.424826,47.878335 49,20 58,6" />
     <path
-       d="M 6,6 C 14,20 14.575174,48.121665 31,48 47.424826,47.878335 49,20 58,6"
-       id="path3179-7"
        style="fill:none;stroke:#eeeeec;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc" />
+       id="path3179-7"
+       d="M 6,6 C 14,20 14.575174,48.121665 31,48 47.424826,47.878335 49,20 58,6" />
     <path
-       d="M 6,5 C 16,20 14.575174,47.121665 31,47 47.424826,46.878335 48,20 58,5"
-       id="path3179-7-5"
        style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csc" />
+       id="path3179-7-5"
+       d="M 6,5 C 16,20 14.575174,47.121665 31,47 47.424826,46.878335 48,20 58,5" />
   </g>
   <path
-     d="m 6.8342657,48.994555 40.3200003,0"
-     id="path3082-36"
      style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
+     id="path3082-36"
+     d="m 6.8342657,48.994555 40.3200003,0" />
   <path
-     d="m 6.8342657,48.994555 40.3200003,0"
-     id="path3082-3"
      style="fill:none;stroke:#eeeeec;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cc" />
+     id="path3082-3"
+     d="m 6.8342657,48.994555 40.3200003,0" />
   <g
-     id="g3900"
-     transform="translate(49.020267,20.045388)">
+     transform="translate(49.020267,20.045388)"
+     id="g3900">
     <path
-       d="M -24.85434,22.102082 A 8.993818,8.9934077 0.02042283 1 1 -11.191929,33.801697 8.993818,8.9934077 0.02042283 1 1 -24.85434,22.102082 z"
-       id="path4250-3"
        style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
+       id="path4250-3"
+       d="M -24.85434,22.102082 A 8.993818,8.9934077 0.02042283 1 1 -11.191929,33.801697 8.993818,8.9934077 0.02042283 1 1 -24.85434,22.102082 z" />
     <path
-       d="m -23.331724,23.413044 a 6.9999997,7.0000001 0 1 1 10.633588,9.106412 6.9999997,7.0000001 0 0 1 -10.633588,-9.106412 z"
-       id="path4250-7"
        style="fill:url(#linearGradient4066);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
+       id="path4250-7"
+       d="m -23.331724,23.413044 a 6.9999997,7.0000001 0 1 1 10.633588,9.106412 6.9999997,7.0000001 0 0 1 -10.633588,-9.106412 z" />
   </g>
   <g
-     transform="matrix(0.45224439,0,0,0.45224439,55.150848,36.358976)"
-     id="g3946-0">
+     id="g3946-0"
+     transform="matrix(0.45224439,0,0,0.45224439,55.150848,36.358976)">
     <path
-       inkscape:connector-curvature="0"
-       style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z"
        id="path4250-3-6-2"
-       d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z" />
+       style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient4104);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z"
        id="path4250-7-1-3"
-       d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z" />
+       style="fill:url(#linearGradient4104);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <g
-     transform="matrix(0.45224439,0,0,0.45224439,15.145113,36.353324)"
-     id="g3946-0-7">
+     id="g3946-0-7"
+     transform="matrix(0.45224439,0,0,0.45224439,15.145113,36.353324)">
     <path
-       inkscape:connector-curvature="0"
-       style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z"
        id="path4250-3-6-2-0"
-       d="M -24.738496,22.201269 A 8.8415964,8.8410632 0.01544676 1 1 -11.307323,33.702698 8.8415964,8.8410632 0.01544676 1 1 -24.738496,22.201269 z" />
+       style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:4.4223876;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient4104-2);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z"
        id="path4250-7-1-3-9"
-       d="m -21.383898,25.077595 a 4.4222541,4.4226169 0 1 1 6.717775,5.753453 4.4222541,4.4226169 0 0 1 -6.717775,-5.753453 z" />
+       style="fill:url(#linearGradient4104-2);fill-opacity:1;stroke:#729fcf;stroke-width:4.42238665;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <metadata
      id="metadata3697">
@@ -439,7 +381,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_BezTanNode</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Thu Jan 30 09:16:37 2014 -0500</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Circle.svg b/src/Mod/Draft/Resources/icons/Draft_Circle.svg
index c3a235f070..2882b39623 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Circle.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Circle.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,258 +6,166 @@
    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"
+   version="1.1"
    id="svg2918"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Circle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2920">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3892">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3894"
          offset="0"
-         id="stop3894" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3896"
          offset="1"
-         id="stop3896" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3850">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3852"
          offset="0"
-         id="stop3852" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3854"
          offset="1"
-         id="stop3854" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2926" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-7"
-       id="linearGradient3801-1-1"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-1"
+       xlink:href="#linearGradient3836-0-7" />
     <linearGradient
        id="linearGradient3836-0-7">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-4"
          offset="0"
-         id="stop3838-2-4" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-0"
          offset="1"
-         id="stop3840-5-0" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3850"
+       gradientUnits="userSpaceOnUse"
+       y2="28.644661"
+       x2="30.783579"
+       y1="4.8241611"
+       x1="22.84341"
        id="linearGradient3856"
-       x1="22.84341"
-       y1="4.8241611"
-       x2="30.783579"
-       y2="28.644661"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3850" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3850-5"
+       gradientUnits="userSpaceOnUse"
+       y2="28.644661"
+       x2="30.783579"
+       y1="4.8241611"
+       x1="22.84341"
        id="linearGradient3856-5"
-       x1="22.84341"
-       y1="4.8241611"
-       x2="30.783579"
-       y2="28.644661"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3850-5" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3850-5">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3852-1"
          offset="0"
-         id="stop3852-1" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3854-7"
          offset="1"
-         id="stop3854-7" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3892"
-       id="linearGradient3898"
-       x1="37.429146"
-       y1="41.590584"
-       x2="24.483221"
+       gradientUnits="userSpaceOnUse"
        y2="4.9104676"
-       gradientUnits="userSpaceOnUse" />
+       x2="24.483221"
+       y1="41.590584"
+       x1="37.429146"
+       id="linearGradient3898"
+       xlink:href="#linearGradient3892" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="28.832031"
-     inkscape:cx="17.869686"
-     inkscape:cy="30.814"
-     inkscape:current-layer="g4470"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2998"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       color="#ff0000"
-       opacity="0.1254902"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3000"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4470"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-       inkscape:export-xdpi="6.7850704"
-       inkscape:export-ydpi="6.7850704"
-       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)"
+       id="g4470">
       <g
          id="g4428">
         <path
-           sodipodi:type="arc"
-           style="fill:none;stroke:#2e3436;stroke-width:8.27354764;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)"
+           d="M 53.611551,28.644661 A 24.813021,24.813021 0 0 1 28.798531,53.457682 24.813021,24.813021 0 0 1 3.9855099,28.644661 24.813021,24.813021 0 0 1 28.798531,3.8316402 24.813021,24.813021 0 0 1 53.611551,28.644661 Z"
            id="path3044"
-           sodipodi:cx="28.798531"
-           sodipodi:cy="28.644661"
-           sodipodi:rx="24.813021"
-           sodipodi:ry="24.813021"
-           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
-           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+           style="fill:none;stroke:#2e3436;stroke-width:8.27354764;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           sodipodi:type="arc"
-           style="fill:none;stroke:#d3d7cf;stroke-width:4.13677382000000020;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)"
+           d="M 53.611551,28.644661 A 24.813021,24.813021 0 0 1 28.798531,53.457682 24.813021,24.813021 0 0 1 3.9855099,28.644661 24.813021,24.813021 0 0 1 28.798531,3.8316402 24.813021,24.813021 0 0 1 53.611551,28.644661 Z"
            id="path3044-2"
-           sodipodi:cx="28.798531"
-           sodipodi:cy="28.644661"
-           sodipodi:rx="24.813021"
-           sodipodi:ry="24.813021"
-           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
-           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+           style="fill:none;stroke:#d3d7cf;stroke-width:4.13677382000000020;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           sodipodi:type="arc"
-           style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765380999999980;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)"
+           d="M 53.611551,28.644661 A 24.813021,24.813021 0 0 1 28.798531,53.457682 24.813021,24.813021 0 0 1 3.9855099,28.644661 24.813021,24.813021 0 0 1 28.798531,3.8316402 24.813021,24.813021 0 0 1 53.611551,28.644661 Z"
            id="path3044-2-4-1"
-           sodipodi:cx="28.798531"
-           sodipodi:cy="28.644661"
-           sodipodi:rx="24.813021"
-           sodipodi:ry="24.813021"
-           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
-           transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+           style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765380999999980;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           sodipodi:type="arc"
-           style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504162000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)"
+           d="M 53.611551,28.644661 A 24.813021,24.813021 0 0 1 28.798531,53.457682 24.813021,24.813021 0 0 1 3.9855099,28.644661 24.813021,24.813021 0 0 1 28.798531,3.8316402 24.813021,24.813021 0 0 1 53.611551,28.644661 Z"
            id="path3044-2-4"
-           sodipodi:cx="28.798531"
-           sodipodi:cy="28.644661"
-           sodipodi:rx="24.813021"
-           sodipodi:ry="24.813021"
-           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
-           transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
+           style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504162000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <g
-           transform="matrix(6.8476923,0,0,6.8476923,1781.1444,248.54544)"
-           id="g3827-1-9">
+           id="g3827-1-9"
+           transform="matrix(6.8476923,0,0,6.8476923,1781.1444,248.54544)">
           <g
-             transform="translate(31.322131,40.570289)"
-             id="g3797-9-4">
+             id="g3797-9-4"
+             transform="translate(31.322131,40.570289)">
             <path
-               inkscape:connector-curvature="0"
-               style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
                id="path4250-71-8"
-               d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+               style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
             <path
-               inkscape:connector-curvature="0"
-               style="fill:url(#linearGradient3801-1-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
                id="path4250-7-3-8"
-               d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+               style="fill:url(#linearGradient3801-1-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           </g>
         </g>
       </g>
       <g
-         transform="matrix(6.8476923,0,0,6.8476923,1630.4952,248.54544)"
-         id="g3827-1">
+         id="g3827-1"
+         transform="matrix(6.8476923,0,0,6.8476923,1630.4952,248.54544)">
         <g
-           transform="translate(31.322131,40.570289)"
-           id="g3797-9">
+           id="g3797-9"
+           transform="translate(31.322131,40.570289)">
           <path
-             inkscape:connector-curvature="0"
-             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
              id="path4250-71"
-             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
              id="path4250-7-3"
-             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+             style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
     </g>
@@ -272,7 +178,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Circle</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_CircularArray.svg b/src/Mod/Draft/Resources/icons/Draft_CircularArray.svg
index 26fbea8978..c9ecf6d2f4 100644
--- a/src/Mod/Draft/Resources/icons/Draft_CircularArray.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_CircularArray.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,396 +6,306 @@
    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 (2405546, 2018-03-11)"
-   sodipodi:docname="Draft_CircularArray.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Draft_wb_primitives/Draft_Array/Draft_Array_Ortho_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   id="svg5821"
+   height="64px"
+   width="64px">
   <defs
      id="defs5823">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6351"
          offset="0"
-         id="stop6351" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6353"
          offset="1"
-         id="stop6353" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#0019a3;stop-opacity:1;" />
       <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#0069ff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
        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" />
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3377" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
+       r="194.40614"
+       fy="1424.4465"
+       fx="1103.6399"
+       cy="1424.4465"
+       cx="1103.6399"
+       id="radialGradient6355"
+       xlink:href="#linearGradient6349" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7"
          offset="0"
-         id="stop3793-7" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5"
          offset="1"
-         id="stop3795-5" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6"
-       id="linearGradient3820"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3820"
+       xlink:href="#linearGradient3791-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-0">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-6"
          offset="0"
-         id="stop3793-6" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-2"
          offset="1"
-         id="stop3795-2" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-0"
-       id="linearGradient3896"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3896"
+       xlink:href="#linearGradient3791-0" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-2">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-9"
          offset="0"
-         id="stop3793-9" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-3"
          offset="1"
-         id="stop3795-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-2"
-       id="linearGradient3896-1"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3896-1"
+       xlink:href="#linearGradient3791-2" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         id="stop3838"
+         style="stop-color:#3465a4;stop-opacity:1;"
          offset="0"
-         style="stop-color:#3465a4;stop-opacity:1;" />
+         id="stop3838" />
       <stop
-         id="stop3840"
+         style="stop-color:#729fcf;stop-opacity:1;"
          offset="1"
-         style="stop-color:#729fcf;stop-opacity:1;" />
+         id="stop3840" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3620"
-       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" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3588" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3692" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         offset="0"
+         id="stop3146-9"
          style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3146-9" />
+         offset="0" />
       <stop
-         offset="1"
+         id="stop3148-2"
          style="stop-color:#ffffff;stop-opacity:0"
-         id="stop3148-2" />
+         offset="1" />
     </linearGradient>
     <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3688"
        xlink:href="#linearGradient3144-6"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3805" />
+       id="radialGradient3688"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         style="stop-color:#0619c0;stop-opacity:1;"
+         id="stop3866-5-7"
          offset="0"
-         id="stop3866-5-7" />
+         style="stop-color:#0619c0;stop-opacity:1;" />
       <stop
-         style="stop-color:#379cfb;stop-opacity:1;"
+         id="stop3868-7-6"
          offset="1"
-         id="stop3868-7-6" />
+         style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377-3">
       <stop
-         style="stop-color:#ffaa00;stop-opacity:1;"
+         id="stop3379-6"
          offset="0"
-         id="stop3379-6" />
+         style="stop-color:#ffaa00;stop-opacity:1;" />
       <stop
-         style="stop-color:#faff2b;stop-opacity:1;"
+         id="stop3381-7"
          offset="1"
-         id="stop3381-7" />
+         style="stop-color:#faff2b;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3902" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         id="stop5050"
+         style="stop-color:black;stop-opacity:0;"
          offset="0"
-         style="stop-color:black;stop-opacity:0;" />
+         id="stop5050" />
       <stop
-         style="stop-color:black;stop-opacity:1;"
+         id="stop5056"
          offset="0.5"
-         id="stop5056" />
+         style="stop-color:black;stop-opacity:1;" />
       <stop
-         id="stop5052"
+         style="stop-color:black;stop-opacity:0;"
          offset="1"
-         style="stop-color:black;stop-opacity:0;" />
+         id="stop5052" />
     </linearGradient>
     <radialGradient
-       id="aigrd2"
-       cx="20.892099"
-       cy="114.5684"
-       r="5.256"
-       fx="20.892099"
+       gradientUnits="userSpaceOnUse"
        fy="114.5684"
-       gradientUnits="userSpaceOnUse">
+       fx="20.892099"
+       r="5.256"
+       cy="114.5684"
+       cx="20.892099"
+       id="aigrd2">
       <stop
-         offset="0"
+         id="stop15566"
          style="stop-color:#F0F0F0"
-         id="stop15566" />
+         offset="0" />
       <stop
-         offset="1.0000000"
+         id="stop15568"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         id="stop15568" />
+         offset="1.0000000" />
     </radialGradient>
     <radialGradient
-       id="aigrd3"
-       cx="20.892099"
-       cy="64.567902"
-       r="5.257"
-       fx="20.892099"
+       gradientUnits="userSpaceOnUse"
        fy="64.567902"
-       gradientUnits="userSpaceOnUse">
+       fx="20.892099"
+       r="5.257"
+       cy="64.567902"
+       cx="20.892099"
+       id="aigrd3">
       <stop
-         offset="0"
+         id="stop15573"
          style="stop-color:#F0F0F0"
-         id="stop15573" />
+         offset="0" />
       <stop
-         offset="1.0000000"
+         id="stop15575"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         id="stop15575" />
+         offset="1.0000000" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         id="stop15664"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
          offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+         id="stop15664" />
       <stop
-         id="stop15666"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
          offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+         id="stop15666" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient4452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       cx="33.966679"
-       cy="35.736916"
-       fx="33.966679"
+       r="86.70845"
        fy="35.736916"
-       r="86.70845" />
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4452"
+       xlink:href="#linearGradient259" />
     <linearGradient
        id="linearGradient259">
       <stop
-         id="stop260"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
          offset="0.0000000"
-         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+         id="stop260" />
       <stop
-         id="stop261"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
          offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+         id="stop261" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient269"
-       id="radialGradient4454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       cx="8.824419"
-       cy="3.7561285"
-       fx="8.824419"
+       r="37.751713"
        fy="3.7561285"
-       r="37.751713" />
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4454"
+       xlink:href="#linearGradient269" />
     <linearGradient
        id="linearGradient269">
       <stop
-         id="stop270"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
          offset="0.0000000"
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+         id="stop270" />
       <stop
-         id="stop271"
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
          offset="1.0000000"
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+         id="stop271" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective4947" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         id="stop4097"
+         style="stop-color:#005bff;stop-opacity:1;"
          offset="0"
-         style="stop-color:#005bff;stop-opacity:1;" />
+         id="stop4097" />
       <stop
-         id="stop4099"
+         style="stop-color:#c1e3f7;stop-opacity:1;"
          offset="1"
-         style="stop-color:#c1e3f7;stop-opacity:1;" />
+         id="stop4099" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective5027" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective5076" />
     <linearGradient
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
-       gradientUnits="userSpaceOnUse"
-       y2="140.22731"
-       x2="434.73947"
-       y1="185.1304"
-       x1="394.15784"
-       id="linearGradient4253"
        xlink:href="#linearGradient4247"
-       inkscape:collect="always" />
+       id="linearGradient4253"
+       x1="394.15784"
+       y1="185.1304"
+       x2="434.73947"
+       y2="140.22731"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         id="stop4249"
+         style="stop-color:#2e8207;stop-opacity:1;"
          offset="0"
-         style="stop-color:#2e8207;stop-opacity:1;" />
+         id="stop4249" />
       <stop
-         id="stop4251"
+         style="stop-color:#52ff00;stop-opacity:1;"
          offset="1"
-         style="stop-color:#52ff00;stop-opacity:1;" />
+         id="stop4251" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective5141" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective5225" />
+    <linearGradient
+       xlink:href="#linearGradient3836"
+       id="linearGradient3922"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="54.509644"
+       y2="485.54004" />
     <linearGradient
        y2="485.54004"
        x2="54.509644"
@@ -405,219 +313,150 @@
        x1="11.390151"
        gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3922"
-       xlink:href="#linearGradient3836"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
        id="linearGradient1217"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
-       x1="11.390151"
-       y1="453.55045"
-       x2="54.509644"
-       y2="485.54004" />
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
+       y2="485.54004"
+       x2="54.509644"
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient1233"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
-       x1="11.390151"
-       y1="453.55045"
-       x2="54.509644"
-       y2="485.54004" />
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
+       y2="485.54004"
+       x2="54.509644"
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient1241"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
-       x1="11.390151"
-       y1="453.55045"
-       x2="54.509644"
-       y2="485.54004" />
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
+       y2="485.54004"
+       x2="54.509644"
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient1259"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
-       x1="11.390151"
-       y1="453.55045"
-       x2="54.509644"
-       y2="485.54004" />
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
+       y2="485.54004"
+       x2="54.509644"
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient4972"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
-       x1="11.390151"
-       y1="453.55045"
-       x2="54.509644"
-       y2="485.54004" />
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient4980"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4980"
+       xlink:href="#linearGradient3836" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.299484"
-     inkscape:cx="25.584457"
-     inkscape:cy="28.799058"
-     inkscape:current-layer="g3360"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1853"
-     inkscape:window-height="1025"
-     inkscape:window-x="1433"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3010"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1"
-       spacingy="1"
-       originx="0"
-       originy="0" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <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.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)"
+       id="g3360">
       <g
-         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,734.46171,1854.2651)"
+         style="stroke:#3465a4;stroke-width:0.8096711"
          id="g3906"
-         style="stroke:#3465a4;stroke-width:0.8096711">
+         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,734.46171,1854.2651)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z"
            id="path4250"
-           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z" />
+           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z"
            id="path4250-7"
-           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z" />
+           style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
       <g
-         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,891.57365,1854.2651)"
+         style="stroke:#3465a4;stroke-width:0.8096711"
          id="g1215"
-         style="stroke:#3465a4;stroke-width:0.8096711">
+         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,891.57365,1854.2651)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z"
            id="path1211"
-           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z" />
+           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient1217);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z"
            id="path1213"
-           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z" />
+           style="fill:url(#linearGradient1217);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
       <g
-         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,650.32142,1707.8349)"
+         style="stroke:#3465a4;stroke-width:0.8096711"
          id="g1231"
-         style="stroke:#3465a4;stroke-width:0.8096711">
+         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,650.32142,1707.8349)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z"
            id="path1227"
-           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z" />
+           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient1233);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z"
            id="path1229"
-           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z" />
+           style="fill:url(#linearGradient1233);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
       <g
-         style="stroke:#3465a4;stroke-width:0.8096711"
+         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,650.32142,2007.5725)"
          id="g1239"
-         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,650.32142,2007.5725)">
-        <path
-           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z"
-           id="path1235"
-           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z"
-           id="path1237"
-           style="fill:url(#linearGradient1241);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         style="stroke:#3465a4;stroke-width:0.8096711"
-         id="g1257"
-         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,577.21468,1854.2651)">
-        <path
-           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z"
-           id="path1253"
-           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z"
-           id="path1255"
-           style="fill:url(#linearGradient1259);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         style="stroke:#3465a4;stroke-width:0.8096711"
-         id="g4970"
-         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,818.46691,1707.8349)">
-        <path
-           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z"
-           id="path4966"
-           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-        <path
-           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z"
-           id="path4968"
-           style="fill:url(#linearGradient4972);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,818.46691,2007.5725)"
-         id="g4978"
          style="stroke:#3465a4;stroke-width:0.8096711">
         <path
-           inkscape:connector-curvature="0"
            style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path4974"
+           id="path1235"
            d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient4980);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path4976"
+           style="fill:url(#linearGradient1241);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path1237"
            d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z" />
       </g>
+      <g
+         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,577.21468,1854.2651)"
+         id="g1257"
+         style="stroke:#3465a4;stroke-width:0.8096711">
+        <path
+           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path1253"
+           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z" />
+        <path
+           style="fill:url(#linearGradient1259);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path1255"
+           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z" />
+      </g>
+      <g
+         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,818.46691,1707.8349)"
+         id="g4970"
+         style="stroke:#3465a4;stroke-width:0.8096711">
+        <path
+           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4966"
+           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z" />
+        <path
+           style="fill:url(#linearGradient4972);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4968"
+           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z" />
+      </g>
+      <g
+         style="stroke:#3465a4;stroke-width:0.8096711"
+         id="g4978"
+         transform="matrix(-1.0281913,-0.88047731,0.88051744,-1.0281444,818.46691,2007.5725)">
+        <path
+           d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z"
+           id="path4974"
+           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z"
+           id="path4976"
+           style="fill:url(#linearGradient4980);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      </g>
     </g>
   </g>
   <metadata
@@ -628,13 +467,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Array</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Sat Dec 10 18:31:32 2011 +0000</dc:date>
         <dc:creator>
           <cc:Agent>
-            <dc:title>[yorikvanhavre]</dc:title>
+            <dc:title>vocx</dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:rights>
@@ -651,13 +490,13 @@
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
+            <dc:title>agryson, yorikvanhavre</dc:title>
           </cc:Agent>
         </dc:contributor>
-        <dc:description>Six rectangles in a 2 x 3 linear array</dc:description>
+        <dc:description>Seven circles, in a circular array</dc:description>
         <dc:subject>
           <rdf:Bag>
-            <rdf:li>rectangle</rdf:li>
+            <rdf:li>circular</rdf:li>
             <rdf:li>array</rdf:li>
           </rdf:Bag>
         </dc:subject>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Clone.svg b/src/Mod/Draft/Resources/icons/Draft_Clone.svg
index 7e20c43c4a..f244e9e449 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Clone.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Clone.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,18 +6,11 @@
    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"
-   id="svg2"
-   width="64"
-   height="64"
    viewBox="0 0 63.999999 64"
-   sodipodi:docname="Draft_Clone.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   inkscape:export-filename="C:\Users\Rafael\bitmap.png"
-   inkscape:export-xdpi="300"
-   inkscape:export-ydpi="300">
+   height="64"
+   width="64"
+   id="svg2"
+   version="1.1">
   <metadata
      id="metadata8">
     <rdf:RDF>
@@ -29,507 +20,278 @@
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title></dc:title>
+        <dc:contributor>
+          <cc:Agent>
+            <dc:title>vocx</dc:title>
+          </cc:Agent>
+        </dc:contributor>
+        <dc:description>A cloned sheep</dc:description>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>yorikvanhavre</dc:title>
+          </cc:Agent>
+        </dc:creator>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <defs
      id="defs6">
     <linearGradient
-       id="linearGradient872"
-       inkscape:collect="always">
+       id="linearGradient872">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop870"
          offset="0"
-         id="stop870" />
+         style="stop-color:#729fcf;stop-opacity:1" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop868"
          offset="1"
-         id="stop868" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4739">
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop4735"
          offset="0"
-         id="stop4735" />
+         style="stop-color:#204a87;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop4737"
          offset="1"
-         id="stop4737" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3797">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3799-3"
          offset="0"
-         id="stop3799-3" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3801"
          offset="1"
-         id="stop3801" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3797"
+       gradientTransform="matrix(1,0,0,1.0981138,0.14321474,-55.839871)"
+       gradientUnits="userSpaceOnUse"
+       y2="51.499367"
+       x2="44.398445"
+       y1="51.499367"
+       x1="18.145235"
        id="linearGradient4687-1-6-6"
-       x1="18.145235"
-       y1="51.499367"
-       x2="44.398445"
-       y2="51.499367"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0981138,0.14321474,-55.839871)" />
+       xlink:href="#linearGradient3797" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3797"
-       id="linearGradient4695-7-8-7-0"
-       x1="0.18017258"
-       y1="36.248028"
-       x2="14.623517"
+       gradientTransform="matrix(-1,0,0,1,57.200391,-43.587124)"
+       gradientUnits="userSpaceOnUse"
        y2="36.248028"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,57.200391,-43.587124)" />
+       x2="14.623517"
+       y1="36.248028"
+       x1="0.18017258"
+       id="linearGradient4695-7-8-7-0"
+       xlink:href="#linearGradient3797" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3797"
-       id="linearGradient4687-1-6-6-8"
-       x1="18.145235"
-       y1="51.499367"
-       x2="44.398445"
+       gradientTransform="matrix(1,0,0,1.0981138,45.686839,-56.465414)"
+       gradientUnits="userSpaceOnUse"
        y2="51.499367"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0981138,45.686839,-56.465414)" />
+       x2="44.398445"
+       y1="51.499367"
+       x1="18.145235"
+       id="linearGradient4687-1-6-6-8"
+       xlink:href="#linearGradient3797" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3797"
-       id="linearGradient1065"
-       x1="26.11158"
-       y1="2.9369314"
-       x2="44.096264"
+       gradientTransform="matrix(1.2002734,0,0,1.2002734,-6.0365755,41.424104)"
+       gradientUnits="userSpaceOnUse"
        y2="2.9110429"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2002734,0,0,1.2002734,-6.0365755,41.424104)" />
+       x2="44.096264"
+       y1="2.9369314"
+       x1="26.11158"
+       id="linearGradient1065"
+       xlink:href="#linearGradient3797" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3797"
-       id="linearGradient4655"
-       x1="108"
-       y1="46"
-       x2="128"
+       gradientTransform="translate(-86.020077,-13.687753)"
+       gradientUnits="userSpaceOnUse"
        y2="46"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-86.020077,-13.687753)" />
+       x2="128"
+       y1="46"
+       x1="108"
+       id="linearGradient4655"
+       xlink:href="#linearGradient3797" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4739"
+       y2="31.812008"
+       x2="45.765244"
+       y1="31.725029"
+       x1="18.702328"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient4743"
-       gradientUnits="userSpaceOnUse"
-       x1="18.702328"
-       y1="31.725029"
-       x2="45.765244"
-       y2="31.812008" />
+       xlink:href="#linearGradient4739" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4739"
-       id="linearGradient995"
-       gradientUnits="userSpaceOnUse"
-       x1="39.971127"
-       y1="44.082279"
-       x2="26.592251"
+       gradientTransform="translate(78.922405,4.6396909)"
        y2="23.73741"
-       gradientTransform="translate(78.922405,4.6396909)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4739"
-       id="linearGradient949"
+       x2="26.592251"
+       y1="44.082279"
+       x1="39.971127"
        gradientUnits="userSpaceOnUse"
-       x1="18.702328"
-       y1="31.725029"
+       id="linearGradient995"
+       xlink:href="#linearGradient4739" />
+    <linearGradient
+       y2="31.812008"
        x2="45.765244"
-       y2="31.812008" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient872"
-       id="linearGradient1022"
+       y1="31.725029"
+       x1="18.702328"
        gradientUnits="userSpaceOnUse"
-       x1="21.974438"
-       y1="29.822496"
+       id="linearGradient949"
+       xlink:href="#linearGradient4739" />
+    <linearGradient
+       y2="35.507179"
        x2="52.530876"
-       y2="35.507179" />
+       y1="29.822496"
+       x1="21.974438"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1022"
+       xlink:href="#linearGradient872" />
   </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1853"
-     inkscape:window-height="1019"
-     id="namedview4"
-     showgrid="true"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="3.4904132"
-     inkscape:cy="45.590477"
-     inkscape:current-layer="g1020"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-x="1433"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-to-guides="false"
-     inkscape:snap-grids="false">
-    <sodipodi:guide
-       position="31.996582,73.141358"
-       orientation="1,0"
-       id="guide4620"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="2.03125,61.3125"
-       orientation="1,0"
-       id="guide853"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="62.004426,63.94897"
-       orientation="1,0"
-       id="guide855"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="8.53125,2"
-       orientation="0,1"
-       id="guide857"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="1.09375,62.000001"
-       orientation="0,1"
-       id="guide859"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="4.1875,32"
-       orientation="0,1"
-       id="guide861"
-       inkscape:locked="false" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid863"
-       empspacing="2" />
-    <sodipodi:guide
-       position="67.793862,19.091883"
-       orientation="0,1"
-       id="guide916"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="9.413359,39.023455"
-       orientation="0,1"
-       id="guide918"
-       inkscape:locked="false" />
-  </sodipodi:namedview>
   <g
-     id="g4675"
-     transform="matrix(1.0161989,0,0,1.0161989,-0.46489119,-0.38459578)">
+     transform="matrix(1.0161989,0,0,1.0161989,-0.46489119,-0.38459578)"
+     id="g4675">
     <g
-       id="g1045"
-       transform="translate(27.100757,23.156998)" />
+       transform="translate(27.100757,23.156998)"
+       id="g1045" />
     <g
-       id="g1020"
-       transform="matrix(1.0609942,0,0,1.0609942,-1.9456602,-1.9888296)">
+       transform="matrix(1.0609942,0,0,1.0609942,-1.9456602,-1.9888296)"
+       id="g1020">
       <path
-         transform="matrix(1.1051629,0,0,1.1051629,-3.3975789,-3.4322105)"
-         style="fill:url(#linearGradient1022);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 46.862923,19.416557 c 1.66448,-7.41576 -2.46805,-8.904332 -8.5834,-8.36557 -4.11598,-2.663978 -8.27216,-3.770605 -12.55492,0.02414 -9.092843,-1.4097023 -9.656833,2.766969 -7.92369,8.256193 -2.73442,1.388934 -5.868243,2.528459 -4.07631,6.743807 -7.680309,2.33437 -5.7802556,8.942561 -4.1199056,15.266333 5.5618756,0.0094 4.4051156,-7.129743 8.5057256,-11.000703 0.59642,13.168027 3.40522,23.70858 13.88958,25.133475 9.57683,-1.495739 14.31812,-9.769102 13.97992,-25.161985 3.71316,4.605098 2.370548,10.614916 9.210148,10.704411 -0.5217,-5.949656 3.023801,-12.794017 -3.914549,-15.177637 1.68354,-4.071161 -1.666449,-5.112266 -4.412599,-6.422464 z"
          id="path4647"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccc" />
+         d="m 46.862923,19.416557 c 1.66448,-7.41576 -2.46805,-8.904332 -8.5834,-8.36557 -4.11598,-2.663978 -8.27216,-3.770605 -12.55492,0.02414 -9.092843,-1.4097023 -9.656833,2.766969 -7.92369,8.256193 -2.73442,1.388934 -5.868243,2.528459 -4.07631,6.743807 -7.680309,2.33437 -5.7802556,8.942561 -4.1199056,15.266333 5.5618756,0.0094 4.4051156,-7.129743 8.5057256,-11.000703 0.59642,13.168027 3.40522,23.70858 13.88958,25.133475 9.57683,-1.495739 14.31812,-9.769102 13.97992,-25.161985 3.71316,4.605098 2.370548,10.614916 9.210148,10.704411 -0.5217,-5.949656 3.023801,-12.794017 -3.914549,-15.177637 1.68354,-4.071161 -1.666449,-5.112266 -4.412599,-6.422464 z"
+         style="fill:url(#linearGradient1022);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         transform="matrix(1.1051629,0,0,1.1051629,-3.3975789,-3.4322105)" />
       <path
-         style="fill:none;fill-opacity:1;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 10.406304,25.263156 C 8.2839879,27.271095 6.7135569,29.390094 6.6157637,29.943264 4.0263487,34.00175 5.9212349,39.85168 7.1631788,43.041756 16.571991,37.30436 14.403214,32.366927 16.975062,28.310886"
          id="path827-3-6-6-9"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         d="M 10.406304,25.263156 C 8.2839879,27.271095 6.7135569,29.390094 6.6157637,29.943264 4.0263487,34.00175 5.9212349,39.85168 7.1631788,43.041756 16.571991,37.30436 14.403214,32.366927 16.975062,28.310886"
+         style="fill:none;fill-opacity:1;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         style="fill:none;fill-opacity:1;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 16.617378,30.099271 C 18.015258,42.763729 18.084072,56.22657 31.967634,57.875855 44.78367,56.442673 46.008839,42.833486 47.417716,30.06776"
          id="path821-9-0-6-4-8"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
+         d="M 16.617378,30.099271 C 18.015258,42.763729 18.084072,56.22657 31.967634,57.875855 44.78367,56.442673 46.008839,42.833486 47.417716,30.06776"
+         style="fill:none;fill-opacity:1;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 10.913786,24.727003 a 7.7969213,6.3020225 0 0 1 5.36154,-6.794954"
          id="path4669-3-1"
-         sodipodi:type="arc"
-         sodipodi:cx="18.648884"
-         sodipodi:cy="23.934959"
-         sodipodi:rx="7.7969213"
-         sodipodi:ry="6.3020225"
-         sodipodi:start="3.0155786"
-         sodipodi:end="4.403057"
-         sodipodi:open="true"
-         d="m 10.913786,24.727003 a 7.7969213,6.3020225 0 0 1 5.36154,-6.794954" />
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 15.824326,17.277108 a 7.7969213,6.3020225 0 0 1 1.19308,-7.12608 7.7969213,6.3020225 0 0 1 8.678521,-1.5831735"
          id="path4669-1-6-3"
-         sodipodi:type="arc"
-         sodipodi:cx="22.766438"
-         sodipodi:cy="14.408138"
-         sodipodi:rx="7.7969213"
-         sodipodi:ry="6.3020225"
-         sodipodi:start="2.6689443"
-         sodipodi:end="5.0975667"
-         sodipodi:open="true"
-         d="m 15.824326,17.277108 a 7.7969213,6.3020225 0 0 1 1.19308,-7.12608 7.7969213,6.3020225 0 0 1 8.678521,-1.5831735" />
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path4669-1-2-3-1-9"
-         sodipodi:type="arc"
-         sodipodi:cx="-32.201149"
-         sodipodi:cy="12.070359"
-         sodipodi:rx="7.7969213"
-         sodipodi:ry="6.3020225"
-         sodipodi:start="3.7159797"
-         sodipodi:end="5.6919874"
-         sodipodi:open="true"
+         transform="scale(-1,1)"
          d="m -38.746863,8.6463425 a 7.7969213,6.3020225 0 0 1 6.480178,-2.8777831 7.7969213,6.3020225 0 0 1 6.539114,2.7893297"
-         transform="scale(-1,1)" />
+         id="path4669-1-2-3-1-9"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path4669-1-5-5-6"
-         sodipodi:type="arc"
-         sodipodi:cx="-41.932186"
-         sodipodi:cy="14.589434"
-         sodipodi:rx="7.7969213"
-         sodipodi:ry="6.3020225"
-         sodipodi:start="2.7025845"
-         sodipodi:end="5.1107742"
-         sodipodi:open="true"
+         transform="scale(-1,1)"
          d="m -48.989754,17.268057 a 7.7969213,6.3020225 0 0 1 1.433475,-7.043401 7.7969213,6.3020225 0 0 1 8.648757,-1.4437247"
-         transform="scale(-1,1)" />
+         id="path4669-1-5-5-6"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path4669-2-4-9"
-         sodipodi:type="arc"
-         sodipodi:cx="-45.614265"
-         sodipodi:cy="23.887232"
-         sodipodi:rx="7.5624275"
-         sodipodi:ry="6.3020225"
-         sodipodi:start="2.9971853"
-         sodipodi:end="4.3360503"
-         sodipodi:open="true"
+         transform="scale(-1,1)"
          d="m -53.097978,24.794131 a 7.5624275,6.3020225 0 0 1 4.704385,-6.767884"
-         transform="scale(-1,1)" />
+         id="path4669-2-4-9"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 13.066014,24.5468 a 6.9618187,4.3235502 0 0 1 4.117308,-4.602635"
          id="path4669-3-1-4"
-         sodipodi:type="arc"
-         sodipodi:cx="19.95216"
-         sodipodi:cy="23.911057"
-         sodipodi:rx="6.9618187"
-         sodipodi:ry="4.3235502"
-         sodipodi:start="2.9940156"
-         sodipodi:end="4.3033611"
-         sodipodi:open="true"
-         d="m 13.066014,24.5468 a 6.9618187,4.3235502 0 0 1 4.117308,-4.602635" />
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 18.04188,16.59087 a 5.7523088,4.1353617 0 0 1 0.890425,-5.104059 5.7523088,4.1353617 0 0 1 7.117062,-0.531715"
          id="path4669-1-6-3-9"
-         sodipodi:type="arc"
-         sodipodi:cx="22.956429"
-         sodipodi:cy="14.441805"
-         sodipodi:rx="5.7523088"
-         sodipodi:ry="4.1353617"
-         sodipodi:start="2.5951163"
-         sodipodi:end="5.2800798"
-         sodipodi:open="true"
-         d="m 18.04188,16.59087 a 5.7523088,4.1353617 0 0 1 0.890425,-5.104059 5.7523088,4.1353617 0 0 1 7.117062,-0.531715" />
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:1.89913595;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path4669-1-2-3-1-9-0"
-         sodipodi:type="arc"
-         sodipodi:cx="-32.189949"
-         sodipodi:cy="13.49578"
-         sodipodi:rx="6.4067531"
-         sodipodi:ry="5.661931"
-         sodipodi:start="3.5712316"
-         sodipodi:end="5.747358"
-         sodipodi:open="true"
+         transform="scale(-1,1)"
          d="m -38.014432,11.137345 a 6.4067531,5.661931 0 0 1 5.484481,-3.2955175 6.4067531,5.661931 0 0 1 5.848826,2.7632395"
-         transform="scale(-1,1)" />
+         id="path4669-1-2-3-1-9-0"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:1.89913595;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path4669-1-5-5-6-1"
-         sodipodi:type="arc"
-         sodipodi:cx="-41.823101"
-         sodipodi:cy="14.787787"
-         sodipodi:rx="5.4478283"
-         sodipodi:ry="4.3276558"
-         sodipodi:start="2.7025845"
-         sodipodi:end="5.2789745"
-         sodipodi:open="true"
+         transform="scale(-1,1)"
          d="m -46.754332,16.627222 a 5.4478283,4.3276558 0 0 1 1.332429,-5.088394 5.4478283,4.3276558 0 0 1 6.522947,-0.402451"
-         transform="scale(-1,1)" />
+         id="path4669-1-5-5-6-1"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         id="path821-9-0-6-4-8-28"
+         d="M 18.781353,29.619019 C 20.056823,40.497603 19.825912,54.271588 31.864782,55.55181 42.5648,54.738587 44.005893,41.642851 45.208457,29.746187"
+         style="fill:none;fill-opacity:1;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path866"
+         d="m 14.135688,29.55084 c 1.513405,-2.286545 3.838508,-1.883509 4.576728,-0.186792"
+         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <path
+         id="path868"
+         d="m 11.955409,26.813371 c 0.753375,-0.753214 1.129518,-1.452486 1.106199,-2.386578"
+         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         id="path868-7"
+         d="m 16.957692,20.005125 c 1.155563,-0.327326 1.984499,-1.769638 1.25442,-3.073667"
+         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <g
+         transform="matrix(0.6619134,0,0,0.76251857,23.141389,6.6930998)"
+         id="g4583-1-6-1">
+        <path
+           style="opacity:1;fill:#0b1521;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none"
+           id="path4557-8-0-0"
+           d="m -48.632539,35.775429 a 2,4.375 0 0 1 -2.419975,-3.174399 2,4.375 0 0 1 1.439682,-5.308664 2,4.375 0 0 1 2.433606,3.12414 2,4.375 0 0 1 -1.416642,5.338241"
+           transform="rotate(-66.420589)" />
+        <path
+           style="opacity:1;fill:#0b1521;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none"
+           id="path4557-4-5-6-1"
+           d="m -59.260518,11.320401 a 2,4.375 0 0 1 -2.419975,-3.1744 2,4.375 0 0 1 1.439682,-5.3086639 2,4.375 0 0 1 2.433606,3.12414 2,4.375 0 0 1 -1.416642,5.3382419"
+           transform="matrix(-0.40001972,-0.91650653,-0.91650653,0.40001972,0,0)" />
+        <path
+           style="opacity:1;fill:#0b1521;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none"
+           id="path4557-3-1-2-9"
+           d="m 13.954073,67.074179 a 2,4.375 0 0 1 -2.419975,-3.1744 2,4.375 0 0 1 1.439682,-5.308663 2,4.375 0 0 1 2.433606,3.12414 2,4.375 0 0 1 -1.416642,5.338241"
+           transform="rotate(0.20338494)" />
+      </g>
       <path
          style="fill:none;fill-opacity:1;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 18.781353,29.619019 C 20.056823,40.497603 19.825912,54.271588 31.864782,55.55181 42.5648,54.738587 44.005893,41.642851 45.208457,29.746187"
-         id="path821-9-0-6-4-8-28"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 14.135688,29.55084 c 1.513405,-2.286545 3.838508,-1.883509 4.576728,-0.186792"
-         id="path866"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 11.955409,26.813371 c 0.753375,-0.753214 1.129518,-1.452486 1.106199,-2.386578"
-         id="path868"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 16.957692,20.005125 c 1.155563,-0.327326 1.984499,-1.769638 1.25442,-3.073667"
-         id="path868-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <g
-         id="g4583-1-6-1"
-         transform="matrix(0.6619134,0,0,0.76251857,23.141389,6.6930998)">
-        <path
-           transform="rotate(-66.420589)"
-           d="m -48.632539,35.775429 a 2,4.375 0 0 1 -2.419975,-3.174399 2,4.375 0 0 1 1.439682,-5.308664 2,4.375 0 0 1 2.433606,3.12414 2,4.375 0 0 1 -1.416642,5.338241"
-           sodipodi:open="true"
-           sodipodi:end="1.3089969"
-           sodipodi:start="1.327932"
-           sodipodi:ry="4.375"
-           sodipodi:rx="2"
-           sodipodi:cy="31.528822"
-           sodipodi:cx="-49.113506"
-           sodipodi:type="arc"
-           id="path4557-8-0-0"
-           style="opacity:1;fill:#0b1521;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none" />
-        <path
-           transform="matrix(-0.40001972,-0.91650653,-0.91650653,0.40001972,0,0)"
-           d="m -59.260518,11.320401 a 2,4.375 0 0 1 -2.419975,-3.1744 2,4.375 0 0 1 1.439682,-5.3086639 2,4.375 0 0 1 2.433606,3.12414 2,4.375 0 0 1 -1.416642,5.3382419"
-           sodipodi:open="true"
-           sodipodi:end="1.3089969"
-           sodipodi:start="1.327932"
-           sodipodi:ry="4.375"
-           sodipodi:rx="2"
-           sodipodi:cy="7.0737934"
-           sodipodi:cx="-59.741486"
-           sodipodi:type="arc"
-           id="path4557-4-5-6-1"
-           style="opacity:1;fill:#0b1521;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none" />
-        <path
-           transform="rotate(0.20338494)"
-           d="m 13.954073,67.074179 a 2,4.375 0 0 1 -2.419975,-3.1744 2,4.375 0 0 1 1.439682,-5.308663 2,4.375 0 0 1 2.433606,3.12414 2,4.375 0 0 1 -1.416642,5.338241"
-           sodipodi:open="true"
-           sodipodi:end="1.3089969"
-           sodipodi:start="1.327932"
-           sodipodi:ry="4.375"
-           sodipodi:rx="2"
-           sodipodi:cy="62.827572"
-           sodipodi:cx="13.473105"
-           sodipodi:type="arc"
-           id="path4557-3-1-2-9"
-           style="opacity:1;fill:#0b1521;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.88976383;stroke-miterlimit:4;stroke-dasharray:none" />
-      </g>
-      <path
-         sodipodi:nodetypes="ccsc"
-         inkscape:connector-curvature="0"
-         id="path827-3-6-6-9-5-6"
          d="m 11.955409,26.813371 c -5.7191513,5.384675 -4.9140072,9.03267 -3.6032146,12.807958 2.3830906,-1.735628 3.8482866,-4.003857 4.5874036,-5.95184 0.546538,-1.440431 0.335979,-1.425345 0.996202,-3.749627"
-         style="fill:none;fill-opacity:1;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         id="path827-3-6-6-9-5-6" />
       <g
-         id="g1071"
-         transform="matrix(1.4426554,0,0,1.5336585,-14.226765,37.012899)">
+         transform="matrix(1.4426554,0,0,1.5336585,-14.226765,37.012899)"
+         id="g1071">
         <path
-           d="m 32.012441,-3.579859 a 4.2360187,4.386272 0 0 1 3.896572,-4.6885042 4.2360187,4.386272 0 0 1 4.549821,4.0082547 4.2360187,4.386272 0 0 1 -3.845206,4.73375573 4.2360187,4.386272 0 0 1 -4.593232,-3.95481253"
-           sodipodi:open="true"
-           sodipodi:end="3.047036"
-           sodipodi:start="3.0696153"
-           sodipodi:ry="4.386272"
-           sodipodi:rx="4.2360187"
-           sodipodi:cy="-3.8952987"
-           sodipodi:cx="36.237492"
-           sodipodi:type="arc"
+           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.8068428;stroke-miterlimit:4;stroke-dasharray:none"
            id="path5083-1"
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.8068428;stroke-miterlimit:4;stroke-dasharray:none" />
+           d="m 32.012441,-3.579859 a 4.2360187,4.386272 0 0 1 3.896572,-4.6885042 4.2360187,4.386272 0 0 1 4.549821,4.0082547 4.2360187,4.386272 0 0 1 -3.845206,4.73375573 4.2360187,4.386272 0 0 1 -4.593232,-3.95481253" />
         <path
-           d="m 32.090572,-3.0617162 a 2.262718,2.3429775 0 0 1 2.081398,-2.5044184 2.262718,2.3429775 0 0 1 2.43034,2.1410553 2.262718,2.3429775 0 0 1 -2.053961,2.52858996 2.262718,2.3429775 0 0 1 -2.453528,-2.11250846"
-           sodipodi:open="true"
-           sodipodi:end="3.047036"
-           sodipodi:start="3.0696153"
-           sodipodi:ry="2.3429775"
-           sodipodi:rx="2.262718"
-           sodipodi:cy="-3.230212"
-           sodipodi:cx="34.347431"
-           sodipodi:type="arc"
+           style="opacity:1;fill:#0b1521;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49930751;stroke-miterlimit:4;stroke-dasharray:none"
            id="path5083-8-6"
-           style="opacity:1;fill:#0b1521;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49930751;stroke-miterlimit:4;stroke-dasharray:none" />
+           d="m 32.090572,-3.0617162 a 2.262718,2.3429775 0 0 1 2.081398,-2.5044184 2.262718,2.3429775 0 0 1 2.43034,2.1410553 2.262718,2.3429775 0 0 1 -2.053961,2.52858996 2.262718,2.3429775 0 0 1 -2.453528,-2.11250846" />
         <path
-           transform="matrix(-0.02973672,0.99955777,0.99924923,0.03874253,0,0)"
-           d="M -7.5008603,28.528731 A 3.0267222,3.5582526 0 0 1 -4.71668,24.7253 a 3.0267222,3.5582526 0 0 1 3.2509404,3.251596 3.0267222,3.5582526 0 0 1 -2.7474785,3.84014 3.0267222,3.5582526 0 0 1 -3.2819583,-3.208242"
-           sodipodi:open="true"
-           sodipodi:end="3.047036"
-           sodipodi:start="3.0696153"
-           sodipodi:ry="3.5582526"
-           sodipodi:rx="3.0267222"
-           sodipodi:cy="28.272839"
-           sodipodi:cx="-4.4819751"
-           sodipodi:type="arc"
+           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.13695836;stroke-miterlimit:4;stroke-dasharray:none"
            id="path5083-0-4"
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.13695836;stroke-miterlimit:4;stroke-dasharray:none" />
+           d="M -7.5008603,28.528731 A 3.0267222,3.5582526 0 0 1 -4.71668,24.7253 a 3.0267222,3.5582526 0 0 1 3.2509404,3.251596 3.0267222,3.5582526 0 0 1 -2.7474785,3.84014 3.0267222,3.5582526 0 0 1 -3.2819583,-3.208242"
+           transform="matrix(-0.02973672,0.99955777,0.99924923,0.03874253,0,0)" />
         <path
-           d="m 28.695223,-3.0884248 a 1.684593,1.7443461 0 0 1 1.5496,-1.8645388 1.684593,1.7443461 0 0 1 1.809387,1.5940151 1.684593,1.7443461 0 0 1 -1.529173,1.8825346 1.684593,1.7443461 0 0 1 -1.826651,-1.5727621"
-           sodipodi:open="true"
-           sodipodi:end="3.047036"
-           sodipodi:start="3.0696153"
-           sodipodi:ry="1.7443461"
-           sodipodi:rx="1.684593"
-           sodipodi:cy="-3.2138698"
-           sodipodi:cx="30.375454"
-           sodipodi:type="arc"
+           style="opacity:1;fill:#0b1521;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.11623406;stroke-miterlimit:4;stroke-dasharray:none"
            id="path5083-8-1-8"
-           style="opacity:1;fill:#0b1521;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.11623406;stroke-miterlimit:4;stroke-dasharray:none" />
+           d="m 28.695223,-3.0884248 a 1.684593,1.7443461 0 0 1 1.5496,-1.8645388 1.684593,1.7443461 0 0 1 1.809387,1.5940151 1.684593,1.7443461 0 0 1 -1.529173,1.8825346 1.684593,1.7443461 0 0 1 -1.826651,-1.5727621" />
       </g>
       <path
-         style="fill:none;fill-opacity:1;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 53.531164,25.211096 c 2.122316,2.007939 3.692747,4.126938 3.79054,4.680108 2.589415,4.058486 0.694529,9.908416 -0.547415,13.098492 -9.408812,-5.737395 -6.784715,-8.865895 -9.356563,-12.921936"
          id="path827-3-6-6-9-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         d="m 53.531164,25.211096 c 2.122316,2.007939 3.692747,4.126938 3.79054,4.680108 2.589415,4.058486 0.694529,9.908416 -0.547415,13.098492 -9.408812,-5.737395 -6.784715,-8.865895 -9.356563,-12.921936"
+         style="fill:none;fill-opacity:1;stroke:#0b1521;stroke-width:2.21032572;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
-         id="path4669-1-5-5-6-1-3"
-         sodipodi:type="arc"
-         sodipodi:cx="-48.672974"
-         sodipodi:cy="23.764732"
-         sodipodi:rx="3.0704331"
-         sodipodi:ry="3.9997387"
-         sodipodi:start="2.7025845"
-         sodipodi:end="4.6845885"
-         d="m -51.452249,25.464789 a 3.0704331,3.9997387 0 0 1 0.164861,-3.797464 3.0704331,3.9997387 0 0 1 2.529066,-1.900786"
          transform="scale(-1,1)"
-         sodipodi:open="true" />
+         d="m -51.452249,25.464789 a 3.0704331,3.9997387 0 0 1 0.164861,-3.797464 3.0704331,3.9997387 0 0 1 2.529066,-1.900786"
+         id="path4669-1-5-5-6-1-3"
+         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 48.008752,19.700889 c -1.155563,-0.327326 -1.984499,-1.769638 -1.25442,-3.073667"
          id="path868-7-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="m 48.008752,19.700889 c -1.155563,-0.327326 -1.984499,-1.769638 -1.25442,-3.073667"
+         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         sodipodi:nodetypes="ccsc"
-         inkscape:connector-curvature="0"
-         id="path827-3-6-6-9-5-6-3"
+         style="fill:none;fill-opacity:1;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 51.538585,25.901022 c 5.719151,5.384675 5.493687,9.931173 4.182894,13.706462 -2.38309,-1.735629 -3.674382,-3.250273 -4.413499,-5.198256 -0.546538,-1.440431 -0.944643,-3.599145 -2.300482,-5.865459"
-         style="fill:none;fill-opacity:1;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         id="path827-3-6-6-9-5-6-3" />
       <path
-         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         d="m 45.247185,29.514639 c 0.962709,-2.518417 3.751556,-1.869017 4.402824,0.103048"
          id="path866-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="m 45.247185,29.514639 c 0.962709,-2.518417 3.751556,-1.869017 4.402824,0.103048"
+         style="fill:none;fill-rule:evenodd;stroke:#729fcf;stroke-width:2.17509174;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Construction.svg b/src/Mod/Draft/Resources/icons/Draft_Construction.svg
index 3e4c80ad91..56d4de10a8 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Construction.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Construction.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,94 +6,52 @@
    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="svg3611"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Construction.svg">
+   id="svg3611"
+   height="64px"
+   width="64px">
   <defs
      id="defs3613">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3825">
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1;"
+         id="stop3827"
          offset="0"
-         id="stop3827" />
+         style="stop-color:#34e0e2;stop-opacity:1;" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:0;"
+         id="stop3829"
          offset="1"
-         id="stop3829" />
+         style="stop-color:#34e0e2;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3817">
       <stop
-         style="stop-color:#06989a;stop-opacity:1;"
+         id="stop3819"
          offset="0"
-         id="stop3819" />
+         style="stop-color:#06989a;stop-opacity:1;" />
       <stop
-         style="stop-color:#06989a;stop-opacity:0;"
+         id="stop3821"
          offset="1"
-         id="stop3821" />
+         style="stop-color:#06989a;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective3619" />
-    <inkscape:perspective
-       id="perspective3593"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4292"
-       id="linearGradient4125"
-       gradientUnits="userSpaceOnUse"
-       x1="657.42859"
-       y1="92.117249"
+       y2="92.117249"
        x2="696.53217"
-       y2="92.117249" />
+       y1="92.117249"
+       x1="657.42859"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4125"
+       xlink:href="#linearGradient4292" />
     <linearGradient
        id="linearGradient4292">
       <stop
-         style="stop-color:#62d9c5;stop-opacity:1;"
+         id="stop4294"
          offset="0"
-         id="stop4294" />
+         style="stop-color:#62d9c5;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop4296"
          offset="1"
-         id="stop4296" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4300"
-       id="linearGradient4127"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99534433,0.09638295,-0.09638295,0.99534433,12.979471,-62.75841)"
-       x1="651.69366"
-       y1="108.379"
-       x2="677.37708"
-       y2="108.379" />
-    <linearGradient
-       id="linearGradient4300">
-      <stop
-         style="stop-color:#dd4100;stop-opacity:1;"
-         offset="0"
-         id="stop4302" />
-      <stop
-         style="stop-color:#a80101;stop-opacity:1;"
-         offset="1"
-         id="stop4304" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        y2="108.379"
@@ -104,126 +60,99 @@
        x1="651.69366"
        gradientTransform="matrix(0.99534433,0.09638295,-0.09638295,0.99534433,12.979471,-62.75841)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3609"
-       xlink:href="#linearGradient4300"
-       inkscape:collect="always" />
+       id="linearGradient4127"
+       xlink:href="#linearGradient4300" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4292-4"
-       id="linearGradient3001-0"
+       id="linearGradient4300">
+      <stop
+         id="stop4302"
+         offset="0"
+         style="stop-color:#dd4100;stop-opacity:1;" />
+      <stop
+         id="stop4304"
+         offset="1"
+         style="stop-color:#a80101;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4300"
+       id="linearGradient3609"
        gradientUnits="userSpaceOnUse"
-       x1="657.42859"
-       y1="92.117249"
-       x2="696.53217"
+       gradientTransform="matrix(0.99534433,0.09638295,-0.09638295,0.99534433,12.979471,-62.75841)"
+       x1="651.69366"
+       y1="108.379"
+       x2="677.37708"
+       y2="108.379" />
+    <linearGradient
+       gradientTransform="matrix(0.93342445,0.4455918,-0.45023909,0.92378981,-552.52671,-364.08327)"
        y2="92.117249"
-       gradientTransform="matrix(0.93342445,0.4455918,-0.45023909,0.92378981,-552.52671,-364.08327)" />
+       x2="696.53217"
+       y1="92.117249"
+       x1="657.42859"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3001-0"
+       xlink:href="#linearGradient4292-4" />
     <linearGradient
        id="linearGradient4292-4">
       <stop
-         style="stop-color:#62d9c5;stop-opacity:1;"
+         id="stop4294-4"
          offset="0"
-         id="stop4294-4" />
+         style="stop-color:#62d9c5;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop4296-4"
          offset="1"
-         id="stop4296-4" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="92.117249"
-       x2="696.53217"
-       y1="92.117249"
-       x1="657.42859"
-       gradientTransform="matrix(0.93342445,0.4455918,-0.45023909,0.92378981,-527.86118,-368.62645)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3807"
        xlink:href="#linearGradient4292-4"
-       inkscape:collect="always" />
+       id="linearGradient3807"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93342445,0.4455918,-0.45023909,0.92378981,-527.86118,-368.62645)"
+       x1="657.42859"
+       y1="92.117249"
+       x2="696.53217"
+       y2="92.117249" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3817"
-       id="linearGradient3823"
-       x1="17"
-       y1="37"
-       x2="15"
+       gradientUnits="userSpaceOnUse"
        y2="32"
-       gradientUnits="userSpaceOnUse" />
+       x2="15"
+       y1="37"
+       x1="17"
+       id="linearGradient3823"
+       xlink:href="#linearGradient3817" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3825"
-       id="linearGradient3831"
-       x1="40"
-       y1="21"
-       x2="47"
+       gradientUnits="userSpaceOnUse"
        y2="38"
-       gradientUnits="userSpaceOnUse" />
+       x2="47"
+       y1="21"
+       x1="40"
+       id="linearGradient3831"
+       xlink:href="#linearGradient3825" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="26.635764"
-     inkscape:cx="26.585463"
-     inkscape:cy="34.934655"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="false"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3003"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="fill:#06989a;fill-opacity:1;stroke:#042a2a;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59.662253,17.123968 C 54.202538,10.619145 19,23 19,23 l 20,22 c 0,0 27.92132,-19.227416 20.662253,-27.876032 z"
        id="path3498"
-       sodipodi:nodetypes="sccs" />
+       d="M 59.662253,17.123968 C 54.202538,10.619145 19,23 19,23 l 20,22 c 0,0 27.92132,-19.227416 20.662253,-27.876032 z"
+       style="fill:#06989a;fill-opacity:1;stroke:#042a2a;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3831);stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="M 58,18 C 54.434171,13.753987 22.586852,23.947813 22.586852,23.947813 L 39.287029,42.334868 C 39.287029,42.334868 63.5322,24.58747 58,18 z"
        id="path3498-3"
-       sodipodi:nodetypes="sccs" />
+       d="M 58,18 C 54.434171,13.753987 22.586852,23.947813 22.586852,23.947813 L 39.287029,42.334868 C 39.287029,42.334868 63.5322,24.58747 58,18 z"
+       style="fill:url(#linearGradient3831);stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
     <rect
-       style="color:#000000;fill:#16d0d2;fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3772"
-       width="3"
-       height="8"
+       y="25"
        x="30"
-       y="25" />
+       height="8"
+       width="3"
+       id="rect3772"
+       style="color:#000000;fill:#16d0d2;fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 33,25 c -3,-1 -20,4 -24,6 -4,2 -6,5 -6,8 0,3 4,4 10,2 6,-2 20,-11 20,-16 z"
        id="path3500"
-       sodipodi:nodetypes="czzzc" />
+       d="m 33,25 c -3,-1 -20,4 -24,6 -4,2 -6,5 -6,8 0,3 4,4 10,2 6,-2 20,-11 20,-16 z"
+       style="fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3823);stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="m 29.98637,26.883398 c -4.889547,0.05412 -16.07494,4.168831 -19.314168,5.536675 -3.2392271,1.367845 -5.7198849,4.18225 -5.7198849,6.234016 0,2.051766 3.2515281,1.923846 7.8889579,0.285389 4.637429,-1.638458 15.312301,-8.882481 17.145095,-12.05608 z"
        id="path3500-6"
-       sodipodi:nodetypes="czzzc" />
+       d="m 29.98637,26.883398 c -4.889547,0.05412 -16.07494,4.168831 -19.314168,5.536675 -3.2392271,1.367845 -5.7198849,4.18225 -5.7198849,6.234016 0,2.051766 3.2515281,1.923846 7.8889579,0.285389 4.637429,-1.638458 15.312301,-8.882481 17.145095,-12.05608 z"
+       style="fill:url(#linearGradient3823);stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
   </g>
   <metadata
      id="metadata3867">
@@ -233,7 +162,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Construction</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_CubicBezCurve.svg b/src/Mod/Draft/Resources/icons/Draft_CubicBezCurve.svg
index 5ab136ae52..f173aa41ef 100644
--- a/src/Mod/Draft/Resources/icons/Draft_CubicBezCurve.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_CubicBezCurve.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,448 +6,347 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="Draft_CubicBezCurve.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3600"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3600"
+       xlink:href="#linearGradient3144-3" />
     <linearGradient
-       id="linearGradient3144-3"
-       inkscape:collect="always">
+       id="linearGradient3144-3">
       <stop
-         id="stop3146-0"
+         style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
+         id="stop3146-0" />
       <stop
-         id="stop3148-1"
+         style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
+         id="stop3148-1" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3598"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3598"
+       xlink:href="#linearGradient3144-3" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
     <linearGradient
        id="linearGradient3144-6-6">
       <stop
-         id="stop3146-9-1"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9-1" />
       <stop
-         id="stop3148-2-7"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2-7" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3164"
-       gradientUnits="userSpaceOnUse"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
        gradientTransform="matrix(-0.15378341,-0.00107304,7.3761212e-4,-0.10916121,65.069908,86.593234)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6-6"
-       id="radialGradient3960"
        gradientUnits="userSpaceOnUse"
+       id="radialGradient3164"
+       xlink:href="#linearGradient3144-6" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
        gradientTransform="matrix(-0.15378341,-0.00107304,7.3761212e-4,-0.10916121,44.086014,80.606342)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6-1"
-       id="radialGradient3118-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       id="radialGradient3960"
+       xlink:href="#linearGradient3144-6-6" />
+    <radialGradient
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3118-3"
+       xlink:href="#linearGradient3144-6-1" />
     <linearGradient
        id="linearGradient3144-6-1">
       <stop
-         id="stop3146-9-3"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9-3" />
       <stop
-         id="stop3148-2-5"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2-5" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6-4"
-       id="radialGradient4026-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4026-5"
+       xlink:href="#linearGradient3144-6-4" />
     <linearGradient
        id="linearGradient3144-6-4">
       <stop
-         id="stop3146-9-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9-9" />
       <stop
-         id="stop3148-2-1"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2-1" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6-4"
-       id="radialGradient4097"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
-       cx="286.94281"
-       cy="835.12842"
-       fx="286.94281"
+       r="34.345188"
        fy="835.12842"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
+       fx="286.94281"
+       cy="835.12842"
+       cx="286.94281"
+       gradientTransform="matrix(-0.15378124,0.0013561,-9.3218748e-4,-0.10915967,45.974898,112.47404)"
        gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       id="radialGradient4097"
+       xlink:href="#linearGradient3144-6-4" />
+    <linearGradient
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-6"
-       id="linearGradient3801-1-3"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-3"
+       xlink:href="#linearGradient3836-0-6" />
     <linearGradient
        id="linearGradient3836-0-6">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-7"
          offset="0"
-         id="stop3838-2-7" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-5"
          offset="1"
-         id="stop3840-5-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient4077">
       <stop
-         id="stop4079"
+         style="stop-color:#888a85;stop-opacity:1;"
          offset="0"
-         style="stop-color:#888a85;stop-opacity:1;" />
+         id="stop4079" />
       <stop
-         id="stop4081"
+         style="stop-color:#2e3436;stop-opacity:1;"
          offset="1"
-         style="stop-color:#2e3436;stop-opacity:1;" />
+         id="stop4081" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective2684"
-       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" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.838912"
-     inkscape:cx="23.32988"
-     inkscape:cy="35.926315"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1853"
-     inkscape:window-height="1025"
-     inkscape:window-x="1433"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3034"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1"
-       spacingy="1"
-       originx="0"
-       originy="0" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
        id="g4117">
       <path
-         inkscape:connector-curvature="0"
-         id="path4034-3"
+         style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 55,50 53,15"
-         style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         id="path4034-3" />
       <path
-         inkscape:connector-curvature="0"
-         id="path4030-9"
+         style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 9,50 11,15"
-         style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         id="path4030-9" />
       <path
-         inkscape:connector-curvature="0"
-         id="path4030"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 9,49 11,15"
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
+         id="path4030" />
       <rect
-         y="5"
-         x="7"
-         height="10"
-         width="10"
+         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#2e2900;stroke-width:2;stroke-linecap:butt;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"
          id="rect3190"
-         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#2e2900;stroke-width:2;stroke-linecap:butt;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
-         inkscape:connector-curvature="0"
-         id="path4034"
-         d="M 55,49 53,15"
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         sodipodi:nodetypes="cc" />
-      <g
-         id="g3166-4"
-         transform="translate(41.740915,4.3123332)"
-         style="stroke:#2e3436;stroke-width:2;fill:#d3d7cf">
-        <g
-           id="g4040"
-           style="stroke:#2e3436;stroke-width:2;fill:#d3d7cf">
-          <path
-             inkscape:connector-curvature="0"
-             d="m 9,49 6,0 c 0,-30 34,-30 34,0 l 6,0 C 55,11 9,11 9,49 z"
-             id="path3714"
-             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;color:#000000;fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-             transform="translate(-41.740915,-4.3123332)"
-             sodipodi:nodetypes="ccccc" />
-        </g>
-      </g>
-      <rect
-         y="7"
-         x="9"
-         height="6"
-         width="6"
-         id="rect3190-2-2"
-         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;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" />
-      <rect
-         y="5"
-         x="47"
-         height="10"
          width="10"
-         id="rect3190-7"
-         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#2e2900;stroke-width:2;stroke-linecap:butt;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" />
-      <rect
-         y="7"
-         x="49"
-         height="6"
-         width="6"
-         id="rect3190-2-2-0"
-         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;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" />
+         height="10"
+         x="7"
+         y="5" />
       <path
          style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 11,49 C 11,14 53,14 53,49"
+         d="M 55,49 53,15"
+         id="path4034" />
+      <g
+         style="stroke:#2e3436;stroke-width:2;fill:#d3d7cf"
+         transform="translate(41.740915,4.3123332)"
+         id="g3166-4">
+        <g
+           style="stroke:#2e3436;stroke-width:2;fill:#d3d7cf"
+           id="g4040">
+          <path
+             transform="translate(-41.740915,-4.3123332)"
+             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;color:#000000;fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
+             id="path3714"
+             d="m 9,49 6,0 c 0,-30 34,-30 34,0 l 6,0 C 55,11 9,11 9,49 z" />
+        </g>
+      </g>
+      <rect
+         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;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"
+         id="rect3190-2-2"
+         width="6"
+         height="6"
+         x="9"
+         y="7" />
+      <rect
+         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#2e2900;stroke-width:2;stroke-linecap:butt;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"
+         id="rect3190-7"
+         width="10"
+         height="10"
+         x="47"
+         y="5" />
+      <rect
+         style="color:#000000;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;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"
+         id="rect3190-2-2-0"
+         width="6"
+         height="6"
+         x="49"
+         y="7" />
+      <path
          id="path3915"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="M 11,49 C 11,14 53,14 53,49"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <g
-       id="g3057"
-       transform="translate(33.327866,-1.429711)">
+       transform="translate(33.327866,-1.429711)"
+       id="g3057">
       <g
-         id="g3827-1"
-         transform="translate(-33.322131,1.429711)">
+         transform="translate(-33.322131,1.429711)"
+         id="g3827-1">
         <g
-           id="g3797-9"
-           transform="translate(31.322131,40.570289)">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9">
           <path
-             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              id="path4250-71"
-             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             inkscape:connector-curvature="0" />
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
           <path
-             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
-             id="path4250-7-3"
              style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             inkscape:connector-curvature="0" />
+             id="path4250-7-3"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
         </g>
       </g>
     </g>
     <g
-       transform="translate(73.327866,-1.429711)"
-       id="g3057-3">
+       id="g3057-3"
+       transform="translate(73.327866,-1.429711)">
       <g
-         id="g3827-1-5"
-         transform="translate(-33.322131,1.429711)">
+         transform="translate(-33.322131,1.429711)"
+         id="g3827-1-5">
         <g
-           id="g3797-9-6"
-           transform="translate(31.322131,40.570289)">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-6">
           <path
-             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
-             id="path4250-71-2"
              style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             inkscape:connector-curvature="0" />
+             id="path4250-71-2"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
           <path
-             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
-             id="path4250-7-3-9"
              style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             inkscape:connector-curvature="0" />
+             id="path4250-7-3-9"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
         </g>
       </g>
     </g>
     <g
-       inkscape:label="Layer 1"
-       id="layer1-2"
-       transform="translate(-79.059022,1.6025174)">
+       transform="translate(-79.059022,1.6025174)"
+       id="layer1-2">
       <g
-         transform="matrix(0.9463094,0,0,0.9463094,-423.94991,-0.8705343)"
-         id="g3966">
+         id="g3966"
+         transform="matrix(0.9463094,0,0,0.9463094,-423.94991,-0.8705343)">
         <g
            id="g3946">
           <g
-             transform="matrix(0.8389287,0,0,0.8389287,70.961422,17.159235)"
-             id="g3801" />
+             id="g3801"
+             transform="matrix(0.8389287,0,0,0.8389287,70.961422,17.159235)" />
           <g
-             id="text3735"
+             transform="scale(0.89528422,1.1169637)"
              style="font-style:normal;font-weight:normal;font-size:22.51535797px;font-family:'Bitstream Vera Sans';fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.11347365;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             transform="scale(0.89528422,1.1169637)">
+             id="text3735">
             <path
-               inkscape:href="#text1165"
-               sodipodi:type="inkscape:offset"
-               inkscape:radius="0.66787529"
-               inkscape:original="M 481.88477 3.03125 C 481.06406 3.03125 480.18917 3.0907244 479.25781 3.2089844 C 478.33567 3.3272444 477.34366 3.5037144 476.2832 3.7402344 L 476.2832 5.7363281 C 477.33444 5.4554607 478.2978 5.2482769 479.17383 5.1152344 C 480.04986 4.9821919 480.87134 4.9160156 481.63672 4.9160156 C 483.03837 4.9160156 484.11244 5.1452582 484.85938 5.6035156 C 485.61553 6.0543818 485.99414 6.7046939 485.99414 7.5546875 C 485.99414 8.3825074 485.62888 9.0174626 484.90039 9.4609375 C 484.1719 9.8970212 483.12203 10.115234 481.74805 10.115234 L 479.23047 10.115234 L 479.23047 11.955078 L 481.63672 11.955078 C 483.15825 11.955078 484.34304 12.232766 485.19141 12.787109 C 486.04899 13.334062 486.47852 14.094668 486.47852 15.070312 C 486.47852 16.127261 486.01589 16.933938 485.09375 17.488281 C 484.18083 18.042625 482.84972 18.320312 481.09766 18.320312 C 480.09253 18.320312 479.12917 18.22775 478.20703 18.042969 C 477.28489 17.858188 476.43475 17.584827 475.66016 17.222656 L 475.66016 19.384766 C 476.63762 19.658242 477.58318 19.861098 478.49609 19.994141 C 479.41823 20.134574 480.31288 20.205078 481.17969 20.205078 C 483.76167 20.205078 485.7546 19.757622 487.15625 18.863281 C 488.5579 17.96894 489.25781 16.703779 489.25781 15.070312 C 489.25781 14.005973 488.8792 13.113014 488.12305 12.388672 C 487.37612 11.664329 486.33515 11.18616 484.99805 10.957031 C 486.20605 10.71312 487.1363 10.278647 487.79102 9.6503906 C 488.44573 9.0147432 488.77344 8.2387805 488.77344 7.3222656 C 488.77344 6.0066233 488.15559 4.9640024 486.91992 4.1953125 C 485.68426 3.4192314 484.00568 3.03125 481.88477 3.03125 z "
-               xlink:href="#text1165"
-               style="font-style:normal;font-weight:normal;font-size:15.85105228px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.11347365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-               id="path1167"
+               transform="translate(149.0317,29.31941)"
                d="m 481.88477,2.3632812 c -0.85298,0 -1.75549,0.062275 -2.71094,0.1835938 -0.94535,0.1212359 -1.95722,0.3005964 -3.03516,0.5410156 a 0.66794208,0.66794208 0 0 0 -0.52344,0.6523438 v 1.9960937 a 0.66794208,0.66794208 0 0 0 0.83985,0.6445313 c 1.03206,-0.2757444 1.97223,-0.4769674 2.81836,-0.6054688 0.84725,-0.1286726 1.6364,-0.1914062 2.36328,-0.1914062 1.32883,0 2.28473,0.2269538 2.87305,0.5878906 a 0.66794208,0.66794208 0 0 0 0.008,0.00586 c 0.59774,0.3564144 0.80859,0.7252859 0.80859,1.3769531 0,0.6313616 -0.20211,0.9881368 -0.77344,1.3359375 -0.57039,0.3402097 -1.50377,0.5566406 -2.80468,0.5566406 h -2.51758 a 0.66794208,0.66794208 0 0 0 -0.66797,0.6679684 v 1.839844 a 0.66794208,0.66794208 0 0 0 0.66797,0.667969 h 2.40625 c 1.44027,0 2.49394,0.268197 3.18945,0.722656 a 0.66794208,0.66794208 0 0 0 0.006,0.0039 c 0.70615,0.450372 0.97852,0.941082 0.97852,1.720703 0,0.862062 -0.29908,1.387948 -1.06055,1.845704 a 0.66794208,0.66794208 0 0 0 -0.002,0.002 c -0.75132,0.456213 -1.9689,0.734375 -3.65039,0.734375 -0.96413,0 -1.88336,-0.08806 -2.75977,-0.263672 -0.87525,-0.175386 -1.67298,-0.434114 -2.39453,-0.771484 a 0.66794208,0.66794208 0 0 0 -0.95117,0.605468 v 2.16211 a 0.66794208,0.66794208 0 0 0 0.48828,0.642578 c 1.00128,0.280139 1.97349,0.489422 2.91601,0.626953 0.95281,0.145104 1.88018,0.21875 2.78321,0.21875 2.65914,0 4.77744,-0.452846 6.33593,-1.447266 1.55744,-0.993741 2.41016,-2.53122 2.41016,-4.355469 0,-1.221214 -0.46624,-2.323551 -1.33789,-3.160156 -0.42111,-0.408381 -0.92239,-0.739831 -1.48633,-1.003906 0.42303,-0.222167 0.82714,-0.461374 1.15235,-0.773438 a 0.66794208,0.66794208 0 0 0 0.002,-0.0039 c 0.7697,-0.7472853 1.18555,-1.7309214 1.18555,-2.8066404 0,-1.524274 -0.78592,-2.8343239 -2.16602,-3.6933594 h -0.002 c -1.38127,-0.8670158 -3.18709,-1.265625 -5.38867,-1.265625 z"
-               transform="translate(149.0317,29.31941)" />
+               id="path1167"
+               style="font-style:normal;font-weight:normal;font-size:15.85105228px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.11347365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+               xlink:href="#text1165" />
           </g>
         </g>
       </g>
@@ -463,7 +360,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_BezCurve</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Fri Jan 17 12:22:46 2014 -0500</dc:date>
@@ -486,7 +383,7 @@
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
+            <dc:title>[agryson] Alexander Gryson, [vocx]</dc:title>
           </cc:Agent>
         </dc:contributor>
         <dc:subject>
@@ -499,7 +396,7 @@
             <rdf:li>square</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <dc:description>A curved line in the shape of an upside down U with a point at each end that has a square shaped control point</dc:description>
+        <dc:description>A curved line in the shape of an upside down U with a point at each end that has a square shaped control point, and a 3 in the middle</dc:description>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Cursor.svg b/src/Mod/Draft/Resources/icons/Draft_Cursor.svg
index a1c1eda989..81152fcd31 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Cursor.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Cursor.svg
@@ -1,61 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg2985"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Cursor.svg">
+   id="svg2985"
+   height="16px"
+   width="16px">
   <defs
      id="defs2987" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="47.642857"
-     inkscape:cx="4.1694153"
-     inkscape:cy="8"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2983"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 6.5,1.5 0,5 -5,0 0,3 5,0 0,5 3,0 0,-5 5,0 0,-3 -5,0 0,-5 z"
        id="rect2993"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       d="m 6.5,1.5 0,5 -5,0 0,3 5,0 0,5 3,0 0,-5 5,0 0,-3 -5,0 0,-5 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <metadata
      id="metadata3875">
@@ -65,7 +26,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Cursor</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Sat Dec 17 15:36:02 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_DelPoint.svg b/src/Mod/Draft/Resources/icons/Draft_DelPoint.svg
index 17434a1bf5..c9409e7499 100644
--- a/src/Mod/Draft/Resources/icons/Draft_DelPoint.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_DelPoint.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,464 +6,330 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_DelPoint.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5225"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96" />
       <stop
-         id="stop3148-4"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3850"
-       x1="160.4444"
-       y1="149.22015"
-       x2="158.4444"
-       y2="143.22015"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3922"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="143.22015"
+       x2="158.4444"
+       y1="149.22015"
+       x1="160.4444"
+       id="linearGradient3850"
+       xlink:href="#linearGradient3836" />
+    <linearGradient
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(1.050705,0.0195272,0.0195272,1.0567846,61.906432,41.415953)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.977433"
-     inkscape:cx="12.370453"
-     inkscape:cy="30.12398"
-     inkscape:current-layer="g5199"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3054"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3056"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       color="#ff0000"
-       opacity="0.1254902"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       transform="translate(-127.44439,-128.22016)"
-       id="g5199">
+       id="g5199"
+       transform="translate(-127.44439,-128.22016)">
       <path
-         style="color:#000000;fill:url(#linearGradient3850);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 154.44439,141.22016 0,0 -10,0 0,10 10,0 0,0 10,0 0,0 10,0 0,-10 -10,0 0,0 z"
          id="rect3558"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         d="m 154.44439,141.22016 0,0 -10,0 0,10 10,0 0,0 10,0 0,0 10,0 0,-10 -10,0 0,0 z"
+         style="color:#000000;fill:url(#linearGradient3850);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
-         id="g3912"
-         transform="translate(0,-21)">
+         transform="translate(0,-21)"
+         id="g3912">
         <g
-           transform="translate(0,31)"
-           id="g3856">
+           id="g3856"
+           transform="translate(0,31)">
           <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="rect3852"
-             width="58"
-             height="6"
-             x="3"
+             transform="translate(127.44439,128.22016)"
              y="37"
-             transform="translate(127.44439,128.22016)" />
+             x="3"
+             height="6"
+             width="58"
+             id="rect3852"
+             style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 59,41 5,41"
+             transform="translate(127.44439,128.22016)"
              id="path3854"
-             inkscape:connector-curvature="0"
-             transform="translate(127.44439,128.22016)" />
+             d="M 59,41 5,41"
+             style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
         <g
-           style="stroke:#3465a4;stroke-width:0.8096711"
+           transform="matrix(1.2349522,0.01894995,-0.0189508,1.2348959,-7.1881028,-111.34439)"
            id="g4312"
-           transform="matrix(1.2349522,0.01894995,-0.0189508,1.2348959,-7.1881028,-111.34439)">
+           style="stroke:#3465a4;stroke-width:0.8096711">
           <g
-             style="stroke:#3465a4;stroke-width:0.8096711"
+             id="g4248"
              transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
-             id="g4248">
+             style="stroke:#3465a4;stroke-width:0.8096711">
             <g
-               transform="translate(-3.7314339,-3.2817175)"
+               style="stroke-width:0.8096711"
                id="g3906"
-               style="stroke-width:0.8096711">
+               transform="translate(-3.7314339,-3.2817175)">
               <path
-                 inkscape:connector-curvature="0"
-                 style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z"
                  id="path4250"
-                 d="m 147.07465,535.89484 a 48.571431,48.571431 0 1 1 -97.14285,0 48.571431,48.571431 0 1 1 97.14285,0 z" />
+                 style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:10.80131626;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
               <path
-                 inkscape:connector-curvature="0"
-                 style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z"
                  id="path4250-7"
-                 d="m 136.22359,535.86575 a 37.80547,37.803747 49.467268 1 1 -75.60894,-0.002 37.80547,37.803747 49.467268 0 1 75.60894,0.002 z" />
+                 style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:10.80131435;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
             </g>
           </g>
         </g>
       </g>
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 19,15 10,0 0,0 6,0 0,0 10,0 0,6 -10,0 0,0 -6,0 0,0 -10,0 z"
-         id="path3826"
-         inkscape:connector-curvature="0"
          transform="translate(127.44439,128.22016)"
-         sodipodi:nodetypes="ccccccccccccc" />
+         id="path3826"
+         d="m 19,15 10,0 0,0 6,0 0,0 10,0 0,6 -10,0 0,0 -6,0 0,0 -10,0 z"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
   </g>
   <metadata
@@ -476,7 +340,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_DelPoint</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Dimension.svg b/src/Mod/Draft/Resources/icons/Draft_Dimension.svg
index d18f112e1b..01fb71405e 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Dimension.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Dimension.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,151 +6,112 @@
    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"
+   version="1.1"
    id="svg2676"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Dimension.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2678">
     <linearGradient
        id="linearGradient4077">
       <stop
-         style="stop-color:#888a85;stop-opacity:1;"
+         id="stop4079"
          offset="0"
-         id="stop4079" />
+         style="stop-color:#888a85;stop-opacity:1;" />
       <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
+         id="stop4081"
          offset="1"
-         id="stop4081" />
+         style="stop-color:#2e3436;stop-opacity:1;" />
     </linearGradient>
-    <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="perspective2684" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3105"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
-       x1="-18"
-       y1="18"
-       x2="-22"
-       y2="5" />
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-6"
-       id="linearGradient3105-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3105-3"
+       xlink:href="#linearGradient3836-0-6" />
     <linearGradient
        id="linearGradient3836-0-6">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-7"
          offset="0"
-         id="stop3838-2-7" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-5"
          offset="1"
-         id="stop3840-5-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-2"
-       id="linearGradient3105-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3105-1"
+       xlink:href="#linearGradient3836-0-2" />
     <linearGradient
        id="linearGradient3836-0-2">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-70"
          offset="0"
-         id="stop3838-2-70" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-9"
          offset="1"
-         id="stop3840-5-9" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-1"
-       id="linearGradient3105-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3105-6"
+       xlink:href="#linearGradient3836-0-1" />
     <linearGradient
        id="linearGradient3836-0-1">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-8"
          offset="0"
-         id="stop3838-2-8" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-7"
          offset="1"
-         id="stop3840-5-7" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3246"
        xlink:href="#linearGradient3836-0-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-3"
-       id="linearGradient3105-2"
+       id="linearGradient3246"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
        x1="-18"
        y1="18"
        x2="-22"
        y2="5" />
-    <linearGradient
-       id="linearGradient3836-0-3">
-      <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
-         offset="0"
-         id="stop3838-2-75" />
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
-         offset="1"
-         id="stop3840-5-92" />
-    </linearGradient>
     <linearGradient
        y2="5"
        x2="-22"
@@ -160,57 +119,54 @@
        x1="-18"
        gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3286"
+       id="linearGradient3105-2"
+       xlink:href="#linearGradient3836-0-3" />
+    <linearGradient
+       id="linearGradient3836-0-3">
+      <stop
+         id="stop3838-2-75"
+         offset="0"
+         style="stop-color:#c4a000;stop-opacity:1;" />
+      <stop
+         id="stop3840-5-92"
+         offset="1"
+         style="stop-color:#fce94f;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
        xlink:href="#linearGradient3836-0-3"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4077"
-       id="linearGradient4091"
-       x1="458.2142"
-       y1="34.613808"
-       x2="459.69397"
-       y2="30.174515"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4077-9"
-       id="linearGradient4093-8"
+       id="linearGradient3286"
        gradientUnits="userSpaceOnUse"
-       x1="458.2142"
-       y1="34.613808"
+       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="30.174515"
        x2="459.69397"
-       y2="30.174515" />
+       y1="34.613808"
+       x1="458.2142"
+       id="linearGradient4091"
+       xlink:href="#linearGradient4077" />
+    <linearGradient
+       y2="30.174515"
+       x2="459.69397"
+       y1="34.613808"
+       x1="458.2142"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4093-8"
+       xlink:href="#linearGradient4077-9" />
     <linearGradient
        id="linearGradient4077-9">
       <stop
-         style="stop-color:#888a85;stop-opacity:1;"
+         id="stop4079-6"
          offset="0"
-         id="stop4079-6" />
+         style="stop-color:#888a85;stop-opacity:1;" />
       <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
+         id="stop4081-0"
          offset="1"
-         id="stop4081-0" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4077-0"
-       id="linearGradient4093-4"
-       gradientUnits="userSpaceOnUse"
-       x1="458.2142"
-       y1="34.613808"
-       x2="459.69397"
-       y2="30.174515" />
-    <linearGradient
-       id="linearGradient4077-0">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop4079-9" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="1"
-         id="stop4081-4" />
+         style="stop-color:#2e3436;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        y2="30.174515"
@@ -218,218 +174,177 @@
        y1="34.613808"
        x1="458.2142"
        gradientUnits="userSpaceOnUse"
+       id="linearGradient4093-4"
+       xlink:href="#linearGradient4077-0" />
+    <linearGradient
+       id="linearGradient4077-0">
+      <stop
+         id="stop4079-9"
+         offset="0"
+         style="stop-color:#888a85;stop-opacity:1;" />
+      <stop
+         id="stop4081-4"
+         offset="1"
+         style="stop-color:#2e3436;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient4077-0"
        id="linearGradient4145"
-       xlink:href="#linearGradient4077-0"
-       inkscape:collect="always" />
+       gradientUnits="userSpaceOnUse"
+       x1="458.2142"
+       y1="34.613808"
+       x2="459.69397"
+       y2="30.174515" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4077-0"
+       gradientUnits="userSpaceOnUse"
+       y2="643.28284"
+       x2="155.01889"
+       y1="675.04034"
+       x1="230.03166"
        id="linearGradient3819"
-       x1="230.03166"
-       y1="675.04034"
-       x2="155.01889"
-       y2="643.28284"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient4077-0" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4077-0-2"
-       id="linearGradient3819-1"
-       x1="230.03166"
-       y1="675.04034"
-       x2="155.01889"
+       gradientUnits="userSpaceOnUse"
        y2="643.28284"
-       gradientUnits="userSpaceOnUse" />
+       x2="155.01889"
+       y1="675.04034"
+       x1="230.03166"
+       id="linearGradient3819-1"
+       xlink:href="#linearGradient4077-0-2" />
     <linearGradient
        id="linearGradient4077-0-2">
       <stop
-         style="stop-color:#888a85;stop-opacity:1;"
+         id="stop4079-9-7"
          offset="0"
-         id="stop4079-9-7" />
+         style="stop-color:#888a85;stop-opacity:1;" />
       <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
+         id="stop4081-4-7"
          offset="1"
-         id="stop4081-4-7" />
+         style="stop-color:#2e3436;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="643.28284"
-       x2="155.01889"
-       y1="675.04034"
-       x1="230.03166"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3836"
        xlink:href="#linearGradient4077-0-2"
-       inkscape:collect="always" />
+       id="linearGradient3836"
+       gradientUnits="userSpaceOnUse"
+       x1="230.03166"
+       y1="675.04034"
+       x2="155.01889"
+       y2="643.28284" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.112701"
-     inkscape:cx="15.576638"
-     inkscape:cy="31.989298"
-     inkscape:current-layer="text3735"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3054"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3966"
-       transform="matrix(0.9463094,0,0,0.9463094,-423.94991,-0.8705343)">
+       transform="matrix(0.9463094,0,0,0.9463094,-423.94991,-0.8705343)"
+       id="g3966">
       <g
          id="g3946">
         <g
-           id="g3801"
-           transform="matrix(0.8389287,0,0,0.8389287,70.961422,17.159235)" />
+           transform="matrix(0.8389287,0,0,0.8389287,70.961422,17.159235)"
+           id="g3801" />
         <g
-           transform="scale(0.89528422,1.1169637)"
+           id="text3735"
            style="font-size:22.51535797px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.11347365;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           id="text3735">
+           transform="scale(0.89528422,1.1169637)">
           <path
-             d="m 512.20701,16.906952 3.54101,0 0,-9.4608002 -2.36067,0 0,-1.8921597 2.36067,-1.8921596 4.72135,0 0,13.2451195 2.36067,0 0,3.78432 -9.44269,0 0,-3.78432"
-             style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;stroke:#2e3436;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
              id="path3049"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="cccccccccccc" />
-          <path
-             d="m 526.37105,16.906952 5.90169,0 0,3.78432 -4.72135,0 0,-3.78432"
              style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;stroke:#2e3436;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+             d="m 512.20701,16.906952 3.54101,0 0,-9.4608002 -2.36067,0 0,-1.8921597 2.36067,-1.8921596 4.72135,0 0,13.2451195 2.36067,0 0,3.78432 -9.44269,0 0,-3.78432" />
+          <path
              id="path3051"
-             inkscape:connector-curvature="0"
-             sodipodi:nodetypes="ccccc" />
-          <path
-             d="m 544.56483,12.14907 c -10e-6,-2.052171 -0.19423,-3.4960276 -0.58267,-4.3315702 -0.38113,-0.8428467 -1.0261,-1.2642763 -1.93492,-1.2642901 -0.90883,1.38e-5 -1.55746,0.4214434 -1.9459,1.2642901 -0.38846,0.8355426 -0.58268,2.2793992 -0.58268,4.3315702 0,2.074175 0.19422,3.536353 0.58268,4.386537 0.38844,0.850192 1.03707,1.275287 1.9459,1.275284 0.90149,3e-6 1.54646,-0.425092 1.93492,-1.275284 0.38844,-0.850184 0.58266,-2.312362 0.58267,-4.386537 m 4.23262,0.03298 c -10e-6,2.719145 -0.58635,4.818964 -1.75901,6.299463 -1.17269,1.473173 -2.83642,2.209759 -4.9912,2.209759 -2.16212,0 -3.82952,-0.736586 -5.00219,-2.209759 -1.17267,-1.480499 -1.75901,-3.580318 -1.75901,-6.299463 0,-2.7264611 0.58634,-4.8262799 1.75901,-6.2994658 1.17267,-1.4804861 2.84007,-2.2207364 5.00219,-2.2207531 2.15478,1.67e-5 3.81851,0.740267 4.9912,2.2207531 1.17266,1.4731859 1.759,3.5730047 1.75901,6.2994658"
              style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;stroke:#2e3436;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+             d="m 526.37105,16.906952 5.90169,0 0,3.78432 -4.72135,0 0,-3.78432" />
+          <path
              id="path3053"
-             inkscape:connector-curvature="0" />
-          <path
-             d="m 562.79759,12.14907 c -10e-6,-2.052171 -0.19423,-3.4960278 -0.58267,-4.3315704 -0.38113,-0.8428467 -1.0261,-1.2642763 -1.93492,-1.2642901 -0.90883,1.38e-5 -1.55746,0.4214434 -1.9459,1.2642901 -0.38846,0.8355426 -0.58268,2.2793994 -0.58268,4.3315704 0,2.074175 0.19422,3.536353 0.58268,4.386537 0.38844,0.850192 1.03707,1.275287 1.9459,1.275284 0.90149,3e-6 1.54646,-0.425092 1.93492,-1.275284 0.38844,-0.850184 0.58266,-2.312362 0.58267,-4.386537 m 4.23262,0.03298 c -10e-6,2.719145 -0.58635,4.818964 -1.75901,6.299463 -1.17268,1.473173 -2.83642,2.209759 -4.9912,2.209759 -2.16212,0 -3.82952,-0.736586 -5.00219,-2.209759 -1.17267,-1.480499 -1.75901,-3.580318 -1.75901,-6.299463 0,-2.726461 0.58634,-4.8262801 1.75901,-6.299466 1.17267,-1.4804861 2.84007,-2.2207364 5.00219,-2.2207531 2.15478,1.67e-5 3.81852,0.740267 4.9912,2.2207531 1.17266,1.4731859 1.759,3.573005 1.75901,6.299466"
              style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;stroke:#2e3436;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+             d="m 544.56483,12.14907 c -10e-6,-2.052171 -0.19423,-3.4960276 -0.58267,-4.3315702 -0.38113,-0.8428467 -1.0261,-1.2642763 -1.93492,-1.2642901 -0.90883,1.38e-5 -1.55746,0.4214434 -1.9459,1.2642901 -0.38846,0.8355426 -0.58268,2.2793992 -0.58268,4.3315702 0,2.074175 0.19422,3.536353 0.58268,4.386537 0.38844,0.850192 1.03707,1.275287 1.9459,1.275284 0.90149,3e-6 1.54646,-0.425092 1.93492,-1.275284 0.38844,-0.850184 0.58266,-2.312362 0.58267,-4.386537 m 4.23262,0.03298 c -10e-6,2.719145 -0.58635,4.818964 -1.75901,6.299463 -1.17269,1.473173 -2.83642,2.209759 -4.9912,2.209759 -2.16212,0 -3.82952,-0.736586 -5.00219,-2.209759 -1.17267,-1.480499 -1.75901,-3.580318 -1.75901,-6.299463 0,-2.7264611 0.58634,-4.8262799 1.75901,-6.2994658 1.17267,-1.4804861 2.84007,-2.2207364 5.00219,-2.2207531 2.15478,1.67e-5 3.81851,0.740267 4.9912,2.2207531 1.17266,1.4731859 1.759,3.5730047 1.75901,6.2994658" />
+          <path
              id="path3055"
-             inkscape:connector-curvature="0" />
+             style="font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;stroke:#2e3436;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+             d="m 562.79759,12.14907 c -10e-6,-2.052171 -0.19423,-3.4960278 -0.58267,-4.3315704 -0.38113,-0.8428467 -1.0261,-1.2642763 -1.93492,-1.2642901 -0.90883,1.38e-5 -1.55746,0.4214434 -1.9459,1.2642901 -0.38846,0.8355426 -0.58268,2.2793994 -0.58268,4.3315704 0,2.074175 0.19422,3.536353 0.58268,4.386537 0.38844,0.850192 1.03707,1.275287 1.9459,1.275284 0.90149,3e-6 1.54646,-0.425092 1.93492,-1.275284 0.38844,-0.850184 0.58266,-2.312362 0.58267,-4.386537 m 4.23262,0.03298 c -10e-6,2.719145 -0.58635,4.818964 -1.75901,6.299463 -1.17268,1.473173 -2.83642,2.209759 -4.9912,2.209759 -2.16212,0 -3.82952,-0.736586 -5.00219,-2.209759 -1.17267,-1.480499 -1.75901,-3.580318 -1.75901,-6.299463 0,-2.726461 0.58634,-4.8262801 1.75901,-6.299466 1.17267,-1.4804861 2.84007,-2.2207364 5.00219,-2.2207531 2.15478,1.67e-5 3.81852,0.740267 4.9912,2.2207531 1.17266,1.4731859 1.759,3.573005 1.75901,6.299466" />
         </g>
         <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.11347365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="rect3151"
-           width="4.2269473"
-           height="23.248205"
+           y="35.79224"
            x="455.40063"
-           y="35.79224" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.11347365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="rect3151-2"
-           width="4.2269473"
            height="23.248205"
-           x="504.01053"
-           y="35.79224" />
+           width="4.2269473"
+           id="rect3151"
+           style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.11347365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <rect
-           style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.11347365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="rect3151-2-9"
-           width="50.723419"
-           height="4.2269483"
+           y="35.79224"
+           x="504.01053"
+           height="23.248205"
+           width="4.2269473"
+           id="rect3151-2"
+           style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.11347365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           y="31.565294"
            x="456.45734"
-           y="31.565294" />
+           height="4.2269483"
+           width="50.723419"
+           id="rect3151-2-9"
+           style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.11347365;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <g
-           id="g3095"
-           transform="translate(-0.54837935,1.7985813)">
+           transform="translate(-0.54837935,1.7985813)"
+           id="g3095">
           <g
-             id="g3827-1"
-             transform="matrix(0.63422399,0,0,0.63422399,419.26594,-6.6998585)">
+             transform="matrix(0.63422399,0,0,0.63422399,419.26594,-6.6998585)"
+             id="g3827-1">
             <g
-               id="g3797-9"
-               transform="translate(31.322131,40.570289)">
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9">
               <g
-                 id="g3101"
-                 transform="matrix(1.0929417,0,0,1.0929417,50.053814,46.859677)">
+                 transform="matrix(1.0929417,0,0,1.0929417,50.053814,46.859677)"
+                 id="g3101">
                 <path
-                   inkscape:connector-curvature="0"
-                   style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04899836;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                   d="M -25.459643,6.3070256 A 9.1609585,9.1605407 0.02042846 1 1 -11.54333,18.224065 9.1609585,9.1605407 0.02042846 1 1 -25.459643,6.3070256 z"
                    id="path4250-71"
-                   d="M -25.459643,6.3070256 A 9.1609585,9.1605407 0.02042846 1 1 -11.54333,18.224065 9.1609585,9.1605407 0.02042846 1 1 -25.459643,6.3070256 z" />
+                   style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04899836;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
                 <path
-                   inkscape:connector-curvature="0"
-                   style="fill:url(#linearGradient3105);fill-opacity:1;stroke:#fce94f;stroke-width:3.04899716;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                   d="m -22.932948,8.4748746 a 5.8316609,5.8316612 0 1 1 8.858783,7.5865014 5.8316609,5.8316612 0 0 1 -8.858783,-7.5865014 z"
                    id="path4250-7-3"
-                   d="m -22.932948,8.4748746 a 5.8316609,5.8316612 0 1 1 8.858783,7.5865014 5.8316609,5.8316612 0 0 1 -8.858783,-7.5865014 z" />
+                   style="fill:url(#linearGradient3105);fill-opacity:1;stroke:#fce94f;stroke-width:3.04899716;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
               </g>
               <g
-                 id="g3101-9"
-                 transform="matrix(1.0944996,0,0,1.0944996,126.74426,46.82392)">
+                 transform="matrix(1.0944996,0,0,1.0944996,126.74426,46.82392)"
+                 id="g3101-9">
                 <path
-                   inkscape:connector-curvature="0"
-                   style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04465842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                   d="M -25.459643,6.3070256 A 9.1609585,9.1605407 0.02042846 1 1 -11.54333,18.224065 9.1609585,9.1605407 0.02042846 1 1 -25.459643,6.3070256 z"
                    id="path4250-71-2"
-                   d="M -25.459643,6.3070256 A 9.1609585,9.1605407 0.02042846 1 1 -11.54333,18.224065 9.1609585,9.1605407 0.02042846 1 1 -25.459643,6.3070256 z" />
+                   style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04465842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
                 <path
-                   inkscape:connector-curvature="0"
-                   style="fill:url(#linearGradient3246);fill-opacity:1;stroke:#fce94f;stroke-width:3.04465723;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                   d="m -22.932948,8.4748746 a 5.8316609,5.8316612 0 1 1 8.858783,7.5865014 5.8316609,5.8316612 0 0 1 -8.858783,-7.5865014 z"
                    id="path4250-7-3-0"
-                   d="m -22.932948,8.4748746 a 5.8316609,5.8316612 0 1 1 8.858783,7.5865014 5.8316609,5.8316612 0 0 1 -8.858783,-7.5865014 z" />
+                   style="fill:url(#linearGradient3246);fill-opacity:1;stroke:#fce94f;stroke-width:3.04465723;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
               </g>
               <g
-                 id="g3101-2"
-                 transform="matrix(1.0929417,0,0,1.0929417,88.374078,6.8354789)">
+                 transform="matrix(1.0929417,0,0,1.0929417,88.374078,6.8354789)"
+                 id="g3101-2">
                 <path
-                   inkscape:connector-curvature="0"
-                   style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04899836;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                   d="M -25.459643,6.3070256 A 9.1609585,9.1605407 0.02042846 1 1 -11.54333,18.224065 9.1609585,9.1605407 0.02042846 1 1 -25.459643,6.3070256 z"
                    id="path4250-71-8"
-                   d="M -25.459643,6.3070256 A 9.1609585,9.1605407 0.02042846 1 1 -11.54333,18.224065 9.1609585,9.1605407 0.02042846 1 1 -25.459643,6.3070256 z" />
+                   style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04899836;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
                 <path
-                   inkscape:connector-curvature="0"
-                   style="fill:url(#linearGradient3286);fill-opacity:1;stroke:#fce94f;stroke-width:3.04899716;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                   d="m -22.932948,8.4748746 a 5.8316609,5.8316612 0 1 1 8.858783,7.5865014 5.8316609,5.8316612 0 0 1 -8.858783,-7.5865014 z"
                    id="path4250-7-3-9"
-                   d="m -22.932948,8.4748746 a 5.8316609,5.8316612 0 1 1 8.858783,7.5865014 5.8316609,5.8316612 0 0 1 -8.858783,-7.5865014 z" />
+                   style="fill:url(#linearGradient3286);fill-opacity:1;stroke:#fce94f;stroke-width:3.04899716;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
               </g>
             </g>
           </g>
         </g>
         <g
-           id="g3805"
+           style="fill:url(#linearGradient4091);fill-opacity:1;stroke:#000000;stroke-width:2.95952702"
            transform="matrix(0.71412546,0,0,0.71412546,121.83779,8.9601678)"
-           style="fill:url(#linearGradient4091);fill-opacity:1;stroke:#000000;stroke-width:2.95952702">
+           id="g3805">
           <path
-             transform="matrix(-0.09267867,-0.07912434,0.07912434,-0.09267867,436.47946,110.93746)"
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2901"
              style="fill:url(#linearGradient3819);fill-opacity:1;stroke:#000000;stroke-width:24.28617476999999880;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+             id="path2901"
+             d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
+             transform="matrix(-0.09267867,-0.07912434,0.07912434,-0.09267867,436.47946,110.93746)" />
           <path
-             transform="matrix(-0.09267867,-0.07912433,0.07912433,-0.09267867,504.54859,110.93745)"
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2901-9"
              style="fill:url(#linearGradient3836);fill-opacity:1;stroke:#000000;stroke-width:24.28617477;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+             id="path2901-9"
+             d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
+             transform="matrix(-0.09267867,-0.07912433,0.07912433,-0.09267867,504.54859,110.93745)" />
         </g>
       </g>
     </g>
@@ -442,7 +357,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Dimension</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_DimensionAngular.svg b/src/Mod/Draft/Resources/icons/Draft_DimensionAngular.svg
index 265ef551d3..8dd14c0841 100644
--- a/src/Mod/Draft/Resources/icons/Draft_DimensionAngular.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_DimensionAngular.svg
@@ -6,372 +6,374 @@
    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="svg2735"
+   width="64px"
    height="64px"
-   width="64px">
+   id="svg2735"
+   version="1.1">
+  <title
+     id="title887">Draft_DimensionAngular</title>
   <defs
      id="defs2737">
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <radialGradient
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient259"
        id="radialGradient4452"
-       xlink:href="#linearGradient259" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient269"
        id="radialGradient4454"
-       xlink:href="#linearGradient269" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3042">
       <stop
-         id="stop3044"
+         style="stop-color:#c4a000;stop-opacity:1"
          offset="0"
-         style="stop-color:#c4a000;stop-opacity:1" />
+         id="stop3044" />
       <stop
-         id="stop3046"
+         style="stop-color:#fce94f;stop-opacity:1"
          offset="1"
-         style="stop-color:#fce94f;stop-opacity:1" />
+         id="stop3046" />
     </linearGradient>
     <linearGradient
        id="linearGradient3905">
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
+         id="stop3907"
          offset="0"
-         id="stop3907" />
+         style="stop-color:#d3d7cf;stop-opacity:1" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3909"
          offset="1"
-         id="stop3909" />
+         style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient6349">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6351"
          offset="0"
-         id="stop6351" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6353"
          offset="1"
-         id="stop6353" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377-3">
       <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
+         id="stop3379-6"
          offset="0"
-         id="stop3379-6" />
+         style="stop-color:#0019a3;stop-opacity:1;" />
       <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
+         id="stop3381-7"
          offset="1"
-         id="stop3381-7" />
+         style="stop-color:#0069ff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       xlink:href="#linearGradient3377-3"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3377-3" />
     <radialGradient
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
+       r="194.40614"
+       fy="1424.4465"
+       fx="1103.6399"
+       cy="1424.4465"
+       cx="1103.6399"
+       id="radialGradient6355"
+       xlink:href="#linearGradient6349" />
     <linearGradient
-       xlink:href="#linearGradient3905"
-       id="linearGradient3899"
-       x1="35"
-       y1="50"
-       x2="31"
+       gradientUnits="userSpaceOnUse"
        y2="16"
-       gradientUnits="userSpaceOnUse" />
+       x2="31"
+       y1="50"
+       x1="35"
+       id="linearGradient3899"
+       xlink:href="#linearGradient3905" />
     <linearGradient
        id="linearGradient4077">
       <stop
-         style="stop-color:#888a85;stop-opacity:1;"
+         id="stop4079"
          offset="0"
-         id="stop4079" />
+         style="stop-color:#888a85;stop-opacity:1;" />
       <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
+         id="stop4081"
          offset="1"
-         id="stop4081" />
+         style="stop-color:#2e3436;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3042"
        id="linearGradient1680"
-       xlink:href="#linearGradient3042" />
-    <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1682"
-       xlink:href="#linearGradient3042" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
     <linearGradient
-       gradientTransform="matrix(0.08235137,0,0,0.08235137,-217.69356,-113.67003)"
-       y2="643.28284"
-       x2="155.01889"
-       y1="675.04034"
-       x1="230.03166"
+       xlink:href="#linearGradient3042"
+       id="linearGradient1682"
        gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       xlink:href="#linearGradient4077"
        id="linearGradient1686"
-       xlink:href="#linearGradient4077" />
+       gradientUnits="userSpaceOnUse"
+       x1="230.03166"
+       y1="675.04034"
+       x2="155.01889"
+       y2="643.28284"
+       gradientTransform="matrix(0.08235137,0,0,0.08235137,-217.69356,-113.67003)" />
   </defs>
   <g
      id="layer1">
     <g
-       style="fill:#333333;fill-opacity:1"
+       transform="translate(-105.44439,-136.22016)"
        id="g3856"
-       transform="translate(-105.44439,-136.22016)">
+       style="fill:#333333;fill-opacity:1">
       <path
-         id="rect3151-2-4-7-6-3"
+         style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="m 142.44439,148.22016 1,-3 c 18,11 18,30 9,44 l -2,-3 c 6,-13 6,-26 -8,-38 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         id="rect3151-2-4-7-6-3" />
       <rect
-         transform="matrix(0.28186182,-0.95945501,-0.91771395,-0.39724186,0,0)"
-         y="-196.16293"
-         x="-119.126"
-         height="35.958912"
-         width="3.6304414"
+         style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.00757003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3151-2-4-8"
-         style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.00757003;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         width="3.6304414"
+         height="35.958912"
+         x="-119.126"
+         y="-196.16293"
+         transform="matrix(0.28186182,-0.95945501,-0.91771395,-0.39724186,0,0)" />
       <rect
-         transform="matrix(0.78187145,0.62343968,-0.61813802,0.78606958,0,0)"
-         y="27.232391"
-         x="196.73561"
-         height="39.232121"
-         width="3.7239122"
+         style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.00002265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect3151-2-4-7-6"
-         style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2.00002265;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         width="3.7239122"
+         height="39.232121"
+         x="196.73561"
+         y="27.232391"
+         transform="matrix(0.78187145,0.62343968,-0.61813802,0.78606958,0,0)" />
       <g
-         transform="matrix(0.79388611,0,0,0.79388611,-164.4359,79.085489)"
+         style="fill:#333333;fill-opacity:1"
          id="g3801-3"
-         style="fill:#333333;fill-opacity:1" />
+         transform="matrix(0.79388611,0,0,0.79388611,-164.4359,79.085489)" />
       <g
-         id="g3101-93"
+         style="fill:#333333;fill-opacity:1"
          transform="matrix(0.65595314,0,0,0.65595314,150.582,137.17512)"
-         style="fill:#333333;fill-opacity:1">
+         id="g3101-93">
         <path
-           style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04899836;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M -25.459643,6.3070256 A 9.1609585,9.1605407 0.02042846 1 1 -11.54333,18.224065 9.1609585,9.1605407 0.02042846 1 1 -25.459643,6.3070256 Z"
            id="path4250-71-7"
-           d="M -25.459643,6.3070256 A 9.1609585,9.1605407 0.02042846 1 1 -11.54333,18.224065 9.1609585,9.1605407 0.02042846 1 1 -25.459643,6.3070256 Z" />
+           style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04899836;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           style="fill:url(#linearGradient1680);fill-opacity:1;stroke:#fce94f;stroke-width:3.04899716;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -22.932948,8.4748746 a 5.8316609,5.8316612 0 1 1 8.858783,7.5865014 5.8316609,5.8316612 0 0 1 -8.858783,-7.5865014 z"
            id="path4250-7-3-4"
-           d="m -22.932948,8.4748746 a 5.8316609,5.8316612 0 1 1 8.858783,7.5865014 5.8316609,5.8316612 0 0 1 -8.858783,-7.5865014 z" />
+           style="fill:url(#linearGradient1680);fill-opacity:1;stroke:#fce94f;stroke-width:3.04899716;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
       <g
-         id="g3101-9-5"
+         style="fill:#333333;fill-opacity:1"
          transform="matrix(0.65688815,0,0,0.65688815,159.5978,183.16307)"
-         style="fill:#333333;fill-opacity:1">
+         id="g3101-9-5">
         <path
-           style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04465842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="M -25.459643,6.3070256 A 9.1609585,9.1605407 0.02042846 1 1 -11.54333,18.224065 9.1609585,9.1605407 0.02042846 1 1 -25.459643,6.3070256 Z"
            id="path4250-71-2-2"
-           d="M -25.459643,6.3070256 A 9.1609585,9.1605407 0.02042846 1 1 -11.54333,18.224065 9.1609585,9.1605407 0.02042846 1 1 -25.459643,6.3070256 Z" />
+           style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04465842;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
         <path
-           style="fill:url(#linearGradient1682);fill-opacity:1;stroke:#fce94f;stroke-width:3.04465723;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m -22.932948,8.4748746 a 5.8316609,5.8316612 0 1 1 8.858783,7.5865014 5.8316609,5.8316612 0 0 1 -8.858783,-7.5865014 z"
            id="path4250-7-3-0-5"
-           d="m -22.932948,8.4748746 a 5.8316609,5.8316612 0 1 1 8.858783,7.5865014 5.8316609,5.8316612 0 0 1 -8.858783,-7.5865014 z" />
+           style="fill:url(#linearGradient1682);fill-opacity:1;stroke:#fce94f;stroke-width:3.04465723;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       </g>
       <circle
-         r="3.9999239"
-         cy="-59.711819"
-         cx="-201.45859"
-         transform="rotate(-139.51099)"
+         style="fill:url(#linearGradient1686);fill-opacity:1;stroke:#000000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="path2901-3"
-         style="fill:url(#linearGradient1686);fill-opacity:1;stroke:#000000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         transform="rotate(-139.51099)"
+         cx="-201.45859"
+         cy="-59.711819"
+         r="3.9999239" />
     </g>
   </g>
   <metadata
@@ -382,13 +384,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title>Draft_DimensionAngular</dc:title>
         <cc:license
            rdf:resource="" />
-        <dc:date>Wed Nov 13 19:25:01 2013 -0200</dc:date>
+        <dc:date>Sat Feb 15 12:00:00 2020 -0600</dc:date>
         <dc:creator>
           <cc:Agent>
-            <dc:title>[Yorik van Havre]</dc:title>
+            <dc:title>[vocx]</dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:rights>
@@ -401,21 +403,21 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_DimensionAngular.svg</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
+            <dc:title>[agryson] Alexander Gryson, [yorikvanhavre]</dc:title>
           </cc:Agent>
         </dc:contributor>
         <dc:subject>
           <rdf:Bag>
-            <rdf:li>triangle</rdf:li>
-            <rdf:li>arrow</rdf:li>
+            <rdf:li>angle</rdf:li>
             <rdf:li>curved</rdf:li>
+            <rdf:li>point</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <dc:description>Two triangles, one pointing left, the other right, with a curved arrow below them pointing from the left to the right and slightly upwards</dc:description>
+        <dc:description>Three vertices, two big and one small. Two straight lines tie one big vertex with the small vertex, forming a corner. The two large vertices are tied by a curved arc, in the form of a bow.</dc:description>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Dimension_Tree.svg b/src/Mod/Draft/Resources/icons/Draft_Dimension_Tree.svg
index e308ef91f8..49a96c1e67 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Dimension_Tree.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Dimension_Tree.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,420 +6,274 @@
    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"
+   version="1.1"
    id="svg2735"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="Draft_Dimension_Tree.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
+  <title
+     id="title881">Draft_Dimension_Tree</title>
   <defs
      id="defs2737">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5127">
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop5129"
          offset="0"
-         id="stop5129" />
+         style="stop-color:#fce94f;stop-opacity:1" />
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop5131"
          offset="1"
-         id="stop5131" />
+         style="stop-color:#c4a000;stop-opacity:1" />
     </linearGradient>
-    <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="perspective2743" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5127"
-       id="linearGradient5133"
-       x1="515.75537"
-       y1="6.6850076"
-       x2="566.54315"
+       gradientTransform="matrix(0,0.59069328,-0.37332419,0,46.495675,-286.65322)"
+       gradientUnits="userSpaceOnUse"
        y2="-14.744089"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.59069328,-0.37332419,0,46.495675,-286.65322)" />
-    <inkscape:perspective
-       id="perspective2743-6"
-       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" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5127"
-       id="linearGradient1022"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.59069328,0.37332419,0,17.504325,-286.65322)"
-       x1="515.75537"
-       y1="70.972298"
        x2="566.54315"
-       y2="97.758667" />
+       y1="6.6850076"
+       x1="515.75537"
+       id="linearGradient5133"
+       xlink:href="#linearGradient5127" />
+    <linearGradient
+       y2="97.758667"
+       x2="566.54315"
+       y1="70.972298"
+       x1="515.75537"
+       gradientTransform="matrix(0,0.59069328,0.37332419,0,17.504325,-286.65322)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1022"
+       xlink:href="#linearGradient5127" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         id="stop3838"
+         style="stop-color:#3465a4;stop-opacity:1;"
          offset="0"
-         style="stop-color:#3465a4;stop-opacity:1;" />
+         id="stop3838" />
       <stop
-         id="stop3840"
+         style="stop-color:#729fcf;stop-opacity:1;"
          offset="1"
-         style="stop-color:#729fcf;stop-opacity:1;" />
+         id="stop3840" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3620"
-       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" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3588" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3692" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         offset="0"
+         id="stop3146-9"
          style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3146-9" />
+         offset="0" />
       <stop
-         offset="1"
+         id="stop3148-2"
          style="stop-color:#ffffff;stop-opacity:0"
-         id="stop3148-2" />
+         offset="1" />
     </linearGradient>
     <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3688"
        xlink:href="#linearGradient3144-6"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3805" />
+       id="radialGradient3688"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         style="stop-color:#0619c0;stop-opacity:1;"
+         id="stop3866-5-7"
          offset="0"
-         id="stop3866-5-7" />
+         style="stop-color:#0619c0;stop-opacity:1;" />
       <stop
-         style="stop-color:#379cfb;stop-opacity:1;"
+         id="stop3868-7-6"
          offset="1"
-         id="stop3868-7-6" />
+         style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#ffaa00;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#ffaa00;stop-opacity:1;" />
       <stop
-         style="stop-color:#faff2b;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#faff2b;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3902" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         id="stop5050"
+         style="stop-color:black;stop-opacity:0;"
          offset="0"
-         style="stop-color:black;stop-opacity:0;" />
+         id="stop5050" />
       <stop
-         style="stop-color:black;stop-opacity:1;"
+         id="stop5056"
          offset="0.5"
-         id="stop5056" />
+         style="stop-color:black;stop-opacity:1;" />
       <stop
-         id="stop5052"
+         style="stop-color:black;stop-opacity:0;"
          offset="1"
-         style="stop-color:black;stop-opacity:0;" />
+         id="stop5052" />
     </linearGradient>
     <radialGradient
-       id="aigrd2"
-       cx="20.892099"
-       cy="114.5684"
-       r="5.256"
-       fx="20.892099"
+       gradientUnits="userSpaceOnUse"
        fy="114.5684"
-       gradientUnits="userSpaceOnUse">
+       fx="20.892099"
+       r="5.256"
+       cy="114.5684"
+       cx="20.892099"
+       id="aigrd2">
       <stop
-         offset="0"
+         id="stop15566"
          style="stop-color:#F0F0F0"
-         id="stop15566" />
+         offset="0" />
       <stop
-         offset="1.0000000"
+         id="stop15568"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         id="stop15568" />
+         offset="1.0000000" />
     </radialGradient>
     <radialGradient
-       id="aigrd3"
-       cx="20.892099"
-       cy="64.567902"
-       r="5.257"
-       fx="20.892099"
+       gradientUnits="userSpaceOnUse"
        fy="64.567902"
-       gradientUnits="userSpaceOnUse">
+       fx="20.892099"
+       r="5.257"
+       cy="64.567902"
+       cx="20.892099"
+       id="aigrd3">
       <stop
-         offset="0"
+         id="stop15573"
          style="stop-color:#F0F0F0"
-         id="stop15573" />
+         offset="0" />
       <stop
-         offset="1.0000000"
+         id="stop15575"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         id="stop15575" />
+         offset="1.0000000" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         id="stop15664"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
          offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+         id="stop15664" />
       <stop
-         id="stop15666"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
          offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+         id="stop15666" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient4452"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       cx="33.966679"
-       cy="35.736916"
-       fx="33.966679"
+       r="86.70845"
        fy="35.736916"
-       r="86.70845" />
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4452"
+       xlink:href="#linearGradient259" />
     <linearGradient
        id="linearGradient259">
       <stop
-         id="stop260"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
          offset="0.0000000"
-         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+         id="stop260" />
       <stop
-         id="stop261"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
          offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+         id="stop261" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient269"
-       id="radialGradient4454"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       cx="8.824419"
-       cy="3.7561285"
-       fx="8.824419"
+       r="37.751713"
        fy="3.7561285"
-       r="37.751713" />
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4454"
+       xlink:href="#linearGradient269" />
     <linearGradient
        id="linearGradient269">
       <stop
-         id="stop270"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
          offset="0.0000000"
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+         id="stop270" />
       <stop
-         id="stop271"
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
          offset="1.0000000"
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+         id="stop271" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective4947" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         id="stop4097"
+         style="stop-color:#005bff;stop-opacity:1;"
          offset="0"
-         style="stop-color:#005bff;stop-opacity:1;" />
+         id="stop4097" />
       <stop
-         id="stop4099"
+         style="stop-color:#c1e3f7;stop-opacity:1;"
          offset="1"
-         style="stop-color:#c1e3f7;stop-opacity:1;" />
+         id="stop4099" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective5027" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective5076" />
     <linearGradient
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
-       gradientUnits="userSpaceOnUse"
-       y2="140.22731"
-       x2="434.73947"
-       y1="185.1304"
-       x1="394.15784"
-       id="linearGradient4253"
        xlink:href="#linearGradient4247"
-       inkscape:collect="always" />
+       id="linearGradient4253"
+       x1="394.15784"
+       y1="185.1304"
+       x2="434.73947"
+       y2="140.22731"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         id="stop4249"
+         style="stop-color:#2e8207;stop-opacity:1;"
          offset="0"
-         style="stop-color:#2e8207;stop-opacity:1;" />
+         id="stop4249" />
       <stop
-         id="stop4251"
+         style="stop-color:#52ff00;stop-opacity:1;"
          offset="1"
-         style="stop-color:#52ff00;stop-opacity:1;" />
+         id="stop4251" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective5141" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective5225" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2080078"
-     inkscape:cx="44.256796"
-     inkscape:cy="29.797635"
-     inkscape:current-layer="g3856"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1853"
-     inkscape:window-height="1025"
-     inkscape:window-x="1433"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4598"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid5172"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       empcolor="#ff0000"
-       empopacity="0.25098039"
-       spacingx="16"
-       spacingy="16"
-       originx="0"
-       originy="0" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
        id="g1014">
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path2644-2"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5133);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;stroke-dasharray:none"
          d="M 61,32 41.888729,51.000139 V 12.999857 Z"
-         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient5133);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;stroke-dasharray:none" />
+         id="path2644-2" />
       <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path2644-2-3"
+         style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         d="M 58.132908,32.00363 43.85,46.210559 V 17.796701 Z"
+         id="path2644-2-3" />
+    </g>
+    <g
+       transform="matrix(-1,0,0,1,64,0)"
+       id="g1020">
+      <path
+         id="path1016"
+         d="M 61,32 41.888729,51.000139 V 12.999857 Z"
+         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1022);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;stroke-dasharray:none" />
+      <path
+         id="path1018"
          d="M 58.132908,32.00363 43.85,46.210559 V 17.796701 Z"
          style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
     </g>
     <g
-       id="g1020"
-       transform="matrix(-1,0,0,1,64,0)">
-      <path
-         style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1022);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate;stroke-dasharray:none"
-         d="M 61,32 41.888729,51.000139 V 12.999857 Z"
-         id="path1016"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         d="M 58.132908,32.00363 43.85,46.210559 V 17.796701 Z"
-         id="path1018"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <g
-       transform="translate(-105.44439,-136.22016)"
+       style="fill:#333333;fill-opacity:1"
        id="g3856"
-       style="fill:#333333;fill-opacity:1">
+       transform="translate(-105.44439,-136.22016)">
       <rect
-         style="fill:none;fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         id="rect3852"
-         width="11.999999"
-         height="8.999999"
+         y="163.22015"
          x="131.4444"
-         y="163.22015" />
+         height="8.999999"
+         width="11.999999"
+         id="rect3852"
+         style="fill:none;fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
-         y="165.22015"
-         x="133.4444"
-         height="5.0000086"
-         width="7.9999971"
+         style="fill:none;fill-opacity:1;stroke:#888d81;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          id="rect1320"
-         style="fill:none;fill-opacity:1;stroke:#888d81;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         width="7.9999971"
+         height="5.0000086"
+         x="133.4444"
+         y="165.22015" />
     </g>
   </g>
   <metadata
@@ -432,13 +284,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_FlipDimension</dc:title>
+        <dc:title>Draft_Dimension_Tree</dc:title>
         <cc:license
            rdf:resource="" />
-        <dc:date>Wed Nov 13 19:25:01 2013 -0200</dc:date>
+        <dc:date>Wed Oct 6 12:19:00 2019 -0600</dc:date>
         <dc:creator>
           <cc:Agent>
-            <dc:title>[Yorik van Havre]</dc:title>
+            <dc:title>[vocx]</dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:rights>
@@ -451,21 +303,20 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_Dimenstion_Tree</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
+            <dc:title>[agryson] Alexander Gryson, [yorikvanhavre]</dc:title>
           </cc:Agent>
         </dc:contributor>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>triangle</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>curved</rdf:li>
+            <rdf:li>arrows</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <dc:description>Two triangles, one pointing left, the other right, with a curved arrow below them pointing from the left to the right and slightly upwards</dc:description>
+        <dc:description>Two triangles, one pointing left, the other right, with a small line between the two</dc:description>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Dot.svg b/src/Mod/Draft/Resources/icons/Draft_Dot.svg
index eafa8716ef..252a8343d4 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Dot.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Dot.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,237 +6,166 @@
    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"
+   version="1.1"
    id="svg2869"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Dot.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2871">
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2368"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <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="perspective2877" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3171"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3173"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3175"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3193"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3205"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3922"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1733561,0.02175327,0.02175328,1.1801291,55.592501,-17.013229)"
-       x1="11.390151"
-       y1="453.55045"
+       id="radialGradient3205"
+       xlink:href="#linearGradient3144" />
+    <linearGradient
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(1.1733561,0.02175327,0.02175328,1.1801291,55.592501,-17.013229)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="18.892864"
-     inkscape:cx="13.517429"
-     inkscape:cy="29.084119"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3085"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3129"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       style="stroke:#3465a4;stroke-width:0.97375208"
+       transform="matrix(2.0537159,0.03151362,-0.03151503,2.0536223,-245.35223,-484.91119)"
        id="g4312"
-       transform="matrix(2.0537159,0.03151362,-0.03151503,2.0536223,-245.35223,-484.91119)">
+       style="stroke:#3465a4;stroke-width:0.97375208">
       <g
-         style="stroke:#3465a4;stroke-width:6.49510956"
+         id="g4248"
          transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
-         id="g4248">
+         style="stroke:#3465a4;stroke-width:6.49510956">
         <g
-           transform="translate(-3.7314339,-3.2817175)"
+           style="stroke-width:6.49510956"
            id="g3906"
-           style="stroke-width:6.49510956">
+           transform="translate(-3.7314339,-3.2817175)">
           <path
-             inkscape:connector-curvature="0"
-             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:6.49510956;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 145.08885,535.18229 a 48.571431,48.571431 0 1 1 -97.142854,0 48.571431,48.571431 0 1 1 97.142854,0 z"
              id="path4250"
-             d="m 145.08885,535.18229 a 48.571431,48.571431 0 1 1 -97.142854,0 48.571431,48.571431 0 1 1 97.142854,0 z" />
+             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:6.49510956;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:6.49510956;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 138.55997,535.14385 a 42.216398,42.21834 49.289969 1 1 -84.435028,0.002 42.216398,42.21834 49.289969 0 1 84.435028,-0.002 z"
              id="path4250-7"
-             d="m 138.55997,535.14385 a 42.216398,42.21834 49.289969 1 1 -84.435028,0.002 42.216398,42.21834 49.289969 0 1 84.435028,-0.002 z" />
+             style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:6.49510956;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
     </g>
@@ -251,7 +178,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Dot</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Sat Dec 17 15:36:02 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Downgrade.svg b/src/Mod/Draft/Resources/icons/Draft_Downgrade.svg
index 0b931773da..3a22412edb 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Downgrade.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Downgrade.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,142 +6,70 @@
    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"
+   version="1.1"
    id="svg3074"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Downgrade.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs3076">
     <linearGradient
        id="linearGradient3841">
       <stop
-         style="stop-color:#0619c0;stop-opacity:1;"
+         id="stop3843"
          offset="0"
-         id="stop3843" />
+         style="stop-color:#0619c0;stop-opacity:1;" />
       <stop
-         style="stop-color:#379cfb;stop-opacity:1;"
+         id="stop3845"
          offset="1"
-         id="stop3845" />
+         style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841"
-       id="linearGradient3863"
-       gradientUnits="userSpaceOnUse"
-       x1="3709.3296"
-       y1="1286.7291"
+       y2="1076.6174"
        x2="3935.5251"
-       y2="1076.6174" />
-    <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="perspective3082" />
+       y1="1286.7291"
+       x1="3709.3296"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3863"
+       xlink:href="#linearGradient3841" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3909"
-       x1="43"
-       y1="22"
-       x2="48"
+       gradientUnits="userSpaceOnUse"
        y2="44"
-       gradientUnits="userSpaceOnUse" />
+       x2="48"
+       y1="22"
+       x1="43"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3895" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(0,1.4500001,-1.4705882,0,79.058821,-27.45)"
-       y2="26.559999"
-       x2="58.93103"
-       y1="32.68"
-       x1="23.068964"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3036"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
+       id="linearGradient3036"
+       gradientUnits="userSpaceOnUse"
+       x1="23.068964"
+       y1="32.68"
+       x2="58.93103"
+       y2="26.559999"
+       gradientTransform="matrix(0,1.4500001,-1.4705882,0,79.058821,-27.45)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.116667"
-     inkscape:cx="15.583209"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="false"
-     inkscape:snap-nodes="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3038"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3040"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3036);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.99999988000000006;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 57,34.9 43,35 43,3 21,3 21,35 7.0000006,34.9 32.000001,61 z"
        id="path3343"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 57,34.9 43,35 43,3 21,3 21,35 7.0000006,34.9 32.000001,61 z"
+       style="fill:url(#linearGradient3036);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.99999988000000006;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 52,37 41,37 41,5 23,5 23,37 12,37 31.827939,57.999994 z"
        id="path3343-2"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 52,37 41,37 41,5 23,5 23,37 12,37 31.827939,57.999994 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <metadata
      id="metadata4089">
@@ -153,7 +79,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Downgrade</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Draft.svg b/src/Mod/Draft/Resources/icons/Draft_Draft.svg
index 790bc31f9d..1f2735ce81 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Draft.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Draft.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,149 +6,83 @@
    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="Draft_Draft.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">
+   id="svg5821"
+   height="64px"
+   width="64px">
   <defs
      id="defs5823">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6351"
          offset="0"
-         id="stop6351" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6353"
          offset="1"
-         id="stop6353" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#0019a3;stop-opacity:1;" />
       <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#0069ff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
        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" />
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3377" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
+       r="194.40614"
+       fy="1424.4465"
+       fx="1103.6399"
+       cy="1424.4465"
+       cx="1103.6399"
+       id="radialGradient6355"
+       xlink:href="#linearGradient6349" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.116667"
-     inkscape:cx="15.601907"
-     inkscape:cy="32"
-     inkscape:current-layer="g3360"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2994"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <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.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)"
+       id="g3360">
       <rect
-         style="color:#000000;fill:none;stroke:#0b1521;stroke-width:43.86404037;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3860"
-         width="277.8056"
-         height="248.56288"
+         y="1168.7546"
          x="907.65808"
-         y="1168.7546" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#0b1521;stroke-width:5.89605999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3862"
-         sodipodi:cx="30.181818"
-         sodipodi:cy="33.272728"
-         sodipodi:rx="18.181818"
-         sodipodi:ry="18.181818"
-         d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-         transform="matrix(7.6471726,0,0,7.2375671,932.86278,913.31967)" />
-      <rect
-         style="color:#000000;fill:none;stroke:#729fcf;stroke-width:14.62134731000000087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3860-3"
-         width="277.8056"
          height="248.56288"
-         x="907.65814"
-         y="1168.7546" />
+         width="277.8056"
+         id="rect3860"
+         style="color:#000000;fill:none;stroke:#0b1521;stroke-width:43.86404037;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1.96535339999999992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(7.6471726,0,0,7.2375671,932.86278,913.31967)"
+         d="M 48.363636,33.272728 A 18.181818,18.181818 0 0 1 30.181818,51.454546 18.181818,18.181818 0 0 1 12,33.272728 18.181818,18.181818 0 0 1 30.181818,15.09091 18.181818,18.181818 0 0 1 48.363636,33.272728 Z"
+         id="path3862"
+         style="color:#000000;fill:none;stroke:#0b1521;stroke-width:5.89605999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         y="1168.7546"
+         x="907.65814"
+         height="248.56288"
+         width="277.8056"
+         id="rect3860-3"
+         style="color:#000000;fill:none;stroke:#729fcf;stroke-width:14.62134731000000087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         transform="matrix(7.6471723,0,0,7.2375671,932.86278,913.31967)"
+         d="M 48.363636,33.272728 A 18.181818,18.181818 0 0 1 30.181818,51.454546 18.181818,18.181818 0 0 1 12,33.272728 18.181818,18.181818 0 0 1 30.181818,15.09091 18.181818,18.181818 0 0 1 48.363636,33.272728 Z"
          id="path3862-6"
-         sodipodi:cx="30.181818"
-         sodipodi:cy="33.272728"
-         sodipodi:rx="18.181818"
-         sodipodi:ry="18.181818"
-         d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-         transform="matrix(7.6471723,0,0,7.2375671,932.86278,913.31967)" />
+         style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1.96535339999999992;stroke-linecap:round;stroke-linejoin:round;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>
   <metadata
@@ -161,7 +93,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Draft</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Draft2Sketch.svg b/src/Mod/Draft/Resources/icons/Draft_Draft2Sketch.svg
index a3e01801b5..b20fa593f4 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Draft2Sketch.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Draft2Sketch.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,295 +6,188 @@
    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="Draft_Draft2Sketch.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">
+   id="svg5821"
+   height="64px"
+   width="64px">
   <defs
      id="defs5823">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6351"
          offset="0"
-         id="stop6351" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6353"
          offset="1"
-         id="stop6353" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#0019a3;stop-opacity:1;" />
       <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#0069ff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
        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" />
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3377" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
+       r="194.40614"
+       fy="1424.4465"
+       fx="1103.6399"
+       cy="1424.4465"
+       cx="1103.6399"
+       id="radialGradient6355"
+       xlink:href="#linearGradient6349" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3909"
-       x1="43"
-       y1="22"
-       x2="48"
+       gradientUnits="userSpaceOnUse"
        y2="44"
-       gradientUnits="userSpaceOnUse" />
+       x2="48"
+       y1="22"
+       x1="43"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3895" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(0,-4.7685352,5.1148865,0,860.20335,1428.5537)"
-       y2="33.575752"
-       x2="30.198629"
-       y1="30.717167"
-       x1="53.195232"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3023"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(0,-7.3106737,7.3106737,0,1160.2086,1701.7691)"
-       y2="44"
-       x2="48"
-       y1="22"
-       x1="43"
+       id="linearGradient3023"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3023-8"
+       x1="53.195232"
+       y1="30.717167"
+       x2="30.198629"
+       y2="33.575752"
+       gradientTransform="matrix(0,-4.7685352,5.1148865,0,860.20335,1428.5537)" />
+    <linearGradient
        xlink:href="#linearGradient3895-2"
-       inkscape:collect="always" />
+       id="linearGradient3023-8"
+       gradientUnits="userSpaceOnUse"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientTransform="matrix(0,-7.3106737,7.3106737,0,1160.2086,1701.7691)" />
     <linearGradient
        id="linearGradient3895-2">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897-4"
          offset="0"
-         id="stop3897-4" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899-5"
          offset="1"
-         id="stop3899-5" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(0,-4.7685352,5.1148865,0,1320.7758,1575.9421)"
-       y2="44"
-       x2="48"
-       y1="22"
-       x1="43"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3023-7"
        xlink:href="#linearGradient3895-1"
-       inkscape:collect="always" />
+       id="linearGradient3023-7"
+       gradientUnits="userSpaceOnUse"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientTransform="matrix(0,-4.7685352,5.1148865,0,1320.7758,1575.9421)" />
     <linearGradient
        id="linearGradient3895-1">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897-1"
          offset="0"
-         id="stop3897-1" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899-52"
          offset="1"
-         id="stop3899-52" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="29.287876"
-       x2="50.12904"
-       y1="35.005051"
-       x1="27.132439"
-       gradientTransform="matrix(0,4.7685353,-5.1148865,0,1357.1998,1038.1977)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3140"
        xlink:href="#linearGradient3895-1"
-       inkscape:collect="always" />
+       id="linearGradient3140"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,4.7685353,-5.1148865,0,1357.1998,1038.1977)"
+       x1="27.132439"
+       y1="35.005051"
+       x2="50.12904"
+       y2="29.287876" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.116669"
-     inkscape:cx="15.583212"
-     inkscape:cy="31.999998"
-     inkscape:current-layer="g3360"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2997"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <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.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)"
+       id="g3360">
       <path
-         style="fill:none;stroke:#a40000;stroke-width:43.86404036999999789;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 907.65811,1329.5894 153.52409,-102.3494 160.8348,87.7281 -160.8348,102.3494 z"
          id="path3931-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="m 907.65811,1329.5894 153.52409,-102.3494 160.8348,87.7281 -160.8348,102.3494 z"
+         style="fill:none;stroke:#a40000;stroke-width:43.86404036999999789;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         sodipodi:type="arc"
-         style="fill:none;stroke:#a40000;stroke-width:6.73300314000000011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(6.4505944,0,0,6.5796065,644.47383,1203.8458)"
+         d="M 102,18 A 17,10 0 0 1 85,28 17,10 0 0 1 68,18 17,10 0 0 1 85,8 17,10 0 0 1 102,18 Z"
          id="path3951-3"
-         sodipodi:cx="85"
-         sodipodi:cy="18"
-         sodipodi:rx="17"
-         sodipodi:ry="10"
-         d="m 102,18 c 0,5.522847 -7.611159,10 -17,10 -9.388841,0 -17,-4.477153 -17,-10 0,-5.522847 7.611159,-10 17,-10 9.388841,0 17,4.477153 17,10 z"
-         transform="matrix(6.4505944,0,0,6.5796065,644.47383,1203.8458)" />
+         style="fill:none;stroke:#a40000;stroke-width:6.73300314000000011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:type="arc"
-         style="fill:none;stroke:#ef2929;stroke-width:2.24433446000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(6.4505944,0,0,6.5796065,644.47383,1203.8458)"
+         d="M 102,18 A 17,10 0 0 1 85,28 17,10 0 0 1 68,18 17,10 0 0 1 85,8 17,10 0 0 1 102,18 Z"
          id="path3951-4-2"
-         sodipodi:cx="85"
-         sodipodi:cy="18"
-         sodipodi:rx="17"
-         sodipodi:ry="10"
-         d="m 102,18 c 0,5.522847 -7.611159,10 -17,10 -9.388841,0 -17,-4.477153 -17,-10 0,-5.522847 7.611159,-10 17,-10 9.388841,0 17,4.477153 17,10 z"
-         transform="matrix(6.4505944,0,0,6.5796065,644.47383,1203.8458)" />
+         style="fill:none;stroke:#ef2929;stroke-width:2.24433446000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#ef2929;stroke-width:14.62134743000000000;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 907.65812,1329.5895 153.52418,-102.3495 160.8348,87.7281 -160.8348,102.3494 z"
          id="path3931-1-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="m 907.65812,1329.5895 153.52418,-102.3495 160.8348,87.7281 -160.8348,102.3494 z"
+         style="fill:none;stroke:#ef2929;stroke-width:14.62134743000000000;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#204a87;stroke-width:43.86404036999999789;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 907.65808,1124.8906 153.52412,-102.3494 160.8348,87.7281 -160.8348,102.3494 z"
          id="path3931"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="m 907.65808,1124.8906 153.52412,-102.3494 160.8348,87.7281 -160.8348,102.3494 z"
+         style="fill:none;stroke:#204a87;stroke-width:43.86404036999999789;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         sodipodi:type="arc"
-         style="fill:none;stroke:#204a87;stroke-width:6.73300314000000011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(6.4505944,0,0,6.5796065,644.4738,999.14701)"
+         d="M 102,18 A 17,10 0 0 1 85,28 17,10 0 0 1 68,18 17,10 0 0 1 85,8 17,10 0 0 1 102,18 Z"
          id="path3951"
-         sodipodi:cx="85"
-         sodipodi:cy="18"
-         sodipodi:rx="17"
-         sodipodi:ry="10"
-         d="m 102,18 c 0,5.522847 -7.611159,10 -17,10 -9.388841,0 -17,-4.477153 -17,-10 0,-5.522847 7.611159,-10 17,-10 9.388841,0 17,4.477153 17,10 z"
-         transform="matrix(6.4505944,0,0,6.5796065,644.4738,999.14701)" />
+         style="fill:none;stroke:#204a87;stroke-width:6.73300314000000011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:type="arc"
-         style="fill:none;stroke:#729fcf;stroke-width:2.24433446;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(6.4505944,0,0,6.5796065,644.4738,999.14701)"
+         d="M 102,18 A 17,10 0 0 1 85,28 17,10 0 0 1 68,18 17,10 0 0 1 85,8 17,10 0 0 1 102,18 Z"
          id="path3951-4"
-         sodipodi:cx="85"
-         sodipodi:cy="18"
-         sodipodi:rx="17"
-         sodipodi:ry="10"
-         d="m 102,18 c 0,5.522847 -7.611159,10 -17,10 -9.388841,0 -17,-4.477153 -17,-10 0,-5.522847 7.611159,-10 17,-10 9.388841,0 17,4.477153 17,10 z"
-         transform="matrix(6.4505944,0,0,6.5796065,644.4738,999.14701)" />
+         style="fill:none;stroke:#729fcf;stroke-width:2.24433446;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 907.65809,1124.8907 153.52421,-102.3495 160.8348,87.7281 -160.8348,102.3494 z"
          id="path3931-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="m 907.65809,1124.8907 153.52421,-102.3495 160.8348,87.7281 -160.8348,102.3494 z"
+         style="fill:none;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:14.62134743000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 936.90075,1226.0651 51.1747,0 0,87.7281 73.10675,0 0,-87.7281 51.1747,0 -87.7281,-87.7281 z"
          id="path3343"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-ydpi="4.1683898" />
+         d="m 936.90075,1226.0651 51.1747,0 0,87.7281 73.10675,0 0,-87.7281 51.1747,0 -87.7281,-87.7281 z"
+         style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:14.62134743000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 973.19265,1211.2087 29.50415,0.235 0,87.7282 43.864,0 0,-87.7282 30.1826,0 -52.1146,-52.3496 z"
          id="path3343-2"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-ydpi="4.1683898" />
+         d="m 973.19265,1211.2087 29.50415,0.235 0,87.7282 43.864,0 0,-87.7282 30.1826,0 -52.1146,-52.3496 z"
+         style="fill:none;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:url(#linearGradient3140);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:14.62134743000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 1280.5024,1240.6863 -51.1747,0 0,-87.7281 -73.1068,0 0,87.7281 -51.1747,0 87.7281,87.7282 z"
          id="path3343-7"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-ydpi="4.1683898" />
+         d="m 1280.5024,1240.6863 -51.1747,0 0,-87.7281 -73.1068,0 0,87.7281 -51.1747,0 87.7281,87.7282 z"
+         style="fill:url(#linearGradient3140);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:14.62134743000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         inkscape:connector-curvature="0"
-         style="fill:none;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 1244.2105,1255.5427 -29.5042,-0.2349 0,-87.7282 -43.864,0 0,87.7282 -30.1826,0 52.1146,52.3496 z"
          id="path3343-2-6"
-         sodipodi:nodetypes="cccccccc"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-ydpi="4.1683898" />
+         d="m 1244.2105,1255.5427 -29.5042,-0.2349 0,-87.7282 -43.864,0 0,87.7282 -30.1826,0 52.1146,52.3496 z"
+         style="fill:none;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
   </g>
   <metadata
@@ -307,7 +198,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Draft2Sketch</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Tue Dec 6 17:18:18 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Drawing.svg b/src/Mod/Draft/Resources/icons/Draft_Drawing.svg
index 03d89fd7ef..feca8eafe5 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Drawing.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Drawing.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,587 +6,473 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Drawing.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-0"
-       id="linearGradient3934"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,519.98085,464.19243)"
-       x1="696.67322"
-       y1="77.046234"
+       y2="115.01974"
        x2="654.80023"
-       y2="115.01974" />
+       y1="77.046234"
+       x1="696.67322"
+       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,519.98085,464.19243)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3934"
+       xlink:href="#linearGradient3864-0-0" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3942"
-       x1="597.77283"
-       y1="44.024342"
-       x2="619.30328"
+       gradientUnits="userSpaceOnUse"
        y2="30.27434"
-       gradientUnits="userSpaceOnUse" />
+       x2="619.30328"
+       y1="44.024342"
+       x1="597.77283"
+       id="linearGradient3942"
+       xlink:href="#linearGradient3377" />
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0"
-       id="linearGradient3657"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,536.41251,472.3612)"
-       x1="696.67322"
-       y1="77.046234"
+       y2="139.40982"
        x2="650.70459"
-       y2="139.40982" />
+       y1="77.046234"
+       x1="696.67322"
+       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,536.41251,472.3612)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3657"
+       xlink:href="#linearGradient3864-0" />
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
+         offset="0.5"
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5064" />
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         id="stop5062"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop5064"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd2"
-       id="radialGradient2283"
-       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"
+       fy="114.5684"
+       fx="20.892099"
        cy="114.5684"
        cx="20.892099"
-       id="aigrd2">
-      <stop
-         id="stop15566"
-         style="stop-color:#F0F0F0"
-         offset="0" />
-      <stop
-         id="stop15568"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </radialGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd3"
-       id="radialGradient2285"
-       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"
+       id="radialGradient2283"
+       xlink:href="#aigrd2" />
+    <radialGradient
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd3">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       r="38.158695"
-       fy="7.2678967"
-       fx="8.1435566"
-       cy="7.2678967"
-       cx="8.1435566"
-       gradientTransform="matrix(0.93578701,0,0,0.95695492,14.882422,-58.630722)"
+       r="5.257"
+       fy="64.567902"
+       fx="20.892099"
+       cy="64.567902"
+       cx="20.892099"
+       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient15668"
+       id="radialGradient2285"
+       xlink:href="#aigrd3" />
+    <radialGradient
+       id="aigrd3"
+       cx="20.892099"
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop15573" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+         id="stop15575" />
+    </radialGradient>
+    <radialGradient
        xlink:href="#linearGradient15662"
-       inkscape:collect="always" />
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.93578701,0,0,0.95695492,14.882422,-58.630722)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="43.717598"
-       fx="3.7745965"
-       cy="43.717598"
-       cx="3.7745965"
-       gradientTransform="matrix(0.9839807,0,0,1.0179698,10.292146,-60.498192)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3972"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <radialGradient
-       r="37.751713"
-       fy="43.445751"
-       fx="0.28083447"
-       cy="43.445751"
-       cx="0.28083447"
-       gradientTransform="matrix(0.99195094,0,0,1.009791,13.727702,-59.866123)"
+       id="radialGradient3972"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3974"
+       gradientTransform="matrix(0.9839807,0,0,1.0179698,10.292146,-60.498192)"
+       cx="3.7745965"
+       cy="43.717598"
+       fx="3.7745965"
+       fy="43.717598"
+       r="86.70845" />
+    <radialGradient
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient3974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99195094,0,0,1.009791,13.727702,-59.866123)"
+       cx="0.28083447"
+       cy="43.445751"
+       fx="0.28083447"
+       fy="43.445751"
+       r="37.751713" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3909"
-       x1="43"
-       y1="22"
-       x2="48"
+       gradientUnits="userSpaceOnUse"
        y2="44"
-       gradientUnits="userSpaceOnUse" />
+       x2="48"
+       y1="22"
+       x1="43"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3895" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="translate(-27,-6)"
-       y2="44"
-       x2="48"
-       y1="22"
-       x1="43"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3023"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
+       id="linearGradient3023"
+       gradientUnits="userSpaceOnUse"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientTransform="translate(-27,-6)" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient3092"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
+       y2="609.50507"
        x2="302.85715"
-       y2="609.50507" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient3094"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
        gradientUnits="userSpaceOnUse"
+       id="linearGradient3092"
+       xlink:href="#linearGradient5048" />
+    <radialGradient
+       r="117.14286"
+       fy="486.64789"
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
        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" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient3096"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
+       id="radialGradient3094"
+       xlink:href="#linearGradient5060" />
+    <radialGradient
+       r="117.14286"
        fy="486.64789"
-       r="117.14286" />
+       fx="605.71429"
+       cy="486.64789"
+       cx="605.71429"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3096"
+       xlink:href="#linearGradient5060" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="13.078393"
-     inkscape:cx="16.201719"
-     inkscape:cy="30.499924"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3071"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <rect
-       ry="1.1234856"
-       y="-56.932377"
-       x="17.057177"
-       height="40.010132"
-       width="35.727829"
-       id="rect15391"
-       style="color:#000000;fill:url(#radialGradient3972);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient3974);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+       transform="matrix(3.5736813e-4,0.99999994,-0.99999992,3.9232174e-4,0,0)"
        rx="1.1771472"
-       transform="matrix(3.5736813e-4,0.99999994,-0.99999992,3.9232174e-4,0,0)" />
+       style="color:#000000;fill:url(#radialGradient3972);fill-opacity:1;fill-rule:nonzero;stroke:url(#radialGradient3974);stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
+       id="rect15391"
+       width="35.727829"
+       height="40.010132"
+       x="17.057177"
+       y="-56.932377"
+       ry="1.1234856" />
     <rect
-       rx="0.14404793"
-       ry="0.13810737"
-       y="-54.981792"
-       x="19.050236"
-       height="36.087452"
-       width="31.676243"
-       id="rect15660"
+       transform="matrix(3.5899548e-4,0.99999994,-0.99999992,3.9054332e-4,0,0)"
        style="color:#000000;fill:none;stroke:url(#radialGradient15668);stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
-       transform="matrix(3.5899548e-4,0.99999994,-0.99999992,3.9054332e-4,0,0)" />
+       id="rect15660"
+       width="31.676243"
+       height="36.087452"
+       x="19.050236"
+       y="-54.981792"
+       ry="0.13810737"
+       rx="0.14404793" />
     <g
-       style="stroke-width:2.02001595;display:inline"
+       transform="matrix(3.6610713e-4,1.0244539,-0.97775283,3.8359374e-4,60.539218,10.930654)"
        id="g2270"
-       transform="matrix(3.6610713e-4,1.0244539,-0.97775283,3.8359374e-4,60.539218,10.930654)">
+       style="stroke-width:2.02001595;display:inline">
       <g
-         transform="matrix(0.229703,0,0,0.229703,4.967081,4.244972)"
+         id="g1440"
          style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8.69966507;stroke-miterlimit:4"
-         id="g1440">
+         transform="matrix(0.229703,0,0,0.229703,4.967081,4.244972)">
         <radialGradient
-           gradientUnits="userSpaceOnUse"
-           fy="114.5684"
-           fx="20.892099"
-           r="5.256"
+           id="radialGradient1442"
+           cx="20.892099"
            cy="114.5684"
-           cx="20.892099"
-           id="radialGradient1442">
-          <stop
-             id="stop1444"
-             style="stop-color:#F0F0F0"
-             offset="0" />
-          <stop
-             id="stop1446"
-             style="stop-color:#474747"
-             offset="1" />
-        </radialGradient>
-        <path
-           id="path1448"
-           d="m 23.428,113.07 c 0,1.973 -1.6,3.572 -3.573,3.572 -1.974,0 -3.573,-1.6 -3.573,-3.572 0,-1.974 1.6,-3.573 3.573,-3.573 1.973,0 3.573,1.6 3.573,3.573 z"
-           style="stroke:none"
-           inkscape:connector-curvature="0" />
-        <radialGradient
-           gradientUnits="userSpaceOnUse"
-           fy="64.567902"
+           r="5.256"
            fx="20.892099"
-           r="5.257"
-           cy="64.567902"
-           cx="20.892099"
-           id="radialGradient1450">
+           fy="114.5684"
+           gradientUnits="userSpaceOnUse">
           <stop
-             id="stop1452"
+             offset="0"
              style="stop-color:#F0F0F0"
-             offset="0" />
+             id="stop1444" />
           <stop
-             id="stop1454"
+             offset="1"
              style="stop-color:#474747"
-             offset="1" />
+             id="stop1446" />
         </radialGradient>
         <path
-           id="path1456"
-           d="m 23.428,63.07 c 0,1.973 -1.6,3.573 -3.573,3.573 -1.974,0 -3.573,-1.6 -3.573,-3.573 0,-1.974 1.6,-3.573 3.573,-3.573 1.973,0 3.573,1.6 3.573,3.573 z"
            style="stroke:none"
-           inkscape:connector-curvature="0" />
+           d="m 23.428,113.07 c 0,1.973 -1.6,3.572 -3.573,3.572 -1.974,0 -3.573,-1.6 -3.573,-3.572 0,-1.974 1.6,-3.573 3.573,-3.573 1.973,0 3.573,1.6 3.573,3.573 z"
+           id="path1448" />
+        <radialGradient
+           id="radialGradient1450"
+           cx="20.892099"
+           cy="64.567902"
+           r="5.257"
+           fx="20.892099"
+           fy="64.567902"
+           gradientUnits="userSpaceOnUse">
+          <stop
+             offset="0"
+             style="stop-color:#F0F0F0"
+             id="stop1452" />
+          <stop
+             offset="1"
+             style="stop-color:#474747"
+             id="stop1454" />
+        </radialGradient>
+        <path
+           style="stroke:none"
+           d="m 23.428,63.07 c 0,1.973 -1.6,3.573 -3.573,3.573 -1.974,0 -3.573,-1.6 -3.573,-3.573 0,-1.974 1.6,-3.573 3.573,-3.573 1.973,0 3.573,1.6 3.573,3.573 z"
+           id="path1456" />
       </g>
       <path
-         id="path15570"
-         d="m 9.9950109,29.952326 c 0,0.453204 -0.3675248,0.820499 -0.8207288,0.820499 -0.4534338,0 -0.8207289,-0.367524 -0.8207289,-0.820499 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z"
          style="fill:url(#radialGradient2283);fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
+         d="m 9.9950109,29.952326 c 0,0.453204 -0.3675248,0.820499 -0.8207288,0.820499 -0.4534338,0 -0.8207289,-0.367524 -0.8207289,-0.820499 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z"
+         id="path15570" />
       <path
-         id="path15577"
-         d="m 9.9950109,18.467176 c 0,0.453204 -0.3675248,0.820729 -0.8207288,0.820729 -0.4534338,0 -0.8207289,-0.367525 -0.8207289,-0.820729 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z"
          style="fill:url(#radialGradient2285);fill-rule:nonzero;stroke:none"
-         inkscape:connector-curvature="0" />
+         d="m 9.9950109,18.467176 c 0,0.453204 -0.3675248,0.820729 -0.8207288,0.820729 -0.4534338,0 -0.8207289,-0.367525 -0.8207289,-0.820729 0,-0.453434 0.3675248,-0.820729 0.8207289,-0.820729 0.453204,0 0.8207288,0.367525 0.8207288,0.820729 z"
+         id="path15577" />
     </g>
     <path
-       sodipodi:nodetypes="cc"
-       id="path15672"
-       d="m 55.134004,22.057604 -37.063279,0.01454"
        style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.01754384;display:inline"
-       inkscape:connector-curvature="0" />
+       d="m 55.134004,22.057604 -37.063279,0.01454"
+       id="path15672" />
     <path
-       style="fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 52.524227,25.481953 c 0,0 0,7.218203 0,10.517728 0,3.299525 0,9.279423 0,9.279423 0,0 -5.2823,0 -8.11927,0 -2.83698,0 -8.902579,0 -8.902579,0 0,0 5.371499,-6.247282 8.208469,-9.546808 2.83698,-3.299525 8.81338,-10.250343 8.81338,-10.250343 z"
        id="path4012"
-       sodipodi:nodetypes="czczczc" />
+       d="m 52.524227,25.481953 c 0,0 0,7.218203 0,10.517728 0,3.299525 0,9.279423 0,9.279423 0,0 -5.2823,0 -8.11927,0 -2.83698,0 -8.902579,0 -8.902579,0 0,0 5.371499,-6.247282 8.208469,-9.546808 2.83698,-3.299525 8.81338,-10.250343 8.81338,-10.250343 z"
+       style="fill:none;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       sodipodi:nodetypes="cc"
-       id="path15674"
-       d="M 55.597596,23.076014 18.42567,23.090595"
        style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.20467828;display:inline"
-       inkscape:connector-curvature="0" />
+       d="M 55.597596,23.076014 18.42567,23.090595"
+       id="path15674" />
     <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:none;stroke:#204a87;stroke-width:2.93378626000000020;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4014"
-       sodipodi:cx="664.68036"
-       sodipodi:cy="30.587521"
-       sodipodi:rx="8.8388348"
-       sodipodi:ry="8.8388348"
+       transform="matrix(0.68171292,0,0,0.68171292,-411.28568,14.442144)"
        d="m 673.51919,30.587521 a 8.8388348,8.8388348 0 1 1 -17.67767,0 8.8388348,8.8388348 0 1 1 17.67767,0 z"
-       transform="matrix(0.68171292,0,0,0.68171292,-411.28568,14.442144)" />
+       id="path4014"
+       style="color:#000000;fill:none;stroke:#204a87;stroke-width:2.93378626000000020;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <g
-       style="stroke-width:112.62601471;display:inline"
+       transform="matrix(0.02116984,0,0,0.01522076,55.649294,54.012912)"
        id="g5022"
-       transform="matrix(0.02116984,0,0,0.01522076,55.649294,54.012912)">
+       style="stroke-width:112.62601471;display:inline">
       <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
+         style="opacity:0.40206185;color:#000000;fill:url(#linearGradient3092);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:112.62601471;marker:none;visibility:visible;display:inline;overflow:visible"
          id="rect4173"
-         style="opacity:0.40206185;color:#000000;fill:url(#linearGradient3092);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:112.62601471;marker:none;visibility:visible;display:inline;overflow:visible" />
+         width="1339.6335"
+         height="478.35718"
+         x="-1559.2523"
+         y="-150.69685" />
       <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
          style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3094);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:112.62601471;marker:none;visibility:visible;display:inline;overflow:visible"
-         inkscape:connector-curvature="0" />
+         d="m -219.61876,-150.68038 c 0,0 0,478.33079 0,478.33079 142.874166,0.90045 345.40022,-107.16966 345.40014,-239.196175 0,-132.026537 -159.436816,-239.134595 -345.40014,-239.134615 z"
+         id="path5058" />
       <path
-         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3096);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:112.62601471;marker:none;visibility:visible;display:inline;overflow:visible"
-         d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
          id="path5018"
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0" />
+         d="m -1559.2523,-150.68038 c 0,0 0,478.33079 0,478.33079 -142.8742,0.90045 -345.4002,-107.16966 -345.4002,-239.196175 0,-132.026537 159.4368,-239.134595 345.4002,-239.134615 z"
+         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient3096);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:112.62601471;marker:none;visibility:visible;display:inline;overflow:visible" />
     </g>
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 20,9 0,10 -17,0 0,14 17,0 0,10 18,-17 z"
        id="path3343"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 20,9 0,10 -17,0 0,14 17,0 0,10 18,-17 z"
+       style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 22.006611,13.642998 22,21 5,21 5,31 22,31 21.9934,38.357002 35,26 z"
        id="path3343-2"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 22.006611,13.642998 22,21 5,21 5,31 22,31 21.9934,38.357002 35,26 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <metadata
      id="metadata4251">
@@ -598,7 +482,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Drawing</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Edit.svg b/src/Mod/Draft/Resources/icons/Draft_Edit.svg
index 972457c64e..0065e39018 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Edit.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Edit.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,175 +6,111 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Edit.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
+       y2="609.50507"
        x2="302.85715"
-       y2="609.50507" />
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5027"
+       xlink:href="#linearGradient5048" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       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">
+         style="stop-color:black;stop-opacity:0;" />
       <stop
          style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
+         offset="0.5"
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5064" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
        r="117.14286"
@@ -184,314 +118,264 @@
        fx="605.71429"
        cy="486.64789"
        cx="605.71429"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient5392"
-       xlink:href="#linearGradient5060"
-       inkscape:collect="always" />
+       id="radialGradient5029"
+       xlink:href="#linearGradient5060" />
     <linearGradient
+       id="linearGradient5060">
+      <stop
+         id="stop5062"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop5064"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient5392"
        gradientUnits="userSpaceOnUse"
-       y2="1076.6174"
-       x2="3935.5251"
-       y1="1286.7291"
-       x1="3709.3296"
-       id="linearGradient3847-7-5"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
        xlink:href="#linearGradient3841-0-3"
-       inkscape:collect="always" />
+       id="linearGradient3847-7-5"
+       x1="3709.3296"
+       y1="1286.7291"
+       x2="3935.5251"
+       y2="1076.6174"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd2"
-       id="radialGradient2283"
-       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"
+       fy="114.5684"
+       fx="20.892099"
        cy="114.5684"
        cx="20.892099"
-       id="aigrd2">
-      <stop
-         id="stop15566"
-         style="stop-color:#F0F0F0"
-         offset="0" />
-      <stop
-         id="stop15568"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
-    </radialGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd3"
-       id="radialGradient2285"
-       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"
+       id="radialGradient2283"
+       xlink:href="#aigrd2" />
+    <radialGradient
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd3">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       r="38.158695"
-       fy="7.2678967"
-       fx="8.1435566"
-       cy="7.2678967"
-       cx="8.1435566"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
+       r="5.257"
+       fy="64.567902"
+       fx="20.892099"
+       cy="64.567902"
+       cx="20.892099"
+       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient15668"
+       id="radialGradient2285"
+       xlink:href="#aigrd3" />
+    <radialGradient
+       id="aigrd3"
+       cx="20.892099"
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop15573" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+         id="stop15575" />
+    </radialGradient>
+    <radialGradient
        xlink:href="#linearGradient15662"
-       inkscape:collect="always" />
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,8.6869921,-61.713721)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3972"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient3972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,8.6869921,-61.713721)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3974"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4095"
-       id="linearGradient4937"
+       id="radialGradient3974"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.10456791,0,0,0.10456791,368.43605,-33.490763)"
-       x1="901.1875"
-       y1="1190.875"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="1190.875"
        x2="1267.9062"
-       y2="1190.875" />
+       y1="1190.875"
+       x1="901.1875"
+       gradientTransform="matrix(0.10456791,0,0,0.10456791,368.43605,-33.490763)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4937"
+       xlink:href="#linearGradient4095" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.70714"
-     inkscape:cx="16.698048"
-     inkscape:cy="33.000002"
-     inkscape:current-layer="g4928"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3073"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4928"
-       transform="matrix(0.98259094,0,0,1,-503.91256,-68.006097)">
+       transform="matrix(0.98259094,0,0,1,-503.91256,-68.006097)"
+       id="g4928">
       <path
-         sodipodi:nodetypes="cccczccc"
-         id="path3278-8"
-         d="m 558.63793,72.006091 -28.49609,14 17.67548,8.133367 -15.64005,31.866642 c 0,0 16.45899,-5.20628 23.15126,-7.35286 6.69226,-2.14657 17.64574,-5.65995 17.64574,-5.65995 l -11.8693,-9.84899 z"
          style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
+         d="m 558.63793,72.006091 -28.49609,14 17.67548,8.133367 -15.64005,31.866642 c 0,0 16.45899,-5.20628 23.15126,-7.35286 6.69226,-2.14657 17.64574,-5.65995 17.64574,-5.65995 l -11.8693,-9.84899 z"
+         id="path3278-8" />
       <path
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc"
-         id="path3278-8-3"
+         style="fill:none;stroke:#729fcf;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 556.37119,75.778818 -20.49313,10.181819 14.84942,7.272727 -13.73918,28.636376 30.99413,-9.86364 -9.22606,-7.56104 z"
-         style="fill:none;stroke:#729fcf;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path3278-8-3" />
       <g
-         id="g3973"
-         transform="translate(73.275671,-13.000009)">
+         transform="translate(73.275671,-13.000009)"
+         id="g3973">
         <path
-           sodipodi:nodetypes="cccccc"
-           inkscape:connector-curvature="0"
-           id="path3969"
+           style="fill:#ffffff;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
            d="m 477.22051,113.0061 6.10631,16 -18.31892,-4 -2.03543,-4 10.17717,-10 z"
-           style="fill:#ffffff;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+           id="path3969" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path3843"
+           style="fill:#729fcf;stroke:none"
            d="m 456.86616,93.006094 -4.07087,4 20.35435,20.000006 c 0,-3 1.01772,-4 4.07087,-4 z"
-           style="fill:#729fcf;stroke:none" />
+           id="path3843" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path3843-7"
+           style="fill:#3465a4;stroke:none"
            d="m 452.79529,97.006087 -4.07087,4.000013 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
-           style="fill:#3465a4;stroke:none" />
+           id="path3843-7" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path3843-5"
+           style="fill:#204a87;stroke:none"
            d="m 448.72442,101.0061 -4.07087,4 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
-           style="fill:#204a87;stroke:none" />
+           id="path3843-5" />
         <path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
-           id="path3888"
+           style="fill:none;stroke:#3465a4;stroke-width:2.01763964;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
            d="m 447.70671,103.00609 18.31891,18.00001"
-           style="fill:none;stroke:#3465a4;stroke-width:2.01763964;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+           id="path3888" />
         <path
-           sodipodi:nodetypes="cc"
-           inkscape:connector-curvature="0"
-           id="path3888-5"
+           style="fill:none;stroke:#729fcf;stroke-width:2.01763964;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
            d="M 451.77757,99.006097 470.09649,117.0061"
-           style="fill:none;stroke:#729fcf;stroke-width:2.01763964;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+           id="path3888-5" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path3843-5-6"
+           style="fill:none;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
            d="m 456.86616,93.006097 -4.07087,4 20.35435,20.000003 c 0,-3 1.01772,-4 4.07087,-4 z"
-           style="fill:none;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+           id="path3843-5-6" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path3843-5-6-2"
+           style="fill:none;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
            d="m 452.79529,97.006097 -4.07087,4.000003 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
-           style="fill:none;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+           id="path3843-5-6-2" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path3843-5-6-9"
+           style="fill:none;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
            d="m 448.72442,101.0061 -4.07087,4 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
-           style="fill:none;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+           id="path3843-5-6-9" />
         <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           id="path3971"
+           style="fill:#0b1521;stroke:#0b1521;stroke-width:1.00881982px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
            d="m 479.25595,122.0061 c -1.01772,0 -3.63385,2.51623 -4.07087,5 l 8.14174,2 -3.05315,-7 -1.01772,0"
-           style="fill:#0b1521;stroke:#0b1521;stroke-width:1.00881982px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+           id="path3971" />
       </g>
     </g>
   </g>
@@ -503,7 +387,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Edit</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Ellipse.svg b/src/Mod/Draft/Resources/icons/Draft_Ellipse.svg
index f0b4b099ad..7432b647d8 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Ellipse.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Ellipse.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,239 +6,176 @@
    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"
+   version="1.1"
    id="svg2918"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Ellipse.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2920">
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3191"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3183"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <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="perspective2926" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3136"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
-       id="radialGradient3136-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3136-8"
+       xlink:href="#linearGradient3144-5" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-5">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-9"
          offset="0"
-         id="stop3146-9" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-0"
          offset="1"
-         id="stop3148-0" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3138-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3237"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3239"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3248"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9"
-       id="radialGradient3248-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3248-9"
+       xlink:href="#linearGradient3144-9" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-9">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-8"
          offset="0"
-         id="stop3146-8" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-5"
          offset="1"
-         id="stop3148-5" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3269"
        xlink:href="#linearGradient3144-9"
-       inkscape:collect="always" />
-    <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       id="radialGradient3269"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3269-2"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
        xlink:href="#linearGradient3144-9-4"
-       inkscape:collect="always" />
+       id="radialGradient3269-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-9-4">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-8-2"
          offset="0"
-         id="stop3146-8-2" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-5-3"
          offset="1"
-         id="stop3148-5-3" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
-       id="radialGradient3248-90"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-1">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-93" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
-       id="radialGradient3250-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
     <radialGradient
        r="34.345188"
        fy="672.79736"
@@ -249,25 +184,32 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3269-6"
-       xlink:href="#linearGradient3144-9-9"
-       inkscape:collect="always" />
+       id="radialGradient3248-90"
+       xlink:href="#linearGradient3144-1" />
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-9-9">
+       id="linearGradient3144-1">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-93"
          offset="0"
-         id="stop3146-8-7" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-9"
          offset="1"
-         id="stop3148-5-9" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-59"
-       id="radialGradient3248-4"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3250-4"
+       xlink:href="#linearGradient3144-1" />
+    <radialGradient
+       xlink:href="#linearGradient3144-9-9"
+       id="radialGradient3269-6"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        cx="225.26402"
@@ -276,232 +218,185 @@
        fy="672.79736"
        r="34.345188" />
     <linearGradient
-       inkscape:collect="always"
+       id="linearGradient3144-9-9">
+      <stop
+         id="stop3146-8-7"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3148-5-9"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3248-4"
+       xlink:href="#linearGradient3144-59" />
+    <linearGradient
        id="linearGradient3144-59">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-4"
          offset="0"
-         id="stop3146-4" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-55"
          offset="1"
-         id="stop3148-55" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3892"
-       id="linearGradient3898"
-       x1="37.429146"
-       y1="41.590584"
-       x2="24.483221"
+       gradientUnits="userSpaceOnUse"
        y2="4.9104676"
-       gradientUnits="userSpaceOnUse" />
+       x2="24.483221"
+       y1="41.590584"
+       x1="37.429146"
+       id="linearGradient3898"
+       xlink:href="#linearGradient3892" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3892">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3894"
          offset="0"
-         id="stop3894" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3896"
          offset="1"
-         id="stop3896" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3850"
-       id="linearGradient3856"
-       x1="22.84341"
-       y1="4.8241611"
-       x2="30.783579"
+       gradientUnits="userSpaceOnUse"
        y2="28.644661"
-       gradientUnits="userSpaceOnUse" />
+       x2="30.783579"
+       y1="4.8241611"
+       x1="22.84341"
+       id="linearGradient3856"
+       xlink:href="#linearGradient3850" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3850">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3852"
          offset="0"
-         id="stop3852" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3854"
          offset="1"
-         id="stop3854" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-7"
-       id="linearGradient3801-1-1"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-1"
+       xlink:href="#linearGradient3836-0-7" />
     <linearGradient
        id="linearGradient3836-0-7">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-4"
          offset="0"
-         id="stop3838-2-4" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-0"
          offset="1"
-         id="stop3840-5-0" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-7-6"
-       id="linearGradient3801-1-1-3"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-1-3"
+       xlink:href="#linearGradient3836-0-7-6" />
     <linearGradient
        id="linearGradient3836-0-7-6">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-4-7"
          offset="0"
-         id="stop3838-2-4-7" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-0-5"
          offset="1"
-         id="stop3840-5-0-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.4464322"
-     inkscape:cx="31.212857"
-     inkscape:cy="30.877134"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-page="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3088"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#2e3436;stroke-width:12.81330776;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(0.96724623,0,0,0.40301422,4.208025,20.455794)"
+       d="m 53.611551,28.644661 a 24.813021,24.813021 0 1 1 -49.6260411,0 24.813021,24.813021 0 1 1 49.6260411,0 z"
        id="path3044"
-       sodipodi:cx="28.798531"
-       sodipodi:cy="28.644661"
-       sodipodi:rx="24.813021"
-       sodipodi:ry="24.813021"
-       d="m 53.611551,28.644661 a 24.813021,24.813021 0 1 1 -49.6260411,0 24.813021,24.813021 0 1 1 49.6260411,0 z"
-       transform="matrix(0.96724623,0,0,0.40301422,4.208025,20.455794)" />
+       style="fill:none;stroke:#2e3436;stroke-width:12.81330776;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#d3d7cf;stroke-width:6.31971169;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(0.96724623,0,0,0.41417927,4.208025,20.100921)"
+       d="m 53.611551,28.644661 a 24.813021,24.813021 0 1 1 -49.6260411,0 24.813021,24.813021 0 1 1 49.6260411,0 z"
        id="path3044-2"
-       sodipodi:cx="28.798531"
-       sodipodi:cy="28.644661"
-       sodipodi:rx="24.813021"
-       sodipodi:ry="24.813021"
-       d="m 53.611551,28.644661 a 24.813021,24.813021 0 1 1 -49.6260411,0 24.813021,24.813021 0 1 1 49.6260411,0 z"
-       transform="matrix(0.96724623,0,0,0.41417927,4.208025,20.100921)" />
+       style="fill:none;stroke:#d3d7cf;stroke-width:6.31971169;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:url(#linearGradient3898);stroke-width:3.39930463;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       transform="matrix(0.92693272,0,0,0.37344923,5.368694,21.421215)"
+       d="m 53.611551,28.644661 a 24.813021,24.813021 0 1 1 -49.6260411,0 24.813021,24.813021 0 1 1 49.6260411,0 z"
        id="path3044-2-4-1"
-       sodipodi:cx="28.798531"
-       sodipodi:cy="28.644661"
-       sodipodi:rx="24.813021"
-       sodipodi:ry="24.813021"
-       d="m 53.611551,28.644661 a 24.813021,24.813021 0 1 1 -49.6260411,0 24.813021,24.813021 0 1 1 49.6260411,0 z"
-       transform="matrix(0.92693272,0,0,0.37344923,5.368694,21.421215)" />
+       style="fill:none;stroke:url(#linearGradient3898);stroke-width:3.39930463;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:url(#linearGradient3856);stroke-width:2.95652795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3044-2-4"
-       sodipodi:cx="28.798531"
-       sodipodi:cy="28.644661"
-       sodipodi:rx="24.813021"
-       sodipodi:ry="24.813021"
+       transform="matrix(1.0075355,0,0,0.45418796,3.047445,18.965414)"
        d="m 53.611551,28.644661 a 24.813021,24.813021 0 1 1 -49.6260411,0 24.813021,24.813021 0 1 1 49.6260411,0 z"
-       transform="matrix(1.0075355,0,0,0.45418796,3.047445,18.965414)" />
+       id="path3044-2-4"
+       style="fill:none;stroke:url(#linearGradient3856);stroke-width:2.95652795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <g
-       transform="translate(40.06872,-39.716536)"
-       id="g3827-1-9">
+       id="g3827-1-9"
+       transform="translate(40.06872,-39.716536)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9-4">
+         id="g3797-9-4"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71-8"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3-8"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
     <g
-       transform="translate(0.06872,0.283464)"
-       id="g3827-1-9-3">
+       id="g3827-1-9-3"
+       transform="translate(0.06872,0.283464)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9-4-5">
+         id="g3797-9-4-5"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71-8-6"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3-8-2"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
   </g>
@@ -513,7 +408,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Ellipse</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Apr 1 17:46:32 2013 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Facebinder.svg b/src/Mod/Draft/Resources/icons/Draft_Facebinder.svg
index 32ebcac54b..70a099538f 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Facebinder.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Facebinder.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,353 +6,311 @@
    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"
+   version="1.1"
    id="svg2766"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Facebinder.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2768">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3826">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop3828"
          offset="0"
-         id="stop3828" />
+         style="stop-color:#c4a000;stop-opacity:1" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop3830"
          offset="1"
-         id="stop3830" />
+         style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3787">
       <stop
-         id="stop3789"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3789" />
       <stop
-         id="stop3791"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3791" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864">
       <stop
-         id="stop3866"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866" />
       <stop
-         id="stop3868"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868" />
     </linearGradient>
-    <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="perspective2774" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3181"
-       gradientUnits="userSpaceOnUse"
-       x1="581.26331"
-       y1="126.79625"
-       x2="609.54919"
+       gradientTransform="matrix(1.0614931,0,0,1,-540.96941,-73.37642)"
        y2="100.10708"
-       gradientTransform="matrix(1.0614931,0,0,1,-540.96941,-73.37642)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3184"
+       x2="609.54919"
+       y1="126.79625"
+       x1="581.26331"
        gradientUnits="userSpaceOnUse"
+       id="linearGradient3181"
+       xlink:href="#linearGradient3864" />
+    <linearGradient
+       y2="92.711899"
+       x2="626.31323"
+       y1="92.711899"
+       x1="605.94659"
        gradientTransform="matrix(-0.72140579,0.77867919,-0.73356972,-0.67961421,545.35072,-389.46656)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3184"
+       xlink:href="#linearGradient3864" />
+    <linearGradient
+       id="linearGradient3864-0">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3866-6" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3868-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3864-0"
+       id="linearGradient3217"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0,0,1,-643.22843,-82.445766)"
        x1="605.94659"
        y1="92.711899"
        x2="626.31323"
        y2="92.711899" />
     <linearGradient
-       id="linearGradient3864-0">
+       y2="92.711899"
+       x2="626.31323"
+       y1="92.711899"
+       x1="605.94659"
+       gradientTransform="matrix(1.1915091,0,0,1,-772.13265,-84.532596)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3184-4-0"
+       xlink:href="#linearGradient3864-0-2" />
+    <linearGradient
+       id="linearGradient3864-0-2">
       <stop
-         id="stop3866-6"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-8" />
       <stop
-         id="stop3868-2"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-3" />
     </linearGradient>
     <linearGradient
        y2="92.711899"
        x2="626.31323"
        y1="92.711899"
        x1="605.94659"
-       gradientTransform="matrix(1.0614931,0,0,1,-643.22843,-82.445766)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3217"
-       xlink:href="#linearGradient3864-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2"
-       id="linearGradient3184-4-0"
-       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1915091,0,0,1,-772.13265,-84.532596)"
-       x1="605.94659"
-       y1="92.711899"
-       x2="626.31323"
-       y2="92.711899" />
-    <linearGradient
-       id="linearGradient3864-0-2">
-      <stop
-         id="stop3866-6-8"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3868-2-3"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-9"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3184-4-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1915091,0,0,1,-772.13265,-84.532596)"
-       x1="605.94659"
-       y1="92.711899"
-       x2="626.31323"
-       y2="92.711899" />
+       xlink:href="#linearGradient3864-0-9" />
     <linearGradient
        id="linearGradient3864-0-9">
       <stop
-         id="stop3866-6-9"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9" />
       <stop
-         id="stop3868-2-4"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.50621,0.51036428,0,0.942977,-982.97489,-425.42821)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4054"
        xlink:href="#linearGradient3864-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0"
-       id="linearGradient4073"
+       id="linearGradient4054"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.50621,0.51036428,0,0.942977,-982.95267,-404.71823)"
-       x1="663.32715"
-       y1="114.56509"
-       x2="709.04407"
-       y2="48.117603" />
-    <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
+       gradientTransform="matrix(1.50621,0.51036428,0,0.942977,-982.97489,-425.42821)"
        x1="634.20868"
-       gradientTransform="matrix(1.0614931,0.54122665,0,1,-692.52246,-451.18305)"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
+    <linearGradient
+       y2="48.117603"
+       x2="709.04407"
+       y1="114.56509"
+       x1="663.32715"
+       gradientTransform="matrix(1.50621,0.51036428,0,0.942977,-982.95267,-404.71823)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4054-6"
+       id="linearGradient4073"
+       xlink:href="#linearGradient3864-0" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-9-5"
-       inkscape:collect="always" />
+       id="linearGradient4054-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0.54122665,0,1,-692.52246,-451.18305)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
     <linearGradient
        id="linearGradient3864-0-9-5">
       <stop
-         id="stop3866-6-9-0"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9-0" />
       <stop
-         id="stop3868-2-4-0"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4-0" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4090"
        xlink:href="#linearGradient3864-0-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
+       id="linearGradient4090"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4090-6"
+       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-9-5-0"
-       inkscape:collect="always" />
+       id="linearGradient4090-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
     <linearGradient
        id="linearGradient3864-0-9-5-0">
       <stop
-         id="stop3866-6-9-0-2"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9-0-2" />
       <stop
-         id="stop3868-2-4-0-5"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4-0-5" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(0.80817481,0.4120665,0,0.76135663,-517.34974,-304.44262)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4124"
        xlink:href="#linearGradient3864-0-9-5-0"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.5385683,-0.86055196,0,0.96535888,-879.38043,517.26249)"
+       id="linearGradient4124"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4018-2"
+       gradientTransform="matrix(0.80817481,0.4120665,0,0.76135663,-517.34974,-304.44262)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-2-2"
-       inkscape:collect="always" />
+       id="linearGradient4018-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5385683,-0.86055196,0,0.96535888,-879.38043,517.26249)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
        id="linearGradient3864-0-2-2">
       <stop
-         id="stop3866-6-8-9"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-8-9" />
       <stop
-         id="stop3868-2-3-2"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-3-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-1"
-       id="linearGradient4073-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7401,-396.04414)"
-       x1="663.32715"
-       y1="114.56509"
+       y2="48.117603"
        x2="709.04407"
-       y2="48.117603" />
+       y1="114.56509"
+       x1="663.32715"
+       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7401,-396.04414)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4073-8"
+       xlink:href="#linearGradient3864-0-1" />
     <linearGradient
        id="linearGradient3864-0-1">
       <stop
-         id="stop3866-6-2"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-2" />
       <stop
-         id="stop3868-2-47"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-47" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7628,-417.24568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4054-8"
        xlink:href="#linearGradient3864-0-9-6"
-       inkscape:collect="always" />
+       id="linearGradient4054-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7628,-417.24568)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
     <linearGradient
        id="linearGradient3864-0-9-6">
       <stop
-         id="stop3866-6-9-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9-3" />
       <stop
-         id="stop3868-2-4-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4-7" />
     </linearGradient>
     <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.30911,495.89863)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4018-22"
        xlink:href="#linearGradient3864-0-2-3"
-       inkscape:collect="always" />
+       id="linearGradient4018-22"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.30911,495.89863)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
        id="linearGradient3864-0-2-3">
       <stop
-         id="stop3866-6-8-3"
+         style="stop-color:#ff8200;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ff8200;stop-opacity:1;" />
+         id="stop3866-6-8-3" />
       <stop
-         id="stop3868-2-3-1"
+         style="stop-color:#fbd037;stop-opacity:1;"
          offset="1"
-         style="stop-color:#fbd037;stop-opacity:1;" />
+         id="stop3868-2-3-1" />
     </linearGradient>
     <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-971.2358,510.10736)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3707"
        xlink:href="#linearGradient3864-0-2-3"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.30911,495.89863)"
+       id="linearGradient3707"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4018-5"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-971.2358,510.10736)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-2-7"
-       inkscape:collect="always" />
+       id="linearGradient4018-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.30911,495.89863)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
        id="linearGradient3864-0-2-7">
       <stop
-         id="stop3866-6-8-0"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-8-0" />
       <stop
-         id="stop3868-2-3-5"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-3-5" />
     </linearGradient>
     <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.42277,465.75247)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3864-0-2-7"
        id="linearGradient3741"
-       xlink:href="#linearGradient3864-0-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2-7"
-       id="linearGradient3768"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.42277,465.75247)"
        x1="635.40765"
@@ -366,174 +322,130 @@
        x2="672.73157"
        y1="100.79263"
        x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.67275,496.44408)"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.42277,465.75247)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4018-55"
+       id="linearGradient3768"
+       xlink:href="#linearGradient3864-0-2-7" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-2-1"
-       inkscape:collect="always" />
+       id="linearGradient4018-55"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.67275,496.44408)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
        id="linearGradient3864-0-2-1">
       <stop
-         id="stop3866-6-8-1"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-8-1" />
       <stop
-         id="stop3868-2-3-57"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2-3-8"
-       id="linearGradient3771-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-951.58818,516.66137)"
-       x1="635.40765"
-       y1="100.79263"
-       x2="672.73157"
-       y2="100.2725" />
-    <linearGradient
-       id="linearGradient3864-0-2-3-8">
-      <stop
-         id="stop3866-6-8-3-1"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3868-2-3-1-5"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2-7-5"
-       id="linearGradient3773-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-926.77515,472.30648)"
-       x1="635.40765"
-       y1="100.79263"
-       x2="672.73157"
-       y2="100.2725" />
-    <linearGradient
-       id="linearGradient3864-0-2-7-5">
-      <stop
-         id="stop3866-6-8-0-2"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3868-2-3-5-1"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-3-57" />
     </linearGradient>
     <linearGradient
        y2="100.2725"
        x2="672.73157"
        y1="100.79263"
        x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-926.66149,502.45264)"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-951.58818,516.66137)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3800"
+       id="linearGradient3771-9"
+       xlink:href="#linearGradient3864-0-2-3-8" />
+    <linearGradient
+       id="linearGradient3864-0-2-3-8">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3866-6-8-3-1" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3868-2-3-1-5" />
+    </linearGradient>
+    <linearGradient
+       y2="100.2725"
+       x2="672.73157"
+       y1="100.79263"
+       x1="635.40765"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-926.77515,472.30648)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3773-7"
+       xlink:href="#linearGradient3864-0-2-7-5" />
+    <linearGradient
+       id="linearGradient3864-0-2-7-5">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3866-6-8-0-2" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3868-2-3-5-1" />
+    </linearGradient>
+    <linearGradient
        xlink:href="#linearGradient3864-0-2-1"
-       inkscape:collect="always" />
+       id="linearGradient3800"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-926.66149,502.45264)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3826"
-       id="linearGradient3832"
-       x1="26.03454"
-       y1="58.604141"
-       x2="16.614164"
+       gradientUnits="userSpaceOnUse"
        y2="18.186876"
-       gradientUnits="userSpaceOnUse" />
+       x2="16.614164"
+       y1="58.604141"
+       x1="26.03454"
+       id="linearGradient3832"
+       xlink:href="#linearGradient3826" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3826"
-       id="linearGradient3840"
-       x1="46.791019"
-       y1="16.110708"
-       x2="41.987568"
+       gradientUnits="userSpaceOnUse"
        y2="4.7310886"
-       gradientUnits="userSpaceOnUse" />
+       x2="41.987568"
+       y1="16.110708"
+       x1="46.791019"
+       id="linearGradient3840"
+       xlink:href="#linearGradient3826" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3826"
-       id="linearGradient3848"
-       x1="49.734024"
-       y1="48.417618"
-       x2="44.576797"
+       gradientUnits="userSpaceOnUse"
        y2="31.838688"
-       gradientUnits="userSpaceOnUse" />
+       x2="44.576797"
+       y1="48.417618"
+       x1="49.734024"
+       id="linearGradient3848"
+       xlink:href="#linearGradient3826" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.4464327"
-     inkscape:cx="5.8569591"
-     inkscape:cy="31.073534"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3058"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="color:#000000;fill:url(#linearGradient3848);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 37,35 61,23 61.038627,41.276196 37,55 z"
        id="rect3200-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 37,35 61,23 61.038627,41.276196 37,55 z"
+       style="color:#000000;fill:url(#linearGradient3848);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:url(#linearGradient3840);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 41,3 37,5 37,20 61,7 61,3 z"
        id="rect3200-8-99"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 41,3 37,5 37,20 61,7 61,3 z"
+       style="color:#000000;fill:url(#linearGradient3840);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:url(#linearGradient3832);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 37,5 3,23 3,61 27,61 37,55 z"
        id="rect3200-8-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 37,5 3,23 3,61 27,61 37,55 z"
+       style="color:#000000;fill:url(#linearGradient3832);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:none;stroke:#fce94f;stroke-width:2;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"
-       d="M 35.024525,8.3433506 5,24.245707 5,59 l 21.421721,0 8.553754,-5.120934 z"
        id="rect3200-8-9-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 35.024525,8.3433506 5,24.245707 5,59 l 21.421721,0 8.553754,-5.120934 z"
+       style="color:#000000;fill:none;stroke:#fce94f;stroke-width:2;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
-       style="color:#000000;fill:none;stroke:#fce94f;stroke-width:2;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"
-       d="M 41.500925,4.9999999 38.991329,6.2383464 39.034684,16.61848 58.982658,5.8092399 59,4.9999999 z"
        id="rect3200-8-99-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 41.500925,4.9999999 38.991329,6.2383464 39.034684,16.61848 58.982658,5.8092399 59,4.9999999 z"
+       style="color:#000000;fill:none;stroke:#fce94f;stroke-width:2;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
-       style="color:#000000;fill:none;stroke:#fce94f;stroke-width:2;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"
-       d="M 39,36.277469 59.017342,26.208102 59.032192,40.278278 39.052025,51.537597 z"
        id="rect3200-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 39,36.277469 59.017342,26.208102 59.032192,40.278278 39.052025,51.537597 z"
+       style="color:#000000;fill:none;stroke:#fce94f;stroke-width:2;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>
   <metadata
      id="metadata4502">
@@ -543,7 +455,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Facebinder</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Thu Oct 10 19:25:33 2013 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Facebinder_Provider.svg b/src/Mod/Draft/Resources/icons/Draft_Facebinder_Provider.svg
index b2ad2e7d0c..68f79087e8 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Facebinder_Provider.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Facebinder_Provider.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,341 +6,300 @@
    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"
+   version="1.1"
    id="svg2766"
-   sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Draft_Facebinder_Provider.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2768">
     <linearGradient
        id="linearGradient3787">
       <stop
-         id="stop3789"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3789" />
       <stop
-         id="stop3791"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3791" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864">
       <stop
-         id="stop3866"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866" />
       <stop
-         id="stop3868"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868" />
     </linearGradient>
-    <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="perspective2774" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3181"
-       gradientUnits="userSpaceOnUse"
-       x1="581.26331"
-       y1="126.79625"
-       x2="609.54919"
+       gradientTransform="matrix(1.0614931,0,0,1,-540.96941,-73.37642)"
        y2="100.10708"
-       gradientTransform="matrix(1.0614931,0,0,1,-540.96941,-73.37642)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3184"
+       x2="609.54919"
+       y1="126.79625"
+       x1="581.26331"
        gradientUnits="userSpaceOnUse"
+       id="linearGradient3181"
+       xlink:href="#linearGradient3864" />
+    <linearGradient
+       y2="92.711899"
+       x2="626.31323"
+       y1="92.711899"
+       x1="605.94659"
        gradientTransform="matrix(-0.72140579,0.77867919,-0.73356972,-0.67961421,545.35072,-389.46656)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3184"
+       xlink:href="#linearGradient3864" />
+    <linearGradient
+       id="linearGradient3864-0">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3866-6" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3868-2" />
+    </linearGradient>
+    <linearGradient
+       xlink:href="#linearGradient3864-0"
+       id="linearGradient3217"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0,0,1,-643.22843,-82.445766)"
        x1="605.94659"
        y1="92.711899"
        x2="626.31323"
        y2="92.711899" />
     <linearGradient
-       id="linearGradient3864-0">
+       y2="92.711899"
+       x2="626.31323"
+       y1="92.711899"
+       x1="605.94659"
+       gradientTransform="matrix(1.1915091,0,0,1,-772.13265,-84.532596)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3184-4-0"
+       xlink:href="#linearGradient3864-0-2" />
+    <linearGradient
+       id="linearGradient3864-0-2">
       <stop
-         id="stop3866-6"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-8" />
       <stop
-         id="stop3868-2"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-3" />
     </linearGradient>
     <linearGradient
        y2="92.711899"
        x2="626.31323"
        y1="92.711899"
        x1="605.94659"
-       gradientTransform="matrix(1.0614931,0,0,1,-643.22843,-82.445766)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3217"
-       xlink:href="#linearGradient3864-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2"
-       id="linearGradient3184-4-0"
-       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.1915091,0,0,1,-772.13265,-84.532596)"
-       x1="605.94659"
-       y1="92.711899"
-       x2="626.31323"
-       y2="92.711899" />
-    <linearGradient
-       id="linearGradient3864-0-2">
-      <stop
-         id="stop3866-6-8"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3868-2-3"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-9"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3184-4-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1915091,0,0,1,-772.13265,-84.532596)"
-       x1="605.94659"
-       y1="92.711899"
-       x2="626.31323"
-       y2="92.711899" />
+       xlink:href="#linearGradient3864-0-9" />
     <linearGradient
        id="linearGradient3864-0-9">
       <stop
-         id="stop3866-6-9"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9" />
       <stop
-         id="stop3868-2-4"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.50621,0.51036428,0,0.942977,-982.97489,-425.42821)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4054"
        xlink:href="#linearGradient3864-0-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0"
-       id="linearGradient4073"
+       id="linearGradient4054"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.50621,0.51036428,0,0.942977,-982.95267,-404.71823)"
-       x1="663.32715"
-       y1="114.56509"
-       x2="709.04407"
-       y2="48.117603" />
-    <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
+       gradientTransform="matrix(1.50621,0.51036428,0,0.942977,-982.97489,-425.42821)"
        x1="634.20868"
-       gradientTransform="matrix(1.0614931,0.54122665,0,1,-692.52246,-451.18305)"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
+    <linearGradient
+       y2="48.117603"
+       x2="709.04407"
+       y1="114.56509"
+       x1="663.32715"
+       gradientTransform="matrix(1.50621,0.51036428,0,0.942977,-982.95267,-404.71823)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4054-6"
+       id="linearGradient4073"
+       xlink:href="#linearGradient3864-0" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-9-5"
-       inkscape:collect="always" />
+       id="linearGradient4054-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0.54122665,0,1,-692.52246,-451.18305)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
     <linearGradient
        id="linearGradient3864-0-9-5">
       <stop
-         id="stop3866-6-9-0"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9-0" />
       <stop
-         id="stop3868-2-4-0"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4-0" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4090"
        xlink:href="#linearGradient3864-0-9-5"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
+       id="linearGradient4090"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4090-6"
+       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-9-5-0"
-       inkscape:collect="always" />
+       id="linearGradient4090-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0.54122665,0,1,-687.73118,-415.49631)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
     <linearGradient
        id="linearGradient3864-0-9-5-0">
       <stop
-         id="stop3866-6-9-0-2"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9-0-2" />
       <stop
-         id="stop3868-2-4-0-5"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4-0-5" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(0.80817481,0.4120665,0,0.76135663,-517.34974,-304.44262)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4124"
        xlink:href="#linearGradient3864-0-9-5-0"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.5385683,-0.86055196,0,0.96535888,-879.38043,517.26249)"
+       id="linearGradient4124"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4018-2"
+       gradientTransform="matrix(0.80817481,0.4120665,0,0.76135663,-517.34974,-304.44262)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-2-2"
-       inkscape:collect="always" />
+       id="linearGradient4018-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5385683,-0.86055196,0,0.96535888,-879.38043,517.26249)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
        id="linearGradient3864-0-2-2">
       <stop
-         id="stop3866-6-8-9"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-8-9" />
       <stop
-         id="stop3868-2-3-2"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-3-2" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-1"
-       id="linearGradient4073-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7401,-396.04414)"
-       x1="663.32715"
-       y1="114.56509"
+       y2="48.117603"
        x2="709.04407"
-       y2="48.117603" />
+       y1="114.56509"
+       x1="663.32715"
+       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7401,-396.04414)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4073-8"
+       xlink:href="#linearGradient3864-0-1" />
     <linearGradient
        id="linearGradient3864-0-1">
       <stop
-         id="stop3866-6-2"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-2" />
       <stop
-         id="stop3868-2-47"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-47" />
     </linearGradient>
     <linearGradient
-       y2="102.88628"
-       x2="679.06909"
-       y1="91.597527"
-       x1="634.20868"
-       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7628,-417.24568)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4054-8"
        xlink:href="#linearGradient3864-0-9-6"
-       inkscape:collect="always" />
+       id="linearGradient4054-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5385683,0.52247795,0,0.96535888,-912.7628,-417.24568)"
+       x1="634.20868"
+       y1="91.597527"
+       x2="679.06909"
+       y2="102.88628" />
     <linearGradient
        id="linearGradient3864-0-9-6">
       <stop
-         id="stop3866-6-9-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-9-3" />
       <stop
-         id="stop3868-2-4-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-4-7" />
     </linearGradient>
     <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.30911,495.89863)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4018-22"
        xlink:href="#linearGradient3864-0-2-3"
-       inkscape:collect="always" />
+       id="linearGradient4018-22"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.30911,495.89863)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
        id="linearGradient3864-0-2-3">
       <stop
-         id="stop3866-6-8-3"
+         style="stop-color:#ff8200;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ff8200;stop-opacity:1;" />
+         id="stop3866-6-8-3" />
       <stop
-         id="stop3868-2-3-1"
+         style="stop-color:#fbd037;stop-opacity:1;"
          offset="1"
-         style="stop-color:#fbd037;stop-opacity:1;" />
+         id="stop3868-2-3-1" />
     </linearGradient>
     <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-971.2358,510.10736)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3707"
        xlink:href="#linearGradient3864-0-2-3"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.30911,495.89863)"
+       id="linearGradient3707"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4018-5"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-971.2358,510.10736)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-2-7"
-       inkscape:collect="always" />
+       id="linearGradient4018-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.30911,495.89863)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
        id="linearGradient3864-0-2-7">
       <stop
-         id="stop3866-6-8-0"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-8-0" />
       <stop
-         id="stop3868-2-3-5"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-3-5" />
     </linearGradient>
     <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.42277,465.75247)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3864-0-2-7"
        id="linearGradient3741"
-       xlink:href="#linearGradient3864-0-2-7"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2-7"
-       id="linearGradient3768"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.42277,465.75247)"
        x1="635.40765"
@@ -354,185 +311,141 @@
        x2="672.73157"
        y1="100.79263"
        x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.67275,496.44408)"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.42277,465.75247)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient4018-55"
+       id="linearGradient3768"
+       xlink:href="#linearGradient3864-0-2-7" />
+    <linearGradient
        xlink:href="#linearGradient3864-0-2-1"
-       inkscape:collect="always" />
+       id="linearGradient4018-55"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-946.67275,496.44408)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
        id="linearGradient3864-0-2-1">
       <stop
-         id="stop3866-6-8-1"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-6-8-1" />
       <stop
-         id="stop3868-2-3-57"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2-3-8"
-       id="linearGradient3771-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-951.58818,516.66137)"
-       x1="635.40765"
-       y1="100.79263"
-       x2="672.73157"
-       y2="100.2725" />
-    <linearGradient
-       id="linearGradient3864-0-2-3-8">
-      <stop
-         id="stop3866-6-8-3-1"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3868-2-3-1-5"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2-7-5"
-       id="linearGradient3773-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-926.77515,472.30648)"
-       x1="635.40765"
-       y1="100.79263"
-       x2="672.73157"
-       y2="100.2725" />
-    <linearGradient
-       id="linearGradient3864-0-2-7-5">
-      <stop
-         id="stop3866-6-8-0-2"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3868-2-3-5-1"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-2-3-57" />
     </linearGradient>
     <linearGradient
        y2="100.2725"
        x2="672.73157"
        y1="100.79263"
        x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-926.66149,502.45264)"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-951.58818,516.66137)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3800"
+       id="linearGradient3771-9"
+       xlink:href="#linearGradient3864-0-2-3-8" />
+    <linearGradient
+       id="linearGradient3864-0-2-3-8">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3866-6-8-3-1" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3868-2-3-1-5" />
+    </linearGradient>
+    <linearGradient
+       y2="100.2725"
+       x2="672.73157"
+       y1="100.79263"
+       x1="635.40765"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-926.77515,472.30648)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3773-7"
+       xlink:href="#linearGradient3864-0-2-7-5" />
+    <linearGradient
+       id="linearGradient3864-0-2-7-5">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3866-6-8-0-2" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3868-2-3-5-1" />
+    </linearGradient>
+    <linearGradient
        xlink:href="#linearGradient3864-0-2-1"
-       inkscape:collect="always" />
+       id="linearGradient3800"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-926.66149,502.45264)"
+       x1="635.40765"
+       y1="100.79263"
+       x2="672.73157"
+       y2="100.2725" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3832"
-       x1="26.03454"
-       y1="58.604141"
-       x2="16.614164"
+       gradientUnits="userSpaceOnUse"
        y2="18.186876"
-       gradientUnits="userSpaceOnUse" />
+       x2="16.614164"
+       y1="58.604141"
+       x1="26.03454"
+       id="linearGradient3832"
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3840"
-       x1="46.791019"
-       y1="16.110708"
-       x2="41.987568"
+       gradientUnits="userSpaceOnUse"
        y2="4.7310886"
-       gradientUnits="userSpaceOnUse" />
+       x2="41.987568"
+       y1="16.110708"
+       x1="46.791019"
+       id="linearGradient3840"
+       xlink:href="#linearGradient3836" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3848"
-       x1="49.734024"
-       y1="48.417618"
-       x2="44.576797"
+       gradientUnits="userSpaceOnUse"
        y2="31.838688"
-       gradientUnits="userSpaceOnUse" />
+       x2="44.576797"
+       y1="48.417618"
+       x1="49.734024"
+       id="linearGradient3848"
+       xlink:href="#linearGradient3836" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.82"
-     inkscape:cx="7.5873859"
-     inkscape:cy="31.073534"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3058"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="color:#000000;fill:url(#linearGradient3848);fill-opacity:1.0;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 37,35 61,23 61.038627,41.276196 37,55 z"
        id="rect3200-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 37,35 61,23 61.038627,41.276196 37,55 z"
+       style="color:#000000;fill:url(#linearGradient3848);fill-opacity:1.0;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:url(#linearGradient3840);fill-opacity:1.0;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 41,3 37,5 37,20 61,7 61,3 z"
        id="rect3200-8-99"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 41,3 37,5 37,20 61,7 61,3 z"
+       style="color:#000000;fill:url(#linearGradient3840);fill-opacity:1.0;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:url(#linearGradient3832);fill-opacity:1.0;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 37,5 3,23 3,61 27,61 37,55 z"
        id="rect3200-8-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 37,5 3,23 3,61 27,61 37,55 z"
+       style="color:#000000;fill:url(#linearGradient3832);fill-opacity:1.0;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:2;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"
-       d="M 35.024525,8.3433506 5,24.245707 5,59 l 21.421721,0 8.553754,-5.120934 z"
        id="rect3200-8-9-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 35.024525,8.3433506 5,24.245707 5,59 l 21.421721,0 8.553754,-5.120934 z"
+       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:2;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
-       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:2;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"
-       d="M 41.500925,4.9999999 38.991329,6.2383464 39.034684,16.61848 58.982658,5.8092399 59,4.9999999 z"
        id="rect3200-8-99-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 41.500925,4.9999999 38.991329,6.2383464 39.034684,16.61848 58.982658,5.8092399 59,4.9999999 z"
+       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:2;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
-       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:2;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"
-       d="M 39,36.277469 59.017342,26.208102 59.032192,40.278278 39.052025,51.537597 z"
        id="rect3200-8-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 39,36.277469 59.017342,26.208102 59.032192,40.278278 39.052025,51.537597 z"
+       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:2;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>
   <metadata
      id="metadata4502">
@@ -542,7 +455,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Facebinder</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Thu Oct 10 19:25:33 2013 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Fillet.svg b/src/Mod/Draft/Resources/icons/Draft_Fillet.svg
index fbb93dbe33..73938fa5fa 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Fillet.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Fillet.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,299 +6,216 @@
    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"
+   version="1.1"
    id="svg2869"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="Draft_Fillet.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
+  <title
+     id="title872">Draft_Fillet</title>
   <defs
      id="defs2871">
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2368"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <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="perspective2877" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3649"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3653"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3675"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <inkscape:perspective
-       id="perspective3685"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3718"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <inkscape:perspective
-       id="perspective3728"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3718-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3718-3"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-2"
          offset="0"
-         id="stop3146-2" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-3"
          offset="1"
-         id="stop3148-3" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3675-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-6" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3649-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-7"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
-       x2="-22"
+       id="radialGradient3649-7"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       gradientTransform="translate(-90,-5.9999999)"
        y2="5"
-       gradientTransform="translate(-90,-5.9999999)" />
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-7"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-9">
       <stop
-         style="stop-color:#a40000;stop-opacity:1"
+         id="stop3838-8"
          offset="0"
-         id="stop3838-8" />
+         style="stop-color:#a40000;stop-opacity:1" />
       <stop
-         style="stop-color:#ef2929;stop-opacity:1"
+         id="stop3840-1"
          offset="1"
-         id="stop3840-1" />
+         style="stop-color:#ef2929;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3082"
        xlink:href="#linearGradient3836-9-3"
-       inkscape:collect="always" />
+       id="linearGradient3082"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
     <linearGradient
        id="linearGradient3836-9-3">
       <stop
-         style="stop-color:#a40000;stop-opacity:1"
+         id="stop3838-8-5"
          offset="0"
-         id="stop3838-8-5" />
+         style="stop-color:#a40000;stop-opacity:1" />
       <stop
-         style="stop-color:#ef2929;stop-opacity:1"
+         id="stop3840-1-6"
          offset="1"
-         id="stop3840-1-6" />
+         style="stop-color:#ef2929;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3082-3"
        xlink:href="#linearGradient3836-0"
-       inkscape:collect="always" />
+       id="linearGradient3082-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
     <linearGradient
        id="linearGradient3836-9-7">
       <stop
-         style="stop-color:#a40000;stop-opacity:1"
+         id="stop3838-8-0"
          offset="0"
-         id="stop3838-8-0" />
+         style="stop-color:#a40000;stop-opacity:1" />
       <stop
-         style="stop-color:#ef2929;stop-opacity:1"
+         id="stop3840-1-9"
          offset="1"
-         id="stop3840-1-9" />
+         style="stop-color:#ef2929;stop-opacity:1" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective2734"
-       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" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         id="stop3838-2"
+         style="stop-color:#c4a000;stop-opacity:1;"
          offset="0"
-         style="stop-color:#c4a000;stop-opacity:1;" />
+         id="stop3838-2" />
       <stop
-         id="stop3840-5"
+         style="stop-color:#fce94f;stop-opacity:1;"
          offset="1"
-         style="stop-color:#fce94f;stop-opacity:1;" />
+         id="stop3840-5" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective2734-7"
-       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" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.0000002"
-     inkscape:cx="-8.3033732"
-     inkscape:cy="22.262373"
-     inkscape:current-layer="g2337"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1853"
-     inkscape:window-height="1025"
-     inkscape:window-x="1433"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3018"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -309,21 +224,21 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title>Draft_Fillet</dc:title>
         <dc:creator>
           <cc:Agent>
-            <dc:title>[wmayer]</dc:title>
+            <dc:title>[vocx]</dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:title>Sketcher_CreateFillet</dc:title>
-        <dc:date>2011-10-10</dc:date>
+        <dc:date>2019-08-21 01:17:00 CDT</dc:date>
         <dc:relation>http://www.freecadweb.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/Sketcher/Gui/Resources/icons/Sketcher_Create</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Draft_Fillet</dc:identifier>
         <dc:rights>
           <cc:Agent>
             <dc:title>FreeCAD LGPL2+</dc:title>
@@ -332,151 +247,138 @@
         <cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license>
         <dc:contributor>
           <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
+            <dc:title>[agryson] Alexander Gryson, [wmayer]</dc:title>
           </cc:Agent>
         </dc:contributor>
+        <dc:description>A circular arc passing through two vertices. Extending from the vertices two dashed intersect each other at a right angle.</dc:description>
+        <dc:subject>
+          <rdf:Bag>
+            <rdf:li>arc</rdf:li>
+            <rdf:li>vertices</rdf:li>
+            <rdf:li>fillet</rdf:li>
+          </rdf:Bag>
+        </dc:subject>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3401"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
-       inkscape:export-xdpi="6.7480335"
-       inkscape:export-ydpi="6.7480335"
-       transform="matrix(0.146567,0,0,0.146567,70.402359,-55.12963)">
+       transform="matrix(0.146567,0,0,0.146567,70.402359,-55.12963)"
+       id="g3401">
       <g
-         inkscape:export-ydpi="7.0721951"
-         inkscape:export-xdpi="7.0721951"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-         transform="matrix(-0.87233598,0.22142698,-0.22142698,-0.87233598,136.46852,1240.9273)"
+         style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
          id="g2337"
-         style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none">
+         transform="matrix(-0.87233598,0.22142698,-0.22142698,-0.87233598,136.46852,1240.9273)">
         <g
-           id="g3401-3"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
-           inkscape:export-xdpi="6.7480335"
-           inkscape:export-ydpi="6.7480335"
-           transform="matrix(1.076958,0.27336665,-0.27336665,1.076958,916.44055,166.86771)">
+           transform="matrix(1.076958,0.27336665,-0.27336665,1.076958,916.44055,166.86771)"
+           id="g3401-3">
           <g
              id="g3389-6">
             <rect
-               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.6456356;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-               id="rect3083-62"
-               width="27.291325"
-               height="54.582546"
-               x="-574.18408"
+               transform="matrix(0,-1,1,0,0,0)"
                y="-485.672"
-               transform="matrix(0,-1,1,0,0,0)" />
-            <rect
-               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-               id="rect3083-6"
-               width="40.936913"
+               x="-574.18408"
                height="54.582546"
-               x="280.98743"
+               width="27.291325"
+               id="rect3083-62"
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.6456356;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" />
+            <rect
+               transform="scale(-1,-1)"
                y="-751.57739"
-               transform="scale(-1,-1)" />
-            <path
-               style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 61,55 0,-6 -9.999941,0.0205 C 30.215744,48.890477 15.000119,34.82717 15.000119,15.040998 15.000119,15.018288 15,3.0000006 15,3.0000006 l -5.9999999,0 c 0,0 0,11.8580004 0,12.0000004 C 9,37.306655 27.653134,54.999999 51,55 l 0,0 z"
-               id="path3077"
-               inkscape:connector-curvature="0"
-               transform="matrix(-6.8228185,4.776128e-8,-4.776128e-8,-6.8228185,-219.58206,922.14785)"
-               sodipodi:nodetypes="cccsccsccc" />
-            <path
-               style="fill:none;stroke:#ffffff;stroke-width:13.64563656;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m -560.72297,574.18408 c 150.102,0 252.44428,115.98792 252.44428,238.79865"
-               id="path3892"
-               inkscape:connector-curvature="0"
-               sodipodi:nodetypes="cc" />
-            <path
-               style="fill:none;stroke:#ffffff;stroke-width:1.99999999000000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="m 11,4 0,12"
-               id="path3079"
-               inkscape:connector-curvature="0"
-               transform="matrix(-6.8228185,4.776128e-8,-4.776128e-8,-6.8228185,-219.58206,922.14785)" />
-            <path
-               style="fill:none;stroke:#ffffff;stroke-width:1.99999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-               d="M 60,51 49,51"
-               id="path3081"
-               inkscape:connector-curvature="0"
-               transform="matrix(-6.8228185,4.776128e-8,-4.776128e-8,-6.8228185,-219.58206,922.14785)" />
-            <rect
-               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563751;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-               id="rect3083"
-               width="27.291277"
-               height="54.582546"
                x="280.98743"
+               height="54.582546"
+               width="40.936913"
+               id="rect3083-6"
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" />
+            <path
+               transform="matrix(-6.8228185,4.776128e-8,-4.776128e-8,-6.8228185,-219.58206,922.14785)"
+               id="path3077"
+               d="m 61,55 0,-6 -9.999941,0.0205 C 30.215744,48.890477 15.000119,34.82717 15.000119,15.040998 15.000119,15.018288 15,3.0000006 15,3.0000006 l -5.9999999,0 c 0,0 0,11.8580004 0,12.0000004 C 9,37.306655 27.653134,54.999999 51,55 l 0,0 z"
+               style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+            <path
+               id="path3892"
+               d="m -560.72297,574.18408 c 150.102,0 252.44428,115.98792 252.44428,238.79865"
+               style="fill:none;stroke:#ffffff;stroke-width:13.64563656;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+            <path
+               transform="matrix(-6.8228185,4.776128e-8,-4.776128e-8,-6.8228185,-219.58206,922.14785)"
+               id="path3079"
+               d="m 11,4 0,12"
+               style="fill:none;stroke:#ffffff;stroke-width:1.99999999000000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+            <path
+               transform="matrix(-6.8228185,4.776128e-8,-4.776128e-8,-6.8228185,-219.58206,922.14785)"
+               id="path3081"
+               d="M 60,51 49,51"
+               style="fill:none;stroke:#ffffff;stroke-width:1.99999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+            <rect
+               transform="scale(-1,-1)"
                y="-560.53864"
-               transform="scale(-1,-1)" />
-            <rect
-               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-               id="rect3083-3"
-               width="27.291368"
+               x="280.98743"
                height="54.582546"
-               x="280.98734"
+               width="27.291277"
+               id="rect3083"
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563751;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" />
+            <rect
+               transform="scale(-1,-1)"
                y="-656.05823"
-               transform="scale(-1,-1)" />
-            <rect
-               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-               id="rect3083-7"
-               width="27.291306"
+               x="280.98734"
                height="54.582546"
-               x="-574.18408"
+               width="27.291368"
+               id="rect3083-3"
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" />
+            <rect
+               transform="matrix(0,-1,1,0,0,0)"
                y="-294.63324"
-               transform="matrix(0,-1,1,0,0,0)" />
-            <rect
-               style="fill:#d3d7cf;fill-opacity:1;stroke:none"
-               id="rect3083-5"
-               width="13.645644"
-               height="40.936916"
-               x="287.81024"
-               y="-553.71564"
-               transform="scale(-1,-1)" />
-            <rect
-               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-               id="rect3083-35"
-               width="27.291306"
-               height="54.582546"
                x="-574.18408"
+               height="54.582546"
+               width="27.291306"
+               id="rect3083-7"
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" />
+            <rect
+               transform="scale(-1,-1)"
+               y="-553.71564"
+               x="287.81024"
+               height="40.936916"
+               width="13.645644"
+               id="rect3083-5"
+               style="fill:#d3d7cf;fill-opacity:1;stroke:none" />
+            <rect
+               transform="matrix(0,-1,1,0,0,0)"
                y="-390.15253"
-               transform="matrix(0,-1,1,0,0,0)" />
+               x="-574.18408"
+               height="54.582546"
+               width="27.291306"
+               id="rect3083-35"
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" />
           </g>
         </g>
         <g
-           transform="matrix(-7.347889,-1.865131,1.865131,-7.347889,-431.71495,850.47877)"
-           id="g3827-0">
+           id="g3827-0"
+           transform="matrix(-7.347889,-1.865131,1.865131,-7.347889,-431.71495,850.47877)">
           <g
-             transform="translate(31.322131,40.570289)"
-             id="g3797-7">
+             id="g3797-7"
+             transform="translate(31.322131,40.570289)">
             <path
-               inkscape:connector-curvature="0"
-               style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="M -116.1562,-0.41737399 A 8.993818,8.9934077 0.02042283 1 1 -102.49379,11.282241 8.993818,8.9934077 0.02042283 1 1 -116.1562,-0.41737399 z"
                id="path4250-6"
-               d="M -116.1562,-0.41737399 A 8.993818,8.9934077 0.02042283 1 1 -102.49379,11.282241 8.993818,8.9934077 0.02042283 1 1 -116.1562,-0.41737399 z" />
+               style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
             <path
-               inkscape:connector-curvature="0"
-               style="fill:url(#linearGradient3801-7);fill-opacity:1.0;stroke:#fce950;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               d="M -114.63359,0.89358801 A 6.9999997,7.0000001 0 1 1 -104,10 6.9999997,7.0000001 0 0 1 -114.63359,0.89358801 z"
                id="path4250-7-0"
-               d="M -114.63359,0.89358801 A 6.9999997,7.0000001 0 1 1 -104,10 6.9999997,7.0000001 0 0 1 -114.63359,0.89358801 z" />
+               style="fill:url(#linearGradient3801-7);fill-opacity:1.0;stroke:#fce950;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           </g>
         </g>
         <g
-           transform="matrix(-7.347889,-1.865131,1.865131,-7.347889,221.16912,949.17081)"
-           id="g3797-7-6">
+           id="g3797-7-6"
+           transform="matrix(-7.347889,-1.865131,1.865131,-7.347889,221.16912,949.17081)">
           <path
-             inkscape:connector-curvature="0"
-             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
              id="path4250-6-0"
-             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3082-3);fill-opacity:1.0;stroke:#fce950;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
              id="path4250-7-0-6"
-             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+             style="fill:url(#linearGradient3082-3);fill-opacity:1.0;stroke:#fce950;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Finish.svg b/src/Mod/Draft/Resources/icons/Draft_Finish.svg
index 284e9844a7..b9dcfc47b6 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Finish.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Finish.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,124 +6,33 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Finish.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient4082">
       <stop
-         id="stop4084"
+         style="stop-color:#4e9a06;stop-opacity:1"
          offset="0"
-         style="stop-color:#4e9a06;stop-opacity:1" />
+         id="stop4084" />
       <stop
-         id="stop4086"
+         style="stop-color:#8ae234;stop-opacity:1"
          offset="1"
-         style="stop-color:#8ae234;stop-opacity:1" />
+         id="stop4086" />
     </linearGradient>
     <linearGradient
        id="linearGradient4280">
       <stop
-         style="stop-color:#007b09;stop-opacity:1;"
+         id="stop4282"
          offset="0"
-         id="stop4282" />
+         style="stop-color:#007b09;stop-opacity:1;" />
       <stop
-         style="stop-color:#46ff00;stop-opacity:1;"
+         id="stop4284"
          offset="1"
-         id="stop4284" />
-    </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3144-6">
-      <stop
-         id="stop3146-9"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3148-2"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3701">
-      <stop
-         id="stop3703"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3705"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3708">
-      <stop
-         id="stop3710"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3712"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         style="stop-color:#46ff00;stop-opacity:1;" />
     </linearGradient>
     <radialGradient
        r="34.345188"
@@ -135,312 +42,301 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3723"
+       id="radialGradient3684"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3144-6">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3146-9" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3148-2" />
+    </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3686"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3701">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3703" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3705" />
+    </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3708">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3710" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3712" />
+    </linearGradient>
+    <radialGradient
        xlink:href="#linearGradient3144-6"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       id="radialGradient3723"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4280"
-       id="linearGradient4286"
-       x1="36.681817"
-       y1="36.272728"
-       x2="66.772727"
+       gradientUnits="userSpaceOnUse"
        y2="36.272728"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4280"
-       id="linearGradient4331"
-       gradientUnits="userSpaceOnUse"
-       x1="36.681817"
-       y1="36.272728"
        x2="66.772727"
-       y2="36.272728" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4280-5"
-       id="linearGradient4331-2"
-       gradientUnits="userSpaceOnUse"
-       x1="36.681816"
        y1="36.272728"
+       x1="36.681817"
+       id="linearGradient4286"
+       xlink:href="#linearGradient4280" />
+    <linearGradient
+       y2="36.272728"
+       x2="66.772727"
+       y1="36.272728"
+       x1="36.681817"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4331"
+       xlink:href="#linearGradient4280" />
+    <linearGradient
+       y2="36.272728"
        x2="66.772728"
-       y2="36.272728" />
+       y1="36.272728"
+       x1="36.681816"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4331-2"
+       xlink:href="#linearGradient4280-5" />
     <linearGradient
        id="linearGradient4280-5">
       <stop
-         style="stop-color:#007b09;stop-opacity:1;"
+         id="stop4282-9"
          offset="0"
-         id="stop4282-9" />
+         style="stop-color:#007b09;stop-opacity:1;" />
       <stop
-         style="stop-color:#46ff00;stop-opacity:1;"
+         id="stop4284-5"
          offset="1"
-         id="stop4284-5" />
+         style="stop-color:#46ff00;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3922"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98353665,0.01809546,0.01809547,0.98917081,-277.8307,253.19027)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(0.98353665,0.01809546,0.01809547,0.98917081,-277.8307,253.19027)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-6"
-       id="linearGradient3922-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98353663,0.01809542,0.01809549,0.98917077,-58.285859,270.17568)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(0.98353663,0.01809542,0.01809549,0.98917077,-58.285859,270.17568)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-3"
+       xlink:href="#linearGradient3836-6" />
     <linearGradient
        id="linearGradient3836-6">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838-7"
          offset="0"
-         id="stop3838-7" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-2"
-       id="linearGradient3922-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98353663,0.01809542,0.01809549,0.98917077,-75.27572,489.72902)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(0.98353663,0.01809542,0.01809549,0.98917077,-75.27572,489.72902)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-6"
+       xlink:href="#linearGradient3836-2" />
     <linearGradient
        id="linearGradient3836-2">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838-9"
          offset="0"
-         id="stop3838-9" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840-1"
          offset="1"
-         id="stop3840-1" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4082"
-       id="linearGradient3922-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.24930482,-0.22162964,0.21349852,-0.2587998,-46.292807,159.73973)"
-       x1="10.387"
-       y1="453.77875"
+       y2="483.99524"
        x2="56.319412"
-       y2="483.99524" />
+       y1="453.77875"
+       x1="10.387"
+       gradientTransform="matrix(-0.24930482,-0.22162964,0.21349852,-0.2587998,-46.292807,159.73973)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-0"
+       xlink:href="#linearGradient4082" />
     <linearGradient
        id="linearGradient3836-9">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop3838-3"
          offset="0"
-         id="stop3838-3" />
+         style="stop-color:#c4a000;stop-opacity:1" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop3840-6"
          offset="1"
-         id="stop3840-6" />
+         style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-9"
-       id="linearGradient3979"
-       x1="89"
-       y1="67"
-       x2="84"
-       y2="49"
+       gradientTransform="translate(0,-1)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
+       y2="49"
+       x2="84"
+       y1="67"
+       x1="89"
+       id="linearGradient3979"
+       xlink:href="#linearGradient3836-9" />
     <linearGradient
        id="linearGradient3098">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop3100"
          offset="0"
-         id="stop3100" />
+         style="stop-color:#c4a000;stop-opacity:1" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop3102"
          offset="1"
-         id="stop3102" />
+         style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.116426"
-     inkscape:cx="15.580504"
-     inkscape:cy="31.999356"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4078"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid4080"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 53.99875,31.999817 -22,22 -21.999995,-22 L 31.99875,9.9998175"
        id="path3981"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 53.99875,31.999817 -22,22 -21.999995,-22 L 31.99875,9.9998175"
+       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3981-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       d="m 53.99875,31.999817 -22,22 -21.999995,-22 L 31.99875,9.9998175"
+       style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <g
-       style="stroke:#3465a4;stroke-width:2.12214088"
+       transform="matrix(0.94235513,0.01446014,-0.01446079,0.94231206,-148.41869,-195.06957)"
        id="g4312"
-       transform="matrix(0.94235513,0.01446014,-0.01446079,0.94231206,-148.41869,-195.06957)">
+       style="stroke:#3465a4;stroke-width:2.12214088">
       <g
-         style="stroke:#3465a4;stroke-width:14.15507793"
+         id="g4248"
          transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
-         id="g4248">
+         style="stroke:#3465a4;stroke-width:14.15507793">
         <g
-           transform="translate(-3.7314339,-3.2817175)"
+           style="stroke-width:14.15507793"
            id="g3906"
-           style="stroke-width:14.15507793">
+           transform="translate(-3.7314339,-3.2817175)">
           <path
-             inkscape:connector-curvature="0"
-             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m -194.20237,715.99918 a 49.534277,49.533378 49.435534 1 1 -99.06751,-8.9e-4 49.534277,49.533378 49.435534 1 1 99.06751,8.9e-4 z"
              id="path4250"
-             d="m -194.20237,715.99918 a 49.534277,49.533378 49.435534 1 1 -99.06751,-8.9e-4 49.534277,49.533378 49.435534 1 1 99.06751,8.9e-4 z" />
+             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m -208.35,715.9935 a 35.38115,35.392822 49.405722 0 1 -70.77576,0.0116 35.38115,35.392822 49.405722 0 1 70.77576,-0.0116 z"
              id="path4250-7"
-             d="m -208.35,715.9935 a 35.38115,35.392822 49.405722 0 1 -70.77576,0.0116 35.38115,35.392822 49.405722 0 1 70.77576,-0.0116 z" />
+             style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 25.342481,732.98458 a 49.534277,49.533376 49.485683 1 1 -99.06751,-8.9e-4 49.534277,49.533376 49.485683 1 1 99.06751,8.9e-4 z"
              id="path4250-3"
-             d="m 25.342481,732.98458 a 49.534277,49.533376 49.485683 1 1 -99.06751,-8.9e-4 49.534277,49.533376 49.485683 1 1 99.06751,8.9e-4 z" />
+             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3922-3);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 11.194851,732.9789 a 35.381151,35.392823 49.402956 1 1 -70.77576,0.0116 35.381151,35.392823 49.402956 0 1 70.77576,-0.0116 z"
              id="path4250-7-5"
-             d="m 11.194851,732.9789 a 35.381151,35.392823 49.402956 1 1 -70.77576,0.0116 35.381151,35.392823 49.402956 0 1 70.77576,-0.0116 z" />
+             style="fill:url(#linearGradient3922-3);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 8.3526097,952.53792 a 49.534277,49.533376 49.485683 1 1 -99.0674997,-8.9e-4 49.534277,49.533376 49.485683 1 1 99.0674997,8.9e-4 z"
              id="path4250-2"
-             d="m 8.3526097,952.53792 a 49.534277,49.533376 49.485683 1 1 -99.0674997,-8.9e-4 49.534277,49.533376 49.485683 1 1 99.0674997,8.9e-4 z" />
+             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3922-6);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m -5.7950203,952.53224 a 35.381151,35.392823 49.402956 1 1 -70.7757597,0.0116 35.381151,35.392823 49.402956 0 1 70.7757597,-0.0116 z"
              id="path4250-7-7"
-             d="m -5.7950203,952.53224 a 35.381151,35.392823 49.402956 1 1 -70.7757597,0.0116 35.381151,35.392823 49.402956 0 1 70.7757597,-0.0116 z" />
+             style="fill:url(#linearGradient3922-6);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507793;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
     </g>
     <path
-       inkscape:connector-curvature="0"
-       style="fill:#3465a4;fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 36.36727,23.900203 A 13.995767,13.996164 89.972205 1 1 57.62869,42.10744 13.995767,13.996164 89.972205 1 1 36.36727,23.900203 z"
        id="path4250-0"
-       d="M 36.36727,23.900203 A 13.995767,13.996164 89.972205 1 1 57.62869,42.10744 13.995767,13.996164 89.972205 1 1 36.36727,23.900203 z" />
+       style="fill:#3465a4;fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3922-0);fill-opacity:1;stroke:#8ae234;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 37.88334,25.195317 A 11.999424,12.000496 89.925918 0 1 56.11318,40.805469 11.999424,12.000496 89.925918 1 1 37.88334,25.195317 z"
        id="path4250-7-6"
-       d="M 37.88334,25.195317 A 11.999424,12.000496 89.925918 0 1 56.11318,40.805469 11.999424,12.000496 89.925918 1 1 37.88334,25.195317 z" />
+       style="fill:url(#linearGradient3922-0);fill-opacity:1;stroke:#8ae234;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 41,31 4,4 8,-8 3,3 -11,11 -7,-7 z"
        id="path4088"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       d="m 41,31 4,4 8,-8 3,3 -11,11 -7,-7 z"
+       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
   </g>
   <metadata
      id="metadata4582">
@@ -450,7 +346,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Finish</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_FlipDimension.svg b/src/Mod/Draft/Resources/icons/Draft_FlipDimension.svg
index 3fc611b54d..cae6daf644 100644
--- a/src/Mod/Draft/Resources/icons/Draft_FlipDimension.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_FlipDimension.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,179 +6,106 @@
    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"
+   version="1.1"
    id="svg2735"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_FlipDimension.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2737">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5192">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop5194"
          offset="0"
-         id="stop5194" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop5196"
          offset="1"
-         id="stop5196" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5127">
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop5129"
          offset="0"
-         id="stop5129" />
+         style="stop-color:#fce94f;stop-opacity:1" />
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop5131"
          offset="1"
-         id="stop5131" />
+         style="stop-color:#c4a000;stop-opacity:1" />
     </linearGradient>
-    <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="perspective2743" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5127"
+       gradientUnits="userSpaceOnUse"
+       y2="4.3889422"
+       x2="540.14728"
+       y1="19.713791"
+       x1="499.98511"
        id="linearGradient5133"
-       x1="499.98511"
-       y1="19.713791"
-       x2="540.14728"
-       y2="4.3889422"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient5127" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5127-2"
+       gradientUnits="userSpaceOnUse"
+       y2="4.3889422"
+       x2="540.14728"
+       y1="19.713791"
+       x1="499.98511"
        id="linearGradient5133-1"
-       x1="499.98511"
-       y1="19.713791"
-       x2="540.14728"
-       y2="4.3889422"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient5127-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient5127-2">
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop5129-0"
          offset="0"
-         id="stop5129-0" />
+         style="stop-color:#fce94f;stop-opacity:1" />
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop5131-6"
          offset="1"
-         id="stop5131-6" />
+         style="stop-color:#c4a000;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(0,0.59069326,0.37332419,0,17.504326,-286.6532)"
-       y2="4.3889422"
-       x2="540.14728"
-       y1="19.713791"
-       x1="499.98511"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5151"
        xlink:href="#linearGradient5127-2"
-       inkscape:collect="always" />
+       id="linearGradient5151"
+       gradientUnits="userSpaceOnUse"
+       x1="499.98511"
+       y1="19.713791"
+       x2="540.14728"
+       y2="4.3889422"
+       gradientTransform="matrix(0,0.59069326,0.37332419,0,17.504326,-286.6532)" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5192"
-       id="linearGradient5198"
-       x1="33.634201"
-       y1="60.706417"
-       x2="29.080149"
+       gradientUnits="userSpaceOnUse"
        y2="38.657543"
-       gradientUnits="userSpaceOnUse" />
+       x2="29.080149"
+       y1="60.706417"
+       x1="33.634201"
+       id="linearGradient5198"
+       xlink:href="#linearGradient5192" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2080078"
-     inkscape:cx="46.622641"
-     inkscape:cy="31.375224"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4598"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid5172"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       empcolor="#ff0000"
-       empopacity="0.25098039"
-       spacingx="16px"
-       spacingy="16px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       transform="matrix(0,0.59069326,-0.37332419,0,46.495674,-286.6532)"
-       style="fill:url(#linearGradient5133);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:4.25898315;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 519.14119,-20.101366 28.77974,45.53683 -57.55949,0 z"
        id="path2644-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       d="m 519.14119,-20.101366 28.77974,45.53683 -57.55949,0 z"
+       style="fill:url(#linearGradient5133);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:4.25898315;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="matrix(0,0.59069326,-0.37332419,0,46.495674,-286.6532)" />
     <path
-       style="fill:url(#linearGradient5198);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 59,37 -18,2 4,4 c 0,0 -2,5 -13,5 C 21,48 13,34 13,34 l -8,7 c 0,0 10,18 27,18 17,0 21,-8 21,-8 l 4,4 z"
        id="path3009"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccczcczccc" />
+       d="m 59,37 -18,2 4,4 c 0,0 -2,5 -13,5 C 21,48 13,34 13,34 l -8,7 c 0,0 10,18 27,18 17,0 21,-8 21,-8 l 4,4 z"
+       style="fill:url(#linearGradient5198);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 51.159091,20 39,32.160706 39,7.8392939 z"
        id="path2644-2-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       d="M 51.159091,20 39,32.160706 39,7.8392939 z"
+       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="fill:url(#linearGradient5151);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 10,20.000002 27,37 27,2.9999977 z"
        id="path2644-2-8"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       d="M 10,20.000002 27,37 27,2.9999977 z"
+       style="fill:url(#linearGradient5151);fill-opacity:1;fill-rule:evenodd;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 12.840909,20.000002 25,32.160708 25,7.8392967 z"
        id="path2644-2-3-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       d="M 12.840909,20.000002 25,32.160708 25,7.8392967 z"
+       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 56.749324,39.265165 -11.467298,1.276823 2.344728,2.42508 C 47.626754,42.967068 43,50 32,50 21,50 12.568182,37.022727 12.568182,37.022727 l -4.9886365,4.375 c 0,0 8.5490195,15.791498 25.3525495,15.698697 16.803531,-0.0928 19.930065,-8.924354 19.930065,-8.924354 l 2.607821,2.600333 z"
        id="path3009-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccczcczccc" />
+       d="m 56.749324,39.265165 -11.467298,1.276823 2.344728,2.42508 C 47.626754,42.967068 43,50 32,50 21,50 12.568182,37.022727 12.568182,37.022727 l -4.9886365,4.375 c 0,0 8.5490195,15.791498 25.3525495,15.698697 16.803531,-0.0928 19.930065,-8.924354 19.930065,-8.924354 l 2.607821,2.600333 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <metadata
      id="metadata4610">
@@ -190,7 +115,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_FlipDimension</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Wed Nov 13 19:25:01 2013 -0200</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Grid.svg b/src/Mod/Draft/Resources/icons/Draft_Grid.svg
index 8de00956b5..90d10b0870 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Grid.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Grid.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,301 +6,213 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Grid.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3946">
       <stop
-         style="stop-color:#888a85;stop-opacity:1"
+         id="stop3948"
          offset="0"
-         id="stop3948" />
+         style="stop-color:#888a85;stop-opacity:1" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3950"
          offset="1"
-         id="stop3950" />
+         style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2734" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
-       id="radialGradient3850-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-4"
+       xlink:href="#linearGradient3144-1" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-1">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-9"
          offset="0"
-         id="stop3146-9" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-8"
          offset="1"
-         id="stop3148-8" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3946"
+       gradientUnits="userSpaceOnUse"
+       y2="469.43594"
+       x2="127.30297"
+       y1="734.65814"
+       x1="182.81459"
        id="linearGradient3952"
-       x1="182.81459"
-       y1="734.65814"
-       x2="127.30297"
-       y2="469.43594"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3946" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3946"
+       gradientTransform="translate(0.8811394,4.4056794)"
+       y2="469.43594"
+       x2="127.30297"
+       y1="734.65814"
+       x1="182.81459"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3962"
-       gradientUnits="userSpaceOnUse"
-       x1="182.81459"
-       y1="734.65814"
-       x2="127.30297"
-       y2="469.43594"
-       gradientTransform="translate(0.8811394,4.4056794)" />
+       xlink:href="#linearGradient3946" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3946"
+       gradientTransform="translate(-4.0774755e-6,4.4056694)"
+       y2="469.43594"
+       x2="127.30297"
+       y1="734.65814"
+       x1="182.81459"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3964"
-       gradientUnits="userSpaceOnUse"
-       x1="182.81459"
-       y1="734.65814"
-       x2="127.30297"
-       y2="469.43594"
-       gradientTransform="translate(-4.0774755e-6,4.4056694)" />
+       xlink:href="#linearGradient3946" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3946"
+       gradientTransform="translate(-0.88114055,4.4056794)"
+       y2="469.43594"
+       x2="127.30297"
+       y1="734.65814"
+       x1="182.81459"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3966"
-       gradientUnits="userSpaceOnUse"
-       x1="182.81459"
-       y1="734.65814"
-       x2="127.30297"
-       y2="469.43594"
-       gradientTransform="translate(-0.88114055,4.4056794)" />
+       xlink:href="#linearGradient3946" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3946"
+       y2="469.43594"
+       x2="127.30297"
+       y1="734.65814"
+       x1="182.81459"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3968"
-       gradientUnits="userSpaceOnUse"
-       x1="182.81459"
-       y1="734.65814"
-       x2="127.30297"
-       y2="469.43594" />
+       xlink:href="#linearGradient3946" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3946"
+       gradientTransform="translate(-1.1451159e-5,5.286812)"
+       y2="469.43594"
+       x2="127.30297"
+       y1="734.65814"
+       x1="182.81459"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient3970"
-       gradientUnits="userSpaceOnUse"
-       x1="182.81459"
-       y1="734.65814"
-       x2="127.30297"
-       y2="469.43594"
-       gradientTransform="translate(-1.1451159e-5,5.286812)" />
+       xlink:href="#linearGradient3946" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3946"
-       id="linearGradient3972"
-       gradientUnits="userSpaceOnUse"
-       x1="182.81459"
-       y1="734.65814"
-       x2="127.30297"
+       gradientTransform="translate(-1.1451159e-5,4.4056755)"
        y2="469.43594"
-       gradientTransform="translate(-1.1451159e-5,4.4056755)" />
+       x2="127.30297"
+       y1="734.65814"
+       x1="182.81459"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3972"
+       xlink:href="#linearGradient3946" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.4464322"
-     inkscape:cx="-6.2098079"
-     inkscape:cy="26.651404"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2994"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid2998"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 52.406331,457.10003 0,296.062"
          id="path2996"
-         inkscape:connector-curvature="0" />
+         d="m 52.406331,457.10003 0,296.062"
+         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 158.14276,457.10004 0,296.062"
          id="path2996-3"
-         inkscape:connector-curvature="0" />
+         d="m 158.14276,457.10004 0,296.062"
+         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 263.87919,457.10003 0,296.062"
          id="path2996-6"
-         inkscape:connector-curvature="0" />
+         d="m 263.87919,457.10003 0,296.062"
+         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 306.17376,494.10779 -296.062001,0"
          id="path2996-7"
-         inkscape:connector-curvature="0" />
+         d="m 306.17376,494.10779 -296.062001,0"
+         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 306.17376,604.91076 -296.062001,0"
          id="path2996-7-3"
-         inkscape:connector-curvature="0" />
+         d="m 306.17376,604.91076 -296.062001,0"
+         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 306.17377,709.98633 -296.062004,0"
          id="path2996-7-5"
-         inkscape:connector-curvature="0" />
+         d="m 306.17377,709.98633 -296.062004,0"
+         style="fill:none;stroke:#2e3436;stroke-width:49.34366608;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <g
-         id="g3890"
+         transform="translate(0.88113641,-4.4056837)"
          style="fill:#fad647;fill-opacity:1"
-         transform="translate(0.88113641,-4.4056837)">
+         id="g3890">
         <g
-           id="g3938"
-           style="stroke:url(#linearGradient3952)">
+           style="stroke:url(#linearGradient3952)"
+           id="g3938">
           <path
-             style="fill:none;stroke:url(#linearGradient3962);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-             d="m 52.406332,461.50572 0,296.062"
              id="path2996-62"
-             inkscape:connector-curvature="0" />
+             d="m 52.406332,461.50572 0,296.062"
+             style="fill:none;stroke:url(#linearGradient3962);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
           <path
-             style="fill:#fad647;fill-opacity:1;stroke:url(#linearGradient3964);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-             d="m 157.26163,461.50572 0,296.062"
              id="path2996-3-9"
-             inkscape:connector-curvature="0" />
+             d="m 157.26163,461.50572 0,296.062"
+             style="fill:#fad647;fill-opacity:1;stroke:url(#linearGradient3964);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
           <path
-             style="fill:#fad647;fill-opacity:1;stroke:url(#linearGradient3966);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-             d="m 262.11692,461.50572 0,296.062"
              id="path2996-6-1"
-             inkscape:connector-curvature="0" />
+             d="m 262.11692,461.50572 0,296.062"
+             style="fill:#fad647;fill-opacity:1;stroke:url(#linearGradient3966);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
           <path
-             style="fill:#fad647;fill-opacity:1;stroke:url(#linearGradient3968);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-             d="m 305.29264,498.51347 -296.0620167,0"
              id="path2996-7-2"
-             inkscape:connector-curvature="0" />
+             d="m 305.29264,498.51347 -296.0620167,0"
+             style="fill:#fad647;fill-opacity:1;stroke:url(#linearGradient3968);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
           <path
-             style="fill:#fad647;fill-opacity:1;stroke:url(#linearGradient3970);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-             d="m 305.29263,609.53672 -296.0620182,0"
              id="path2996-7-3-7"
-             inkscape:connector-curvature="0" />
+             d="m 305.29263,609.53672 -296.0620182,0"
+             style="fill:#fad647;fill-opacity:1;stroke:url(#linearGradient3970);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
           <path
-             style="fill:#fad647;fill-opacity:1;stroke:url(#linearGradient3972);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-             d="m 305.29263,714.39202 -296.0620182,0"
              id="path2996-7-5-0"
-             inkscape:connector-curvature="0" />
+             d="m 305.29263,714.39202 -296.0620182,0"
+             style="fill:#fad647;fill-opacity:1;stroke:url(#linearGradient3972);stroke-width:24.67183304;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
         </g>
       </g>
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 47.11951,457.10004 0,300.46767"
          id="path2996-9"
-         inkscape:connector-curvature="0" />
+         d="m 47.11951,457.10004 0,300.46767"
+         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 151.9748,457.10004 0,300.46767"
          id="path2996-3-3"
-         inkscape:connector-curvature="0" />
+         d="m 151.9748,457.10004 0,300.46767"
+         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 256.8301,457.10004 0,300.46767"
          id="path2996-6-6"
-         inkscape:connector-curvature="0" />
+         d="m 256.8301,457.10004 0,300.46767"
+         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 306.17373,487.93983 -296.06197,0"
          id="path2996-7-0"
-         inkscape:connector-curvature="0" />
+         d="m 306.17373,487.93983 -296.06197,0"
+         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 306.17373,598.96308 -296.06197,0"
          id="path2996-7-3-6"
-         inkscape:connector-curvature="0" />
+         d="m 306.17373,598.96308 -296.06197,0"
+         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 306.17373,703.81837 -296.06197,0"
          id="path2996-7-5-2"
-         inkscape:connector-curvature="0" />
+         d="m 306.17373,703.81837 -296.06197,0"
+         style="fill:none;stroke:#ffffff;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
     </g>
   </g>
   <metadata
@@ -313,7 +223,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Grid</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Tue Dec 29 12:10:22 2015 -0200</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Heal.svg b/src/Mod/Draft/Resources/icons/Draft_Heal.svg
index d11012a22e..6d435eea30 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Heal.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Heal.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,250 +6,162 @@
    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="Draft_Heal.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">
+   id="svg5821"
+   height="64px"
+   width="64px">
   <defs
      id="defs5823">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3792">
       <stop
-         style="stop-color:#a40000;stop-opacity:1"
+         id="stop3794"
          offset="0"
-         id="stop3794" />
+         style="stop-color:#a40000;stop-opacity:1" />
       <stop
-         style="stop-color:#ef2929;stop-opacity:1"
+         id="stop3796"
          offset="1"
-         id="stop3796" />
+         style="stop-color:#ef2929;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient4569">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop4571"
          offset="0"
-         id="stop4571" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#a9a9a9;stop-opacity:1;"
+         id="stop4573"
          offset="1"
-         id="stop4573" />
+         style="stop-color:#a9a9a9;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6351"
          offset="0"
-         id="stop6351" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6353"
          offset="1"
-         id="stop6353" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#0019a3;stop-opacity:1;" />
       <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#0069ff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
        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" />
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3377" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
+       r="194.40614"
+       fy="1424.4465"
+       fx="1103.6399"
+       cy="1424.4465"
+       cx="1103.6399"
+       id="radialGradient6355"
+       xlink:href="#linearGradient6349" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4569"
+       gradientUnits="userSpaceOnUse"
+       y2="48.776375"
+       x2="49.987103"
+       y1="14.796122"
+       x1="12.932842"
        id="linearGradient4575"
-       x1="12.932842"
-       y1="14.796122"
-       x2="49.987103"
-       y2="48.776375"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient4569" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4569-9"
-       id="linearGradient4575-8"
-       x1="12.932842"
-       y1="14.796122"
-       x2="49.987103"
+       gradientUnits="userSpaceOnUse"
        y2="48.776375"
-       gradientUnits="userSpaceOnUse" />
+       x2="49.987103"
+       y1="14.796122"
+       x1="12.932842"
+       id="linearGradient4575-8"
+       xlink:href="#linearGradient4569-9" />
     <linearGradient
        id="linearGradient4569-9">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop4571-0"
          offset="0"
-         id="stop4571-0" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#708cff;stop-opacity:1;"
+         id="stop4573-8"
          offset="1"
-         id="stop4573-8" />
+         style="stop-color:#708cff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4569"
+       y2="48.776375"
+       x2="49.987103"
+       y1="14.796122"
+       x1="12.932842"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient4643"
-       gradientUnits="userSpaceOnUse"
-       x1="12.932842"
-       y1="14.796122"
-       x2="49.987103"
-       y2="48.776375" />
+       xlink:href="#linearGradient4569" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3792"
-       id="linearGradient3798"
-       x1="1119.6676"
-       y1="1322.2788"
-       x2="1090.4249"
+       gradientTransform="translate(3.4352637e-6,14.621356)"
+       gradientUnits="userSpaceOnUse"
        y2="1088.3372"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(3.4352637e-6,14.621356)" />
+       x2="1090.4249"
+       y1="1322.2788"
+       x1="1119.6676"
+       id="linearGradient3798"
+       xlink:href="#linearGradient3792" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4569-7"
-       id="linearGradient4643-6"
-       gradientUnits="userSpaceOnUse"
-       x1="12.932842"
-       y1="14.796122"
+       y2="48.776375"
        x2="49.987103"
-       y2="48.776375" />
+       y1="14.796122"
+       x1="12.932842"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4643-6"
+       xlink:href="#linearGradient4569-7" />
     <linearGradient
        id="linearGradient4569-7">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop4571-5"
          offset="0"
-         id="stop4571-5" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#a9a9a9;stop-opacity:1;"
+         id="stop4573-3"
          offset="1"
-         id="stop4573-3" />
+         style="stop-color:#a9a9a9;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.7232161"
-     inkscape:cx="-55.016644"
-     inkscape:cy="39.558979"
-     inkscape:current-layer="g3360"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3022"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3800"
-       units="px"
-       empspacing="1"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <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.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)"
+       id="g3360">
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient4643);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1.53535354;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(9.5231147,0,0,9.5231147,800.3066,934.2359)"
+         d="M 52.727272,30 A 20.727272,20.727272 0 0 1 32,50.727272 20.727272,20.727272 0 0 1 11.272728,30 20.727272,20.727272 0 0 1 32,9.272728 20.727272,20.727272 0 0 1 52.727272,30 Z"
          id="path3799"
-         sodipodi:cx="32"
-         sodipodi:cy="30"
-         sodipodi:rx="20.727272"
-         sodipodi:ry="20.727272"
-         d="M 52.727272,30 C 52.727272,41.447356 43.447356,50.727272 32,50.727272 20.552644,50.727272 11.272728,41.447356 11.272728,30 11.272728,18.552644 20.552644,9.272728 32,9.272728 43.447356,9.272728 52.727272,18.552644 52.727272,30 z"
-         transform="matrix(9.5231147,0,0,9.5231147,800.3066,934.2359)" />
+         style="color:#000000;fill:url(#linearGradient4643);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1.53535354;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1068.4929,1081.0266 -0.9069,102.3494 -101.44253,0 0,73.1068 102.34943,0 0,102.3494 73.1067,0 0,-102.3494 102.3495,0 0,-73.1068 -102.3495,0 0,-102.3494 z"
          id="rect4577"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         d="m 1068.4929,1081.0266 -0.9069,102.3494 -101.44253,0 0,73.1068 102.34943,0 0,102.3494 73.1067,0 0,-102.3494 102.3495,0 0,-73.1068 -102.3495,0 0,-102.3494 z"
+         style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         style="color:#000000;fill:url(#linearGradient3798);fill-opacity:1;fill-rule:evenodd;stroke:#ef2929;stroke-width:14.62134743;stroke-linecap:butt;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"
-         d="m 1083.1142,1095.6479 0,102.3495 -102.34939,0 0,43.864 102.34939,0 0,102.3494 43.8641,0 0,-102.3494 102.3494,0 0,-43.864 -102.3494,0 0,-102.3495 z"
          id="rect4577-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         d="m 1083.1142,1095.6479 0,102.3495 -102.34939,0 0,43.864 102.34939,0 0,102.3494 43.8641,0 0,-102.3494 102.3494,0 0,-43.864 -102.3494,0 0,-102.3495 z"
+         style="color:#000000;fill:url(#linearGradient3798);fill-opacity:1;fill-rule:evenodd;stroke:#ef2929;stroke-width:14.62134743;stroke-linecap:butt;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
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.65818178999999999;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(8.8176988,0,0,8.8176988,822.8799,955.39837)"
+         d="M 52.727272,30 A 20.727272,20.727272 0 0 1 32,50.727272 20.727272,20.727272 0 0 1 11.272728,30 20.727272,20.727272 0 0 1 32,9.272728 20.727272,20.727272 0 0 1 52.727272,30 Z"
          id="path3799-5"
-         sodipodi:cx="32"
-         sodipodi:cy="30"
-         sodipodi:rx="20.727272"
-         sodipodi:ry="20.727272"
-         d="M 52.727272,30 C 52.727272,41.447356 43.447356,50.727272 32,50.727272 20.552644,50.727272 11.272728,41.447356 11.272728,30 11.272728,18.552644 20.552644,9.272728 32,9.272728 43.447356,9.272728 52.727272,18.552644 52.727272,30 z"
-         transform="matrix(8.8176988,0,0,8.8176988,822.8799,955.39837)" />
+         style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.65818178999999999;stroke-linecap:butt;stroke-linejoin:round;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>
   <metadata
@@ -262,7 +172,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Heal</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Wed Mar 6 12:14:14 2013 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Join.svg b/src/Mod/Draft/Resources/icons/Draft_Join.svg
index 304d0b6fd0..9a1334c463 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Join.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Join.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,489 +6,339 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="Draft_AddPoint.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
+  <title
+     id="title897">Draft_Join</title>
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5225"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96" />
       <stop
-         id="stop3148-4"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4" />
     </linearGradient>
     <linearGradient
-       y2="39.514103"
-       x2="45.615246"
-       y1="24.379309"
-       x1="50.120781"
-       gradientTransform="matrix(3.3933987,-2.9060225,-2.9963536,-3.4988797,49.496046,888.95085)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3066"
        xlink:href="#linearGradient3895-6"
-       inkscape:collect="always" />
+       id="linearGradient3066"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.3933987,-2.9060225,-2.9963536,-3.4988797,49.496046,888.95085)"
+       x1="50.120781"
+       y1="24.379309"
+       x2="45.615246"
+       y2="39.514103" />
     <linearGradient
        id="linearGradient3895-6">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897-7"
          offset="0"
-         id="stop3897-7" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899-5"
          offset="1"
-         id="stop3899-5" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="39.514103"
-       x2="45.615246"
-       y1="23.526644"
-       x1="42.758076"
-       gradientTransform="matrix(-3.3933987,2.9060225,-2.9963536,-3.4988797,455.03317,541.58714)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3025"
        xlink:href="#linearGradient3895-6"
-       inkscape:collect="always" />
+       id="linearGradient3025"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-3.3933987,2.9060225,-2.9963536,-3.4988797,455.03317,541.58714)"
+       x1="42.758076"
+       y1="23.526644"
+       x2="45.615246"
+       y2="39.514103" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.7551025"
-     inkscape:cx="40.422601"
-     inkscape:cy="4.5578085"
-     inkscape:current-layer="g3906"
-     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"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3054"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1"
-       spacingy="1"
-       originx="0"
-       originy="0" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3056"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16"
-       spacingy="16"
-       color="#ff0000"
-       opacity="0.1254902"
-       empcolor="#ff0000"
-       empopacity="0.25098039"
-       originx="0"
-       originy="0" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       transform="translate(-127.44439,-128.22016)"
-       id="g5199">
+       id="g5199"
+       transform="translate(-127.44439,-128.22016)">
       <g
-         id="g3912"
-         transform="translate(0,-21)">
+         transform="translate(0,-21)"
+         id="g3912">
         <g
-           transform="translate(0,13.01548)"
-           id="g3856">
+           id="g3856"
+           transform="translate(0,13.01548)">
           <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect3852"
-             width="58"
-             height="6"
-             x="3"
+             transform="translate(127.44439,128.22016)"
              y="37"
-             transform="translate(127.44439,128.22016)" />
+             x="3"
+             height="6"
+             width="58"
+             id="rect3852"
+             style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 59,41 H 5"
+             transform="translate(127.44439,128.22016)"
              id="path3854"
-             inkscape:connector-curvature="0"
-             transform="translate(127.44439,128.22016)" />
+             d="M 59,41 H 5"
+             style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
         <g
-           style="stroke:#3465a4;stroke-width:0.8096711"
+           transform="matrix(1.2349522,0.01894995,-0.0189508,1.2348959,-7.1881028,-111.34439)"
            id="g4312"
-           transform="matrix(1.2349522,0.01894995,-0.0189508,1.2348959,-7.1881028,-111.34439)">
+           style="stroke:#3465a4;stroke-width:0.8096711">
           <g
-             style="stroke:#3465a4;stroke-width:0.8096711"
+             id="g4248"
              transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
-             id="g4248">
+             style="stroke:#3465a4;stroke-width:0.8096711">
             <g
-               transform="translate(-3.7314339,-3.2817175)"
+               style="stroke-width:0.8096711"
                id="g3906"
-               style="stroke-width:0.8096711">
+               transform="translate(-3.7314339,-3.2817175)">
               <path
-                 inkscape:connector-curvature="0"
-                 style="fill:url(#linearGradient3025);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:10.80131626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 d="m 260.5178,617.19204 -28.10373,-32.8171 32.81558,-28.1024 -35.12966,-41.02137 -32.81558,28.10247 -28.10373,-32.81709 -3.55481,95.48139 z"
                  id="path3343"
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-                 inkscape:export-xdpi="4.1683898"
-                 inkscape:export-ydpi="4.1683898" />
+                 d="m 260.5178,617.19204 -28.10373,-32.8171 32.81558,-28.1024 -35.12966,-41.02137 -32.81558,28.10247 -28.10373,-32.81709 -3.55481,95.48139 z"
+                 style="fill:url(#linearGradient3025);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:10.80131626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 inkscape:connector-curvature="0"
-                 style="fill:none;stroke:#729fcf;stroke-width:10.80131626;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 d="m 232.87104,601.85234 -15.68679,-18.656 32.81559,-28.1025 -21.0778,-24.61279 -32.81558,28.10249 -18.09385,-20.9869 -1.31921,58.772 z"
                  id="path3343-2"
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-                 inkscape:export-xdpi="4.1683898"
-                 inkscape:export-ydpi="4.1683898" />
+                 d="m 232.87104,601.85234 -15.68679,-18.656 32.81559,-28.1025 -21.0778,-24.61279 -32.81558,28.10249 -18.09385,-20.9869 -1.31921,58.772 z"
+                 style="fill:none;stroke:#729fcf;stroke-width:10.80131626;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 inkscape:connector-curvature="0"
-                 style="fill:url(#linearGradient3066);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:10.80131626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 d="m 154.1208,708.37951 -28.10373,-32.81708 -32.815584,28.10245 -35.12966,-41.02134 32.81558,-28.10245 -28.10373,-32.81708 94.891934,11.17408 z"
                  id="path3343-3"
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-                 inkscape:export-xdpi="4.1683898"
-                 inkscape:export-ydpi="4.1683898" />
+                 d="m 154.1208,708.37951 -28.10373,-32.81708 -32.815584,28.10245 -35.12966,-41.02134 32.81558,-28.10245 -28.10373,-32.81708 94.891934,11.17408 z"
+                 style="fill:url(#linearGradient3066);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:10.80131626;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
               <path
-                 inkscape:connector-curvature="0"
-                 style="fill:none;stroke:#729fcf;stroke-width:10.80131626;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 d="m 143.21612,678.70226 -16.02109,-18.3697 -32.815584,28.10245 -21.0778,-24.61281 32.815584,-28.10245 -17.953974,-21.10664 58.275464,7.73657 z"
                  id="path3343-2-5"
-                 sodipodi:nodetypes="cccccccc"
-                 inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-                 inkscape:export-xdpi="4.1683898"
-                 inkscape:export-ydpi="4.1683898" />
+                 d="m 143.21612,678.70226 -16.02109,-18.3697 -32.815584,28.10245 -21.0778,-24.61281 32.815584,-28.10245 -17.953974,-21.10664 58.275464,7.73657 z"
+                 style="fill:none;stroke:#729fcf;stroke-width:10.80131626;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
             </g>
           </g>
         </g>
@@ -505,13 +353,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_AddPoint</dc:title>
+        <dc:title>Draft_Join</dc:title>
         <cc:license
            rdf:resource="" />
-        <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
+        <dc:date>Tue Jan 29, 2019 9:26 am </dc:date>
         <dc:creator>
           <cc:Agent>
-            <dc:title>[wmayer]</dc:title>
+            <dc:title>[bitacovir]</dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:rights>
@@ -524,23 +372,20 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_AddPoint.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_Join.svg</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
+            <dc:title>[agrayson]</dc:title>
           </cc:Agent>
         </dc:contributor>
         <dc:subject>
           <rdf:Bag>
-            <rdf:li>plus</rdf:li>
-            <rdf:li>add</rdf:li>
-            <rdf:li>cross</rdf:li>
-            <rdf:li>dot</rdf:li>
             <rdf:li>line</rdf:li>
+            <rdf:li>arrows</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <dc:description>A plus sign hovering above a line with a dot at its midpoint</dc:description>
+        <dc:description>A line. Two arrows placed in the middle of the line, pointing at each othe.</dc:description>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Label.svg b/src/Mod/Draft/Resources/icons/Draft_Label.svg
index e5c88df692..18b8f9539e 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Label.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Label.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,115 +6,67 @@
    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"
+   version="1.1"
    id="svg3018"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.1 r15371"
-   sodipodi:docname="Draft_Label.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs3020">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3759">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop3761"
          offset="0"
-         id="stop3761" />
+         style="stop-color:#c4a000;stop-opacity:1" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop3763"
          offset="1"
-         id="stop3763" />
+         style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
-    <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="perspective3026" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3759"
-       id="linearGradient3765"
-       x1="168.90298"
-       y1="171.57141"
-       x2="149.60875"
+       gradientUnits="userSpaceOnUse"
        y2="156.15283"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3759"
-       id="linearGradient3773"
-       gradientUnits="userSpaceOnUse"
-       x1="168.90298"
+       x2="149.60875"
        y1="171.57141"
-       x2="161.02531"
-       y2="151.80997" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3759"
-       id="linearGradient4696-1"
-       gradientUnits="userSpaceOnUse"
        x1="168.90298"
-       y1="171.57141"
-       x2="161.02531"
+       id="linearGradient3765"
+       xlink:href="#linearGradient3759" />
+    <linearGradient
        y2="151.80997"
-       gradientTransform="matrix(1.0117827,0,0,1.0010613,-131.94627,-139.97322)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3759"
-       id="linearGradient4777"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.50589135,0.87622952,-0.86694452,0.50053065,271.74898,6.9955571)"
-       x1="168.90298"
-       y1="171.57141"
        x2="161.02531"
-       y2="151.80997" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3759"
-       id="linearGradient4825"
+       y1="171.57141"
+       x1="168.90298"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.50589135,0.87622952,-0.86694452,0.50053065,472.1396,-77.96156)"
-       x1="-69.188599"
-       y1="218.91563"
+       id="linearGradient3773"
+       xlink:href="#linearGradient3759" />
+    <linearGradient
+       gradientTransform="matrix(1.0117827,0,0,1.0010613,-131.94627,-139.97322)"
+       y2="151.80997"
+       x2="161.02531"
+       y1="171.57141"
+       x1="168.90298"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4696-1"
+       xlink:href="#linearGradient3759" />
+    <linearGradient
+       y2="151.80997"
+       x2="161.02531"
+       y1="171.57141"
+       x1="168.90298"
+       gradientTransform="matrix(0.50589135,0.87622952,-0.86694452,0.50053065,271.74898,6.9955571)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4777"
+       xlink:href="#linearGradient3759" />
+    <linearGradient
+       y2="213.65501"
        x2="-80.687408"
-       y2="213.65501" />
+       y1="218.91563"
+       x1="-69.188599"
+       gradientTransform="matrix(0.50589135,0.87622952,-0.86694452,0.50053065,472.1396,-77.96156)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4825"
+       xlink:href="#linearGradient3759" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.6846892"
-     inkscape:cx="-16.391165"
-     inkscape:cy="6.770961"
-     inkscape:current-layer="g3861"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1051"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <metadata
      id="metadata3023">
     <rdf:RDF>
@@ -125,55 +75,40 @@
         <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"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3861"
-       transform="matrix(0.5,-0.8660254,0.8660254,0.5,-193.03669,88.488562)">
+       transform="matrix(0.5,-0.8660254,0.8660254,0.5,-193.03669,88.488562)"
+       id="g3861">
       <path
-         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;vector-effect:none;fill:#f6efd1;fill-opacity:1;fill-rule:nonzero;stroke:#353535;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 181.18703,156.58637 -14.38406,-24.53892 -22.32456,13.05147 14.40211,24.83973 11.15886,4.5113 -0.77696,7.77145 -10.12506,5.8457 c -1.84677,-0.77424 -3.95711,-0.58367 -5.63531,0.50889 -2.79552,1.8238 -3.58376,5.56821 -1.7608,8.36427 l 0.004,0.007 c 1.8265,2.79405 5.57202,3.57875 8.36642,1.75279 1.83723,-1.20114 2.87898,-3.30382 2.72154,-5.4932 4.81876,-2.76365 12.95698,-7.54612 12.95698,-7.54612 l 1.33807,-14.99881 2.55096,-1.52692 z"
          id="path4775"
-         inkscape:connector-curvature="0" />
+         d="m 181.18703,156.58637 -14.38406,-24.53892 -22.32456,13.05147 14.40211,24.83973 11.15886,4.5113 -0.77696,7.77145 -10.12506,5.8457 c -1.84677,-0.77424 -3.95711,-0.58367 -5.63531,0.50889 -2.79552,1.8238 -3.58376,5.56821 -1.7608,8.36427 l 0.004,0.007 c 1.8265,2.79405 5.57202,3.57875 8.36642,1.75279 1.83723,-1.20114 2.87898,-3.30382 2.72154,-5.4932 4.81876,-2.76365 12.95698,-7.54612 12.95698,-7.54612 l 1.33807,-14.99881 2.55096,-1.52692 z"
+         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;vector-effect:none;fill:#f6efd1;fill-opacity:1;fill-rule:nonzero;stroke:#353535;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
       <path
-         sodipodi:nodetypes="cccc"
-         d="m 162.04014,142.06651 8.55256,14.59012 m -15.11324,-10.66255 8.55255,14.59012"
-         style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#2d2d2d;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path3854"
-         inkscape:connector-curvature="0" />
+         style="opacity:1;vector-effect:none;fill:none;fill-opacity:1;stroke:#2d2d2d;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         d="m 162.04014,142.06651 8.55256,14.59012 m -15.11324,-10.66255 8.55255,14.59012" />
       <ellipse
-         cy="-169.33739"
-         cx="167.15965"
-         transform="matrix(0.01120568,0.99993721,-0.99993726,0.01120168,0,0)"
-         id="path3859"
-         style="display:inline;overflow:visible;visibility:visible;fill:#302b00;fill-opacity:1;fill-rule:evenodd;stroke:#242421;stroke-width:3.04715109;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         ry="1.5249376"
          rx="1.5412734"
-         ry="1.5249376" />
+         style="display:inline;overflow:visible;visibility:visible;fill:#302b00;fill-opacity:1;fill-rule:evenodd;stroke:#242421;stroke-width:3.04715109;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+         id="path3859"
+         transform="matrix(0.01120568,0.99993721,-0.99993726,0.01120168,0,0)"
+         cx="167.15965"
+         cy="-169.33739" />
       <path
-         style="fill:none;stroke:#cacaca;stroke-width:3.04715085;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 176.81273,167.26762 -6.56068,3.92757 -9.13607,-3.48982 -12.52611,-21.64238 17.1438,-9.79128 12.44009,21.22198 z"
          id="path3757"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
+         d="m 176.81273,167.26762 -6.56068,3.92757 -9.13607,-3.48982 -12.52611,-21.64238 17.1438,-9.79128 12.44009,21.22198 z"
+         style="fill:none;stroke:#cacaca;stroke-width:3.04715085;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         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;vector-effect:none;fill:url(#linearGradient4825);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         id="path4823"
+         d="m 246.3186,-31.690249 a 6.6491361,6.6491361 0 0 1 -6.99946,-6.276824 6.6491361,6.6491361 0 0 1 6.27437,-7.001664 6.6491361,6.6491361 0 0 1 7.00387,6.271906 6.6491361,6.6491361 0 0 1 -6.26945,7.00607"
          transform="rotate(60)"
-         sodipodi:type="arc"
-         sodipodi:cx="245.95839"
-         sodipodi:cy="-38.32962"
-         sodipodi:rx="6.6491361"
-         sodipodi:ry="6.6491361"
-         sodipodi:start="1.5165951"
-         sodipodi:end="1.5151901"
-         sodipodi:open="true"
-         d="m 246.3186,-31.690249 a 6.6491361,6.6491361 0 0 1 -6.99946,-6.276824 6.6491361,6.6491361 0 0 1 6.27437,-7.001664 6.6491361,6.6491361 0 0 1 7.00387,6.271906 6.6491361,6.6491361 0 0 1 -6.26945,7.00607" />
+         id="path4823"
+         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;vector-effect:none;fill:url(#linearGradient4825);fill-opacity:1;fill-rule:nonzero;stroke:#302b00;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Layer.svg b/src/Mod/Draft/Resources/icons/Draft_Layer.svg
index dce5071fc2..cc7002250d 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Layer.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Layer.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,162 +6,113 @@
    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="svg2985"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_VisGroup.svg">
+   id="svg2985"
+   height="64px"
+   width="64px">
+  <title
+     id="title853">Draft_Layer</title>
   <defs
      id="defs2987">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3815">
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
+         id="stop3817"
          offset="0"
-         id="stop3817" />
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3819"
          offset="1"
-         id="stop3819" />
+         style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3807">
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
+         id="stop3809"
          offset="0"
-         id="stop3809" />
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3811"
          offset="1"
-         id="stop3811" />
+         style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3799">
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
+         id="stop3801"
          offset="0"
-         id="stop3801" />
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3803"
          offset="1"
-         id="stop3803" />
+         style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3799"
-       id="linearGradient3805"
-       x1="53.257175"
-       y1="19.086002"
-       x2="25.928942"
+       gradientTransform="translate(-0.02151317,-0.91811256)"
+       gradientUnits="userSpaceOnUse"
        y2="-1.3815211"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.02151317,-0.91811256)" />
+       x2="25.928942"
+       y1="19.086002"
+       x1="53.257175"
+       id="linearGradient3805"
+       xlink:href="#linearGradient3799" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3807"
-       id="linearGradient3813"
-       x1="61.719494"
-       y1="27.953379"
-       x2="36.843666"
+       gradientTransform="translate(0.75600263,0.0412295)"
+       gradientUnits="userSpaceOnUse"
        y2="12.022611"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.75600263,0.0412295)" />
+       x2="36.843666"
+       y1="27.953379"
+       x1="61.719494"
+       id="linearGradient3813"
+       xlink:href="#linearGradient3807" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient3821"
-       x1="74.313408"
-       y1="43.419685"
-       x2="48.388607"
-       y2="23.542751"
+       gradientTransform="translate(-0.18895427,-1.1237431)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.18895427,-1.1237431)" />
+       y2="23.542751"
+       x2="48.388607"
+       y1="43.419685"
+       x1="74.313408"
+       id="linearGradient3821"
+       xlink:href="#linearGradient3815" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.6796359"
-     inkscape:cx="-11.390884"
-     inkscape:cy="30.609684"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <rect
-       style="color:#000000;fill:url(#linearGradient3821);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2993"
-       width="39.045357"
-       height="27.016869"
-       x="40.359722"
+       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)"
        y="16.492231"
-       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)" />
+       x="40.359722"
+       height="27.016869"
+       width="39.045357"
+       id="rect2993"
+       style="color:#000000;fill:url(#linearGradient3821);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 25.329927,28.679638 57.173418,41.866954 40.234042,56.653163 8.3211848,43.465847 z"
        id="rect2993-0-9-3-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 25.329927,28.679638 57.173418,41.866954 40.234042,56.653163 8.3211848,43.465847 z"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
-       style="color:#000000;fill:url(#linearGradient3813);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2993-0"
-       width="39.045357"
-       height="27.016869"
-       x="31.989382"
+       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)"
        y="6.2172832"
-       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)" />
-    <path
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 25.30824,18.773895 57.151731,31.961211 40.212355,46.74742 8.2994962,33.560104 z"
-       id="rect2993-0-9-3-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient3805);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2993-0-9"
-       width="39.045357"
+       x="31.989382"
        height="27.016869"
-       x="21.896566"
-       y="-6.1819811"
-       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)" />
+       width="39.045357"
+       id="rect2993-0"
+       style="color:#000000;fill:url(#linearGradient3813);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       id="rect2993-0-9-3-6"
+       d="M 25.30824,18.773895 57.151731,31.961211 40.212355,46.74742 8.2994962,33.560104 z"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)"
+       y="-6.1819811"
+       x="21.896566"
+       height="27.016869"
+       width="39.045357"
+       id="rect2993-0-9"
+       style="color:#000000;fill:url(#linearGradient3805);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 25.281278,6.6563352 57.124769,19.843651 40.185393,34.62986 8.2725348,21.442544 z"
        id="rect2993-0-9-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 25.281278,6.6563352 57.124769,19.843651 40.185393,34.62986 8.2725348,21.442544 z"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <metadata
      id="metadata5826">
@@ -173,7 +122,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_VisGroup</dc:title>
+        <dc:title>Draft_Layer</dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Tue Jun 10 10:21:01 2014 -0300</dc:date>
@@ -192,7 +141,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_VisGroup.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_Layer.svg</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
@@ -207,7 +156,7 @@
             <rdf:li>stack</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <dc:description>Three pages or rectangles stacked on top of each other</dc:description>
+        <dc:description>Three pages or rectangles stacked on top of each other. Previously VisGroup.</dc:description>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Line.svg b/src/Mod/Draft/Resources/icons/Draft_Line.svg
index 529bf51c8e..3f4f283192 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Line.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Line.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,146 +6,91 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Line.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
-    <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="perspective2734" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-6"
-       id="linearGradient3801-1-3"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-3"
+       xlink:href="#linearGradient3836-0-6" />
     <linearGradient
        id="linearGradient3836-0-6">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-7"
          offset="0"
-         id="stop3838-2-7" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-5"
          offset="1"
-         id="stop3840-5-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.50259"
-     inkscape:cx="3.0330293"
-     inkscape:cy="26.696541"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2999"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 15.90812,53.334522 11.665479,49.091882 54.09188,6.6654781 58.33452,10.908118 z"
        id="path3061"
-       inkscape:connector-curvature="0" />
+       d="M 15.90812,53.334522 11.665479,49.091882 54.09188,6.6654781 58.33452,10.908118 z"
+       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 14.002005,49.583782 54.58379,9.0019981"
        id="path3063"
-       inkscape:connector-curvature="0" />
+       d="M 14.002005,49.583782 54.58379,9.0019981"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <g
-       transform="translate(40.005735,-40.005445)"
-       id="g3827-1">
+       id="g3827-1"
+       transform="translate(40.005735,-40.005445)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9">
+         id="g3797-9"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
     <g
-       transform="translate(0.005735,-0.005445)"
-       id="g3827-1-3">
+       id="g3827-1-3"
+       transform="translate(0.005735,-0.005445)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9-5">
+         id="g3797-9-5"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71-6"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3-2"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
   </g>
@@ -159,7 +102,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Line</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_LinkArray.svg b/src/Mod/Draft/Resources/icons/Draft_LinkArray.svg
index 679ec4532a..45389d7881 100644
--- a/src/Mod/Draft/Resources/icons/Draft_LinkArray.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_LinkArray.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,532 +6,454 @@
    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.91 r13725"
-   sodipodi:docname="Draft_LinkArray.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Draft_wb_primitives/Draft_Array/Draft_Array_Ortho_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   id="svg5821"
+   height="64px"
+   width="64px">
+  <title
+     id="title901">Draft_LinkArray</title>
   <defs
      id="defs5823">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793"
          offset="0"
-         id="stop3793" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795"
          offset="1"
-         id="stop3795" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6351"
          offset="0"
-         id="stop6351" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6353"
          offset="1"
-         id="stop6353" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#0019a3;stop-opacity:1;" />
       <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#0069ff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
        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" />
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3377" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
+       r="194.40614"
+       fy="1424.4465"
+       fx="1103.6399"
+       cy="1424.4465"
+       cx="1103.6399"
+       id="radialGradient6355"
+       xlink:href="#linearGradient6349" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3797"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3797-3"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7"
          offset="0"
-         id="stop3793-7" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5"
          offset="1"
-         id="stop3795-5" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6"
-       id="linearGradient3820"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3834"
-       xlink:href="#linearGradient3791-6"
-       inkscape:collect="always" />
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3820"
+       xlink:href="#linearGradient3791-6" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-7"
-       id="linearGradient3797-3-2"
+       xlink:href="#linearGradient3791-6"
+       id="linearGradient3834"
+       gradientUnits="userSpaceOnUse"
        x1="939.98767"
        y1="1097.5122"
        x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       y2="989.77716" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-3-2"
+       xlink:href="#linearGradient3791-6-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6-7">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7-0"
          offset="0"
-         id="stop3793-7-0" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5-9"
          offset="1"
-         id="stop3795-5-9" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834-3"
        xlink:href="#linearGradient3791-6-7"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-0"
-       id="linearGradient3797-6"
+       id="linearGradient3834-3"
+       gradientUnits="userSpaceOnUse"
        x1="939.98767"
        y1="1097.5122"
        x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       y2="989.77716" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-6"
+       xlink:href="#linearGradient3791-0" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-0">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-6"
          offset="0"
-         id="stop3793-6" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-2"
          offset="1"
-         id="stop3795-2" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-0"
-       id="linearGradient3896"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3916"
-       xlink:href="#linearGradient3791-0"
-       inkscape:collect="always" />
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3896"
+       xlink:href="#linearGradient3791-0" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-9"
-       id="linearGradient3797-3-28"
+       xlink:href="#linearGradient3791-0"
+       id="linearGradient3916"
+       gradientUnits="userSpaceOnUse"
        x1="939.98767"
        y1="1097.5122"
        x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       y2="989.77716" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-3-28"
+       xlink:href="#linearGradient3791-6-9" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6-9">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7-7"
          offset="0"
-         id="stop3793-7-7" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5-3"
          offset="1"
-         id="stop3795-5-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834-6"
        xlink:href="#linearGradient3791-6-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-2"
-       id="linearGradient3797-1"
+       id="linearGradient3834-6"
+       gradientUnits="userSpaceOnUse"
        x1="939.98767"
        y1="1097.5122"
        x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       y2="989.77716" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-1"
+       xlink:href="#linearGradient3791-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-2">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-9"
          offset="0"
-         id="stop3793-9" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-3"
          offset="1"
-         id="stop3795-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-2"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3896-1"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791-2" />
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3916-9"
        xlink:href="#linearGradient3791-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3774"
-       id="linearGradient5137"
+       id="linearGradient3916-9"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.51964051,0,0,0.50042191,1386.3532,982.21378)"
-       x1="288.11227"
-       y1="358.15811"
-       x2="372.52457"
-       y2="7.5416322" />
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716" />
+    <linearGradient
+       y2="7.5416322"
+       x2="372.52457"
+       y1="358.15811"
+       x1="288.11227"
+       gradientTransform="matrix(-0.51964051,0,0,0.50042191,1386.3532,982.21378)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5137"
+       xlink:href="#linearGradient3774" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3774">
       <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
+         id="stop3776"
          offset="0"
-         id="stop3776" />
+         style="stop-color:#4e9a06;stop-opacity:1" />
       <stop
-         style="stop-color:#8ae234;stop-opacity:1"
+         id="stop3778"
          offset="1"
-         id="stop3778" />
+         style="stop-color:#8ae234;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="14.56567"
-     inkscape:cx="41.962312"
-     inkscape:cy="55.078705"
-     inkscape:current-layer="g3360"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1375"
-     inkscape:window-height="876"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3010"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <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.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)"
+       id="g3360">
       <g
          id="g3799">
         <g
            id="g3956">
           <g
-             id="g3812"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0"
+             style="fill:url(#linearGradient3797);stroke:#729fcf;stroke-width:11.82571345000000029;stroke-opacity:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:miter;fill-opacity:1"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797);stroke:#729fcf;stroke-width:11.82571345000000029;stroke-opacity:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:miter;fill-opacity:1">
+             id="g3812-0">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3797);fill-opacity:1.0;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571345000000029;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6"
-               style="fill:url(#linearGradient3797);fill-opacity:1.0;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571345000000029;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(-2.5969387e-5,219.32018)"
-         id="g3799-3">
+         id="g3799-3"
+         transform="translate(-2.5969387e-5,219.32018)">
         <g
            id="g3956-5">
           <g
-             id="g3812-6"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-6">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-2"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-9"
+             style="fill:url(#linearGradient3797-3);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-3);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-9">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3834);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-1"
-               style="fill:url(#linearGradient3834);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(146.21345,-3.0142166e-5)"
-         id="g3799-6">
+         id="g3799-6"
+         transform="translate(146.21345,-3.0142166e-5)">
         <g
            id="g3956-1">
           <g
-             id="g3812-8"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-8">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-7"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-92"
+             style="fill:url(#linearGradient3797-6);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-6);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-92">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3916);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-0"
-               style="fill:url(#linearGradient3916);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(146.21345,219.32019)"
-         id="g3799-3-2">
+         id="g3799-3-2"
+         transform="translate(146.21345,219.32019)">
         <g
            id="g3956-5-3">
           <g
-             id="g3812-6-7"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-6-7">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-2-5"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-9-9"
+             style="fill:url(#linearGradient3797-3-2);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-3-2);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-9-9">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3834-3);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-1-2"
-               style="fill:url(#linearGradient3834-3);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(292.42692,-3.1029367e-7)"
-         id="g3799-4">
+         id="g3799-4"
+         transform="translate(292.42692,-3.1029367e-7)">
         <g
            id="g3956-7">
           <g
-             id="g3812-84"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-84">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-5"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-0"
+             style="fill:url(#linearGradient3797-1);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-1);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-0">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3916-9);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-3"
-               style="fill:url(#linearGradient3916-9);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(292.42692,219.32021)"
-         id="g3799-3-6">
+         id="g3799-3-6"
+         transform="translate(292.42692,219.32021)">
         <g
            id="g3956-5-1">
           <g
-             id="g3812-6-0"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-6-0">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-2-6"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-9-3"
+             style="fill:url(#linearGradient3797-3-28);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-3-28);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-9-3">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3834-6);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-1-20"
-               style="fill:url(#linearGradient3834-6);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
          id="g4218">
         <path
-           style="fill:#8ae234;fill-opacity:1;stroke:#172a04;stroke-width:14.62134731;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
-           inkscape:connector-curvature="0"
+           id="path4228"
            d="m 1145.5648,1074.1543 c 18.5937,-18.383 48.2169,-28.9064 88.8688,-31.5737 l 0,-37.4326 c 0,-4.0003 1.9294,-6.80966 5.7868,-8.43006 4.0547,-1.61639 7.5171,-0.95178 10.3849,2.00121 l 75.9581,73.15065 c 1.8799,1.8121 2.8184,3.9543 2.8184,6.4303 0,2.4767 -0.9389,4.6185 -2.8184,6.429 l -75.9602,73.1502 c -1.7833,1.81 -4.0064,2.7148 -6.6772,2.7148 -1.1865,0 -2.4222,-0.2382 -3.7083,-0.7141 -3.8572,-1.6204 -5.7882,-4.4273 -5.7882,-8.4296 l 0,-35.8618 c -15.9228,1.2386 -29.1503,3.7387 -39.6881,7.5008 -10.5331,3.7627 -18.9637,9.0247 -25.2946,15.7879 -14.738,15.7158 -19.9806,42.6214 -15.7274,80.7237 0.1953,2.4775 -0.9389,4.0963 -3.4125,4.858 -0.2967,0.097 -0.7414,0.142 -1.3349,0.142 -1.9778,0 -3.361,-0.8095 -4.154,-2.4285 l -2.9667,-5.7148 c -1.3832,-2.6676 -3.3858,-6.9784 -6.007,-12.9313 -2.6194,-5.9556 -4.9969,-11.9071 -7.1237,-17.8612 -2.1269,-5.9515 -4.0298,-12.5235 -5.7119,-19.7147 -1.6805,-7.194 -2.5219,-13.5508 -2.5219,-19.074 0,-32.0039 8.3606,-56.2428 25.078,-72.7222 z"
-           id="path4228" />
+           style="fill:#8ae234;fill-opacity:1;stroke:#172a04;stroke-width:14.62134731;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1" />
         <path
-           inkscape:connector-curvature="0"
-           id="path5135"
+           style="fill:url(#linearGradient5137);fill-opacity:1;stroke:none;stroke-width:34.75331116;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1"
            d="m 1252.6459,1025.0625 c 18.4441,17.7617 37.1632,35.1962 55.3062,53.3235 -19.0906,18.0067 -37.542,36.7844 -56.7747,54.6184 -0.018,-12.2743 -0.087,-24.5491 0.032,-36.8231 -26.4463,1.6409 -53.9694,3.575 -77.8197,17.2303 -17.0095,9.5803 -28.4884,27.8106 -34.5388,47.088 -3.5743,-21.5969 -1.2897,-45.3408 10.607,-63.6609 11.0273,-16.9013 29.5358,-25.7267 47.629,-30.3404 14.7839,-4.3279 30.2561,-4.0127 45.1276,-7.7257 7.8392,-4.3982 10.4187,-14.9284 9.2176,-23.8416 -0.062,-3.7919 -0.2886,-7.6325 -0.4323,-11.451 0.5488,0.5275 1.0977,1.055 1.6465,1.5825 z"
-           style="fill:url(#linearGradient5137);fill-opacity:1;stroke:none;stroke-width:34.75331116;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:1" />
+           id="path5135" />
       </g>
     </g>
   </g>
@@ -545,10 +465,10 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title>Draft_LinkArray</dc:title>
         <cc:license
            rdf:resource="" />
-        <dc:date>Sat Dec 10 18:31:32 2011 +0000</dc:date>
+        <dc:date>Jul 15 11:50:00 2019 -0600</dc:date>
         <dc:creator>
           <cc:Agent>
             <dc:title>[yorikvanhavre]</dc:title>
@@ -564,18 +484,19 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_Array.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_LinkArray.svg</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
+            <dc:title>[agryson] Alexander Gryson, [realthunder]</dc:title>
           </cc:Agent>
         </dc:contributor>
-        <dc:description>Six rectangles in a 2 x 3 linear array</dc:description>
+        <dc:description>Six rectangles in a 2 x 3 linear array. With a green arrow on top.</dc:description>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>rectangle</rdf:li>
             <rdf:li>array</rdf:li>
+            <rdf:li>arrow</rdf:li>
           </rdf:Bag>
         </dc:subject>
       </cc:Work>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Lock.svg b/src/Mod/Draft/Resources/icons/Draft_Lock.svg
index 6e749e4a59..172cf2531f 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Lock.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Lock.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,113 +6,22 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Lock.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient4280">
       <stop
-         style="stop-color:#ff6000;stop-opacity:1;"
+         id="stop4282"
          offset="0"
-         id="stop4282" />
+         style="stop-color:#ff6000;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffee00;stop-opacity:1;"
+         id="stop4284"
          offset="1"
-         id="stop4284" />
-    </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3144-6">
-      <stop
-         id="stop3146-9"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3148-2"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3701">
-      <stop
-         id="stop3703"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3705"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3708">
-      <stop
-         id="stop3710"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3712"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         style="stop-color:#ffee00;stop-opacity:1;" />
     </linearGradient>
     <radialGradient
        r="34.345188"
@@ -124,430 +31,407 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3723"
+       id="radialGradient3684"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3144-6">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3146-9" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3148-2" />
+    </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3686"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3701">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3703" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3705" />
+    </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3708">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3710" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3712" />
+    </linearGradient>
+    <radialGradient
        xlink:href="#linearGradient3144-6"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       id="radialGradient3723"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4280"
-       id="linearGradient4331"
-       gradientUnits="userSpaceOnUse"
-       x1="36.681817"
-       y1="36.272728"
+       y2="36.272728"
        x2="66.772727"
-       y2="36.272728" />
+       y1="36.272728"
+       x1="36.681817"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4331"
+       xlink:href="#linearGradient4280" />
     <linearGradient
        id="linearGradient4280-5">
       <stop
-         style="stop-color:#007b09;stop-opacity:1;"
+         id="stop4282-9"
          offset="0"
-         id="stop4282-9" />
+         style="stop-color:#007b09;stop-opacity:1;" />
       <stop
-         style="stop-color:#46ff00;stop-opacity:1;"
+         id="stop4284-5"
          offset="1"
-         id="stop4284-5" />
+         style="stop-color:#46ff00;stop-opacity:1;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3273"
-       id="radialGradient2411"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1937875,0,0,0.20943582,-425.95281,-115.26147)"
-       cx="2787.5991"
-       cy="552.89734"
-       fx="2787.5991"
+       r="38.829369"
        fy="552.89734"
-       r="38.829369" />
+       fx="2787.5991"
+       cy="552.89734"
+       cx="2787.5991"
+       gradientTransform="matrix(0.1937875,0,0,0.20943582,-425.95281,-115.26147)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2411"
+       xlink:href="#linearGradient3273" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3273">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3275"
          offset="0"
-         id="stop3275" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3277"
          offset="1"
-         id="stop3277" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient2405"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,5656.8338,1344.2216)"
-       x1="2754.6858"
-       y1="671.11084"
+       y2="671.11084"
        x2="2900.1479"
-       y2="671.11084" />
+       y1="671.11084"
+       x1="2754.6858"
+       gradientTransform="matrix(-1,0,0,-1,5656.8338,1344.2216)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2405"
+       xlink:href="#linearGradient3293" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3293">
       <stop
-         style="stop-color:#808000;stop-opacity:1;"
+         id="stop3295"
          offset="0"
-         id="stop3295" />
+         style="stop-color:#808000;stop-opacity:1;" />
       <stop
-         style="stop-color:#808000;stop-opacity:0;"
+         id="stop3297"
          offset="1"
-         id="stop3297" />
+         style="stop-color:#808000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient2407"
-       gradientUnits="userSpaceOnUse"
+       y2="671.11084"
+       x2="2900.1479"
+       y1="671.11084"
+       x1="2754.6858"
        gradientTransform="matrix(-1,0,0,-1,5656.8338,1376.2216)"
-       x1="2754.6858"
-       y1="671.11084"
-       x2="2900.1479"
-       y2="671.11084" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient2409"
        gradientUnits="userSpaceOnUse"
+       id="linearGradient2407"
+       xlink:href="#linearGradient3293" />
+    <linearGradient
+       y2="671.11084"
+       x2="2900.1479"
+       y1="671.11084"
+       x1="2754.6858"
        gradientTransform="matrix(-1,0,0,-1,5656.8338,1408.2216)"
-       x1="2754.6858"
-       y1="671.11084"
-       x2="2900.1479"
-       y2="671.11084" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3255"
-       id="linearGradient2403"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.15119754,0,0,0.1937875,-309.70907,-106.60955)"
-       x1="2732.3572"
-       y1="711.11218"
-       x2="2839.0713"
-       y2="711.11218" />
+       id="linearGradient2409"
+       xlink:href="#linearGradient3293" />
+    <linearGradient
+       y2="711.11218"
+       x2="2839.0713"
+       y1="711.11218"
+       x1="2732.3572"
+       gradientTransform="matrix(0.15119754,0,0,0.1937875,-309.70907,-106.60955)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2403"
+       xlink:href="#linearGradient3255" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3255">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3257"
          offset="0"
-         id="stop3257" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3259"
          offset="1"
-         id="stop3259" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient4673"
-       gradientUnits="userSpaceOnUse"
+       y2="671.11084"
+       x2="2900.1479"
+       y1="671.11084"
+       x1="2754.6858"
        gradientTransform="matrix(-0.1937875,0,0,-0.1937875,670.27087,167.83649)"
-       x1="2754.6858"
-       y1="671.11084"
-       x2="2900.1479"
-       y2="671.11084" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient4676"
        gradientUnits="userSpaceOnUse"
+       id="linearGradient4673"
+       xlink:href="#linearGradient3293" />
+    <linearGradient
+       y2="671.11084"
+       x2="2900.1479"
+       y1="671.11084"
+       x1="2754.6858"
        gradientTransform="matrix(-0.1937875,0,0,-0.1937875,670.27087,161.63529)"
-       x1="2754.6858"
-       y1="671.11084"
-       x2="2900.1479"
-       y2="671.11084" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient4679"
        gradientUnits="userSpaceOnUse"
+       id="linearGradient4676"
+       xlink:href="#linearGradient3293" />
+    <linearGradient
+       y2="671.11084"
+       x2="2900.1479"
+       y1="671.11084"
+       x1="2754.6858"
        gradientTransform="matrix(-0.1937875,0,0,-0.1937875,670.27087,155.43409)"
-       x1="2754.6858"
-       y1="671.11084"
-       x2="2900.1479"
-       y2="671.11084" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4280-8"
-       id="linearGradient4331-8"
        gradientUnits="userSpaceOnUse"
-       x1="36.681816"
-       y1="36.272728"
+       id="linearGradient4679"
+       xlink:href="#linearGradient3293" />
+    <linearGradient
+       y2="36.272728"
        x2="66.772728"
-       y2="36.272728" />
+       y1="36.272728"
+       x1="36.681816"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4331-8"
+       xlink:href="#linearGradient4280-8" />
     <linearGradient
        id="linearGradient4280-8">
       <stop
-         style="stop-color:#ff6000;stop-opacity:1;"
+         id="stop4282-94"
          offset="0"
-         id="stop4282-94" />
+         style="stop-color:#ff6000;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffee00;stop-opacity:1;"
+         id="stop4284-7"
          offset="1"
-         id="stop4284-7" />
+         style="stop-color:#ffee00;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3922"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98353665,0.01809546,0.01809547,0.98917081,-277.8307,253.19027)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(0.98353665,0.01809546,0.01809547,0.98917081,-277.8307,253.19027)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-6"
-       id="linearGradient3922-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98353663,0.01809542,0.01809549,0.98917077,-58.285859,270.17568)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(0.98353663,0.01809542,0.01809549,0.98917077,-58.285859,270.17568)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-3"
+       xlink:href="#linearGradient3836-6" />
     <linearGradient
        id="linearGradient3836-6">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838-7"
          offset="0"
-         id="stop3838-7" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-2"
-       id="linearGradient3922-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98353663,0.01809542,0.01809549,0.98917077,-75.27572,489.72902)"
-       x1="11.390151"
-       y1="453.55045"
+       y2="485.54004"
        x2="54.509644"
-       y2="485.54004" />
+       y1="453.55045"
+       x1="11.390151"
+       gradientTransform="matrix(0.98353663,0.01809542,0.01809549,0.98917077,-75.27572,489.72902)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-6"
+       xlink:href="#linearGradient3836-2" />
     <linearGradient
        id="linearGradient3836-2">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838-9"
          offset="0"
-         id="stop3838-9" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840-1"
          offset="1"
-         id="stop3840-1" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-9"
-       id="linearGradient3922-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.24930482,-0.22162964,0.21349852,-0.2587998,-46.291565,159.73992)"
-       x1="10.387"
-       y1="453.77875"
+       y2="483.99524"
        x2="56.319412"
-       y2="483.99524" />
+       y1="453.77875"
+       x1="10.387"
+       gradientTransform="matrix(-0.24930482,-0.22162964,0.21349852,-0.2587998,-46.291565,159.73992)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-0"
+       xlink:href="#linearGradient3836-9" />
     <linearGradient
        id="linearGradient3836-9">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop3838-3"
          offset="0"
-         id="stop3838-3" />
+         style="stop-color:#c4a000;stop-opacity:1" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop3840-6"
          offset="1"
-         id="stop3840-6" />
+         style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-9"
-       id="linearGradient3979"
-       x1="89"
-       y1="67"
-       x2="84"
-       y2="49"
+       gradientTransform="translate(0,-1)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,-1)" />
+       y2="49"
+       x2="84"
+       y1="67"
+       x1="89"
+       id="linearGradient3979"
+       xlink:href="#linearGradient3836-9" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="34.611731"
-     inkscape:cy="22.186494"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3101"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       color="#ff0000"
-       opacity="0.1254902"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3103"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 10,32 32,10 54,32 32,54 z"
        id="path3981"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 10,32 32,10 54,32 32,54 z"
+       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3981-1"
-       inkscape:connector-curvature="0" />
+       d="M 10,32 32,10 54,32 32,54 z"
+       style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <g
-       style="stroke:#3465a4;stroke-width:2.12214079"
+       transform="matrix(0.94235513,0.01446014,-0.01446079,0.94231206,-148.41745,-195.06938)"
        id="g4312"
-       transform="matrix(0.94235513,0.01446014,-0.01446079,0.94231206,-148.41745,-195.06938)">
+       style="stroke:#3465a4;stroke-width:2.12214079">
       <g
-         style="stroke:#3465a4;stroke-width:14.15507818"
+         id="g4248"
          transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
-         id="g4248">
+         style="stroke:#3465a4;stroke-width:14.15507818">
         <g
-           transform="translate(-3.7314339,-3.2817175)"
+           style="stroke-width:14.15507818"
            id="g3906"
-           style="stroke-width:14.15507818">
+           transform="translate(-3.7314339,-3.2817175)">
           <path
-             inkscape:connector-curvature="0"
-             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m -194.20237,715.99918 a 49.534277,49.533378 49.435534 1 1 -99.06751,-8.9e-4 49.534277,49.533378 49.435534 1 1 99.06751,8.9e-4 z"
              id="path4250"
-             d="m -194.20237,715.99918 a 49.534277,49.533378 49.435534 1 1 -99.06751,-8.9e-4 49.534277,49.533378 49.435534 1 1 99.06751,8.9e-4 z" />
+             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m -208.35,715.9935 a 35.38115,35.392822 49.405722 0 1 -70.77576,0.0116 35.38115,35.392822 49.405722 0 1 70.77576,-0.0116 z"
              id="path4250-7"
-             d="m -208.35,715.9935 a 35.38115,35.392822 49.405722 0 1 -70.77576,0.0116 35.38115,35.392822 49.405722 0 1 70.77576,-0.0116 z" />
+             style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 25.342481,732.98458 a 49.534277,49.533376 49.485683 1 1 -99.06751,-8.9e-4 49.534277,49.533376 49.485683 1 1 99.06751,8.9e-4 z"
              id="path4250-3"
-             d="m 25.342481,732.98458 a 49.534277,49.533376 49.485683 1 1 -99.06751,-8.9e-4 49.534277,49.533376 49.485683 1 1 99.06751,8.9e-4 z" />
+             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3922-3);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 11.194851,732.9789 a 35.381151,35.392823 49.402956 1 1 -70.77576,0.0116 35.381151,35.392823 49.402956 0 1 70.77576,-0.0116 z"
              id="path4250-7-5"
-             d="m 11.194851,732.9789 a 35.381151,35.392823 49.402956 1 1 -70.77576,0.0116 35.381151,35.392823 49.402956 0 1 70.77576,-0.0116 z" />
+             style="fill:url(#linearGradient3922-3);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 8.3526097,952.53792 a 49.534277,49.533376 49.485683 1 1 -99.0674997,-8.9e-4 49.534277,49.533376 49.485683 1 1 99.0674997,8.9e-4 z"
              id="path4250-2"
-             d="m 8.3526097,952.53792 a 49.534277,49.533376 49.485683 1 1 -99.0674997,-8.9e-4 49.534277,49.533376 49.485683 1 1 99.0674997,8.9e-4 z" />
+             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3922-6);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m -5.7950203,952.53224 a 35.381151,35.392823 49.402956 1 1 -70.7757597,0.0116 35.381151,35.392823 49.402956 0 1 70.7757597,-0.0116 z"
              id="path4250-7-7"
-             d="m -5.7950203,952.53224 a 35.381151,35.392823 49.402956 1 1 -70.7757597,0.0116 35.381151,35.392823 49.402956 0 1 70.7757597,-0.0116 z" />
+             style="fill:url(#linearGradient3922-6);fill-opacity:1;stroke:#729fcf;stroke-width:14.15507818;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
     </g>
     <path
-       inkscape:connector-curvature="0"
-       style="fill:#3465a4;fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 36.368516,23.900386 A 13.995767,13.996164 89.972205 1 1 57.629937,42.107623 13.995767,13.996164 89.972205 1 1 36.368516,23.900386 z"
        id="path4250-0"
-       d="M 36.368516,23.900386 A 13.995767,13.996164 89.972205 1 1 57.629937,42.107623 13.995767,13.996164 89.972205 1 1 36.368516,23.900386 z" />
+       style="fill:#3465a4;fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3922-0);fill-opacity:1;stroke:#fce94f;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 37.884589,25.1955 A 11.999423,12.000495 89.925918 1 1 56.114427,40.805652 11.999423,12.000495 89.925918 0 1 37.884589,25.1955 z"
        id="path4250-7-6"
-       d="M 37.884589,25.1955 A 11.999423,12.000495 89.925918 1 1 56.114427,40.805652 11.999423,12.000495 89.925918 0 1 37.884589,25.1955 z" />
+       style="fill:url(#linearGradient3922-0);fill-opacity:1;stroke:#fce94f;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <g
-       id="g3201"
+       style="fill:#eeeeec;stroke:#000000;stroke-linejoin:round"
        transform="translate(-41,-27)"
-       style="fill:#eeeeec;stroke:#000000;stroke-linejoin:round">
+       id="g3201">
       <path
-         sodipodi:nodetypes="cccczccccc"
-         inkscape:connector-curvature="0"
-         id="path3195"
+         style="fill:#eeeeec;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
          d="m 97,68 0,-10 -2,0 0,-3 c 0,0 0,-6 -7,-6 -7,0 -7,6 -7,6 l 0,3 -2,0 0,10 z"
-         style="fill:#eeeeec;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+         id="path3195" />
       <path
-         sodipodi:nodetypes="ccczcc"
-         inkscape:connector-curvature="0"
-         id="path3199"
+         style="fill:url(#linearGradient3979);fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
          d="m 85,58 6,0 0,-3 c 0,0 0,-2 -3,-2 -3,0 -3,2 -3,2 z"
-         style="fill:url(#linearGradient3979);fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+         id="path3199" />
     </g>
   </g>
   <metadata
@@ -558,7 +442,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Lock</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Macro.svg b/src/Mod/Draft/Resources/icons/Draft_Macro.svg
index 4636e17a40..be58f3fe1d 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Macro.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Macro.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,386 +6,286 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Macro.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient3814">
       <stop
-         id="stop3816"
+         style="stop-color:#4e9a06;stop-opacity:1"
          offset="0"
-         style="stop-color:#4e9a06;stop-opacity:1" />
+         id="stop3816" />
       <stop
-         id="stop3818"
+         style="stop-color:#8ae234;stop-opacity:1"
          offset="1"
-         style="stop-color:#8ae234;stop-opacity:1" />
+         id="stop3818" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="140.56369"
-       x2="408.87384"
-       y1="187.25706"
-       x1="416.49524"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5087"
        xlink:href="#linearGradient3814"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="135.64352"
-       x2="399.51587"
-       y1="186.58174"
-       x1="424.98495"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
+       id="linearGradient5087"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient5087-1"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
+       x1="416.49524"
+       y1="187.25706"
+       x2="408.87384"
+       y2="140.56369" />
+    <linearGradient
        xlink:href="#linearGradient3814-7"
-       inkscape:collect="always" />
+       id="linearGradient5087-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
+       x1="424.98495"
+       y1="186.58174"
+       x2="399.51587"
+       y2="135.64352" />
     <linearGradient
        id="linearGradient3814-7">
       <stop
-         id="stop3816-4"
+         style="stop-color:#4e9a06;stop-opacity:1"
          offset="0"
-         style="stop-color:#4e9a06;stop-opacity:1" />
+         id="stop3816-4" />
       <stop
-         id="stop3818-0"
+         style="stop-color:#8ae234;stop-opacity:1"
          offset="1"
-         style="stop-color:#8ae234;stop-opacity:1" />
+         id="stop3818-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.9935144"
-     inkscape:cx="24.490444"
-     inkscape:cy="32.688527"
-     inkscape:current-layer="g4293"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
-     inkscape:window-x="318"
-     inkscape:window-y="105"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3044"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4293"
-       transform="translate(-384.19864,-132.64563)">
+       transform="translate(-384.19864,-132.64563)"
+       id="g4293">
       <path
-         sodipodi:nodetypes="ccczzzzzzzzczzczcczzccz"
-         id="path3464"
-         d="m 413.19864,187.64563 c -2,0 -2,-3 -2,-6 0,-5 0,-12.3466 0,-18 -3,-1 -7,0 -10,-4 -3,-4 -2.91333,-15.06859 -1,-20 1.91333,-4.93141 5,-3 6,0 1,3 2,5 4,0 2,-5 6,-5 8,0 2,5 3,3 4,0 1,-3 4,-5 6,0 2,5 2,16 -1,20 -3,4 -7,3 -10,4 0,4 0,9 0,12 0,3 1.58716,3.47898 4.79358,-0.26051 3.20642,-3.73949 10.20642,-10.73949 16.15617,-15.63645 0.0503,5.89696 2.05025,11.89696 -0.70226,18.0314 -2.75251,6.13444 -15.24749,9.86556 -24.24749,9.86556 z m -24,-10 c -2,-6 -1.25901,-12.80532 -0.9387,-18.6331 5.68341,1.92851 14.47111,12.14309 18.9387,16.6331 0.0613,3.3669 0,8 0,12 -7.13975,0.0454 -16,-4 -18,-10 z"
          style="fill:url(#linearGradient5087);fill-opacity:1;stroke:#154b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
+         d="m 413.19864,187.64563 c -2,0 -2,-3 -2,-6 0,-5 0,-12.3466 0,-18 -3,-1 -7,0 -10,-4 -3,-4 -2.91333,-15.06859 -1,-20 1.91333,-4.93141 5,-3 6,0 1,3 2,5 4,0 2,-5 6,-5 8,0 2,5 3,3 4,0 1,-3 4,-5 6,0 2,5 2,16 -1,20 -3,4 -7,3 -10,4 0,4 0,9 0,12 0,3 1.58716,3.47898 4.79358,-0.26051 3.20642,-3.73949 10.20642,-10.73949 16.15617,-15.63645 0.0503,5.89696 2.05025,11.89696 -0.70226,18.0314 -2.75251,6.13444 -15.24749,9.86556 -24.24749,9.86556 z m -24,-10 c -2,-6 -1.25901,-12.80532 -0.9387,-18.6331 5.68341,1.92851 14.47111,12.14309 18.9387,16.6331 0.0613,3.3669 0,8 0,12 -7.13975,0.0454 -16,-4 -18,-10 z"
+         id="path3464" />
       <path
-         sodipodi:nodetypes="ccczzzzzzzzczzczccczcc"
-         id="path3464-9"
-         d="m 414.585,185.6229 c -1.86363,0.13637 -1.11363,0.70455 -1.43181,-5.43182 0,-5 0.0227,-12.36932 0.0227,-18.02272 -3,-1 -8.88636,-1.06818 -10.56818,-3.93182 -1.68182,-2.86364 -2.82242,-11.52314 -0.90909,-16.45455 1.91333,-4.93141 2.19789,-1.96234 3.59091,0.90909 1.39302,2.87144 4.7461,2.98898 6.58539,-1.78604 1.8393,-4.77501 2.86364,-4.06381 4.96006,0.69514 2.09643,4.75894 5.54451,3.43666 6.81771,0.003 1.2732,-3.4339 1.81314,-4.52387 3.22223,0.88522 1.40909,5.4091 0.61431,12.64834 -1.61296,16.51198 -2.22728,3.86364 -7.04061,2.07732 -10.04061,3.07732 0,4 0.008,11.72136 -0.0147,14.22136 -0.0227,2.5 2.86044,6.0348 6.86231,1.86349 4.00188,-4.17131 8.30848,-9.30255 14.25823,-14.19951 0.62884,5.7684 1.08601,9.83992 -1.24866,13.98161 -2.33468,4.14168 -12.7792,7.16424 -20.49355,7.6785 z m -23.84091,-9.93182 c -1.50021,-6.34153 -0.6834,-8.97396 -0.5909,-13.40909 3.86523,2.15578 10.57786,9.64636 15.04545,14.13637 0.0613,3.3669 0.0455,5.13637 0.0455,9.13637 -5.54884,-0.63642 -13.09069,-3.70394 -14.5,-9.86365 z"
          style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
+         d="m 414.585,185.6229 c -1.86363,0.13637 -1.11363,0.70455 -1.43181,-5.43182 0,-5 0.0227,-12.36932 0.0227,-18.02272 -3,-1 -8.88636,-1.06818 -10.56818,-3.93182 -1.68182,-2.86364 -2.82242,-11.52314 -0.90909,-16.45455 1.91333,-4.93141 2.19789,-1.96234 3.59091,0.90909 1.39302,2.87144 4.7461,2.98898 6.58539,-1.78604 1.8393,-4.77501 2.86364,-4.06381 4.96006,0.69514 2.09643,4.75894 5.54451,3.43666 6.81771,0.003 1.2732,-3.4339 1.81314,-4.52387 3.22223,0.88522 1.40909,5.4091 0.61431,12.64834 -1.61296,16.51198 -2.22728,3.86364 -7.04061,2.07732 -10.04061,3.07732 0,4 0.008,11.72136 -0.0147,14.22136 -0.0227,2.5 2.86044,6.0348 6.86231,1.86349 4.00188,-4.17131 8.30848,-9.30255 14.25823,-14.19951 0.62884,5.7684 1.08601,9.83992 -1.24866,13.98161 -2.33468,4.14168 -12.7792,7.16424 -20.49355,7.6785 z m -23.84091,-9.93182 c -1.50021,-6.34153 -0.6834,-8.97396 -0.5909,-13.40909 3.86523,2.15578 10.57786,9.64636 15.04545,14.13637 0.0613,3.3669 0.0455,5.13637 0.0455,9.13637 -5.54884,-0.63642 -13.09069,-3.70394 -14.5,-9.86365 z"
+         id="path3464-9" />
     </g>
   </g>
   <metadata
@@ -398,7 +296,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Macro</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Mirror.svg b/src/Mod/Draft/Resources/icons/Draft_Mirror.svg
index 7d35df5637..e746935904 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Mirror.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Mirror.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,395 +6,306 @@
    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"
+   version="1.1"
    id="svg2766"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Mirror.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2768">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4087">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop4089"
          offset="0"
-         id="stop4089" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop4091"
          offset="1"
-         id="stop4091" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4004">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop4006"
          offset="0"
-         id="stop4006" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop4008"
          offset="1"
-         id="stop4008" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3787">
       <stop
-         id="stop3789"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3789" />
       <stop
-         id="stop3791"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3791" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864">
       <stop
-         id="stop3866"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866" />
       <stop
-         id="stop3868"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868" />
     </linearGradient>
-    <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="perspective2774" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3524-5"
-       gradientUnits="userSpaceOnUse"
-       x1="581.26331"
-       y1="126.79625"
-       x2="609.54919"
+       gradientTransform="matrix(1.0614931,0,0,1,-617.05296,-100.11156)"
        y2="100.10708"
-       gradientTransform="matrix(1.0614931,0,0,1,-617.05296,-100.11156)" />
+       x2="609.54919"
+       y1="126.79625"
+       x1="581.26331"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3524-5"
+       xlink:href="#linearGradient3787" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4004"
-       id="linearGradient4010"
-       x1="18.199173"
-       y1="47.870518"
-       x2="16"
+       gradientUnits="userSpaceOnUse"
        y2="28"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4004-9"
-       id="linearGradient4010-0"
-       x1="18.199173"
+       x2="16"
        y1="47.870518"
-       x2="14.614764"
-       y2="23.571756"
-       gradientUnits="userSpaceOnUse" />
+       x1="18.199173"
+       id="linearGradient4010"
+       xlink:href="#linearGradient4004" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="23.571756"
+       x2="14.614764"
+       y1="47.870518"
+       x1="18.199173"
+       id="linearGradient4010-0"
+       xlink:href="#linearGradient4004-9" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient4004-9">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop4006-4"
          offset="0"
-         id="stop4006-4" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop4008-8"
          offset="1"
-         id="stop4008-8" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(-1,0,0,1,64,6.1e-7)"
-       y2="27"
-       x2="21"
-       y1="48"
-       x1="14"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4028"
        xlink:href="#linearGradient4004-9"
-       inkscape:collect="always" />
+       id="linearGradient4028"
+       gradientUnits="userSpaceOnUse"
+       x1="14"
+       y1="48"
+       x2="21"
+       y2="27"
+       gradientTransform="matrix(-1,0,0,1,64,6.1e-7)" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4087"
-       id="linearGradient4093"
-       x1="37"
-       y1="53"
-       x2="27"
+       gradientUnits="userSpaceOnUse"
        y2="8"
-       gradientUnits="userSpaceOnUse" />
+       x2="27"
+       y1="53"
+       x1="37"
+       id="linearGradient4093"
+       xlink:href="#linearGradient4087" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3856"
-       id="linearGradient3862"
-       x1="613.25824"
-       y1="135.1946"
-       x2="595.35895"
+       gradientUnits="userSpaceOnUse"
        y2="68.194603"
-       gradientUnits="userSpaceOnUse" />
+       x2="595.35895"
+       y1="135.1946"
+       x1="613.25824"
+       id="linearGradient3862"
+       xlink:href="#linearGradient3856" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3856">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1"
+         id="stop3858"
          offset="0"
-         id="stop3858" />
+         style="stop-color:#3465a4;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3860"
          offset="1"
-         id="stop3860" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-111.3219)"
-       y2="84.926308"
-       x2="627.38928"
-       y1="96.267776"
-       x1="633.98376"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3040"
        xlink:href="#linearGradient3856"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-99.321897)"
-       y2="84.194603"
-       x2="628.33136"
-       y1="120.1946"
-       x1="636.81"
+       id="linearGradient3040"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3040-5"
-       xlink:href="#linearGradient3856-1"
-       inkscape:collect="always" />
+       x1="633.98376"
+       y1="96.267776"
+       x2="627.38928"
+       y2="84.926308"
+       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-111.3219)" />
+    <linearGradient
+       xlink:href="#linearGradient3856-1"
+       id="linearGradient3040-5"
+       gradientUnits="userSpaceOnUse"
+       x1="636.81"
+       y1="120.1946"
+       x2="628.33136"
+       y2="84.194603"
+       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-99.321897)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3856-1">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1"
+         id="stop3858-7"
          offset="0"
-         id="stop3858-7" />
+         style="stop-color:#3465a4;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3860-1"
          offset="1"
-         id="stop3860-1" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-99.321897)"
-       y2="84.194603"
-       x2="628.33136"
-       y1="120.1946"
-       x1="636.81"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3040-52"
        xlink:href="#linearGradient3856-7"
-       inkscape:collect="always" />
+       id="linearGradient3040-52"
+       gradientUnits="userSpaceOnUse"
+       x1="636.81"
+       y1="120.1946"
+       x2="628.33136"
+       y2="84.194603"
+       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-99.321897)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3856-7">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1"
+         id="stop3858-6"
          offset="0"
-         id="stop3858-6" />
+         style="stop-color:#3465a4;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3860-14"
          offset="1"
-         id="stop3860-14" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-99.321897)"
-       y2="84.194603"
-       x2="628.33136"
-       y1="120.1946"
-       x1="636.81"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3040-2"
        xlink:href="#linearGradient3856-2"
-       inkscape:collect="always" />
+       id="linearGradient3040-2"
+       gradientUnits="userSpaceOnUse"
+       x1="636.81"
+       y1="120.1946"
+       x2="628.33136"
+       y2="84.194603"
+       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-99.321897)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3856-2">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1"
+         id="stop3858-1"
          offset="0"
-         id="stop3858-1" />
+         style="stop-color:#3465a4;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3860-6"
          offset="1"
-         id="stop3860-6" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="84.926308"
-       x2="628.33136"
-       y1="96.267776"
-       x1="633.98376"
-       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-95.3219)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4185"
        xlink:href="#linearGradient3856-2"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-99.321897)"
-       y2="84.194603"
-       x2="628.33136"
-       y1="120.1946"
-       x1="636.81"
+       id="linearGradient4185"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3040-7"
-       xlink:href="#linearGradient3856-6"
-       inkscape:collect="always" />
+       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-95.3219)"
+       x1="633.98376"
+       y1="96.267776"
+       x2="628.33136"
+       y2="84.926308" />
+    <linearGradient
+       xlink:href="#linearGradient3856-6"
+       id="linearGradient3040-7"
+       gradientUnits="userSpaceOnUse"
+       x1="636.81"
+       y1="120.1946"
+       x2="628.33136"
+       y2="84.194603"
+       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-99.321897)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3856-6">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1"
+         id="stop3858-18"
          offset="0"
-         id="stop3858-18" />
+         style="stop-color:#3465a4;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3860-9"
          offset="1"
-         id="stop3860-9" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="84.194603"
-       x2="628.33136"
-       y1="96.267776"
-       x1="634.92584"
-       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-63.3219)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4185-2"
        xlink:href="#linearGradient3856-2-7"
-       inkscape:collect="always" />
+       id="linearGradient4185-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-63.3219)"
+       x1="634.92584"
+       y1="96.267776"
+       x2="628.33136"
+       y2="84.194603" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3856-2-7">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1"
+         id="stop3858-1-9"
          offset="0"
-         id="stop3858-1-9" />
+         style="stop-color:#3465a4;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3860-6-5"
          offset="1"
-         id="stop3860-6-5" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="84.926308"
-       x2="628.33136"
-       y1="96.267776"
-       x1="634.92584"
-       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-79.3219)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4228"
        xlink:href="#linearGradient3856-6"
-       inkscape:collect="always" />
+       id="linearGradient4228"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0614931,0,0,1.3225807,-638.96941,-79.3219)"
+       x1="634.92584"
+       y1="96.267776"
+       x2="628.33136"
+       y2="84.926308" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.116667"
-     inkscape:cx="15.583208"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:object-paths="true"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2996"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="fill:url(#linearGradient4010);stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-       d="M 23,11 23,49 3,49 z"
        id="path3984"
-       inkscape:connector-curvature="0" />
+       d="M 23,11 23,49 3,49 z"
+       style="fill:url(#linearGradient4010);stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:17;stroke-opacity:1;stroke-dasharray:none"
-       d="M 21,19 21,47 6.2954545,47 z"
        id="path3984-4"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       d="M 21,19 21,47 6.2954545,47 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:17;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:url(#linearGradient4028);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="m 41,11 0,38 20,0 z"
        id="path3984-8"
-       inkscape:connector-curvature="0" />
+       d="m 41,11 0,38 20,0 z"
+       style="fill:url(#linearGradient4028);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:17;stroke-opacity:1;stroke-dasharray:none"
-       d="m 43,19 0,28 14.704546,0 z"
        id="path3984-4-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       d="m 43,19 0,28 14.704546,0 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:17;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       id="rect3446"
-       d="m 29,3 0,10 6,0 0,-10 z"
        style="fill:url(#linearGradient3040);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="m 29,3 0,10 6,0 0,-10 z"
+       id="rect3446" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 31,12 31,4"
        id="path3840"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       d="M 31,12 31,4"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       id="rect3446-8"
-       d="m 29,19 0,10 6,0 0,-10 z"
        style="fill:url(#linearGradient4185);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="m 29,19 0,10 6,0 0,-10 z"
+       id="rect3446-8" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 31,28 0,-8"
        id="path3840-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       d="m 31,28 0,-8"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       id="rect3446-4"
-       d="m 29,35 0,10 6,0 0,-10 z"
        style="fill:url(#linearGradient4228);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="m 29,35 0,10 6,0 0,-10 z"
+       id="rect3446-4" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 31,44 0,-8"
        id="path3840-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       d="m 31,44 0,-8"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       id="rect3446-8-1"
-       d="m 29,51 0,10 6,0 0,-10 z"
        style="fill:url(#linearGradient4185-2);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="m 29,51 0,10 6,0 0,-10 z"
+       id="rect3446-8-1" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 31,60 0,-8"
        id="path3840-5-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       d="m 31,60 0,-8"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
   <metadata
      id="metadata4961">
@@ -406,7 +315,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Mirror</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Sat Dec 5 14:19:35 2015 -0200</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Move.svg b/src/Mod/Draft/Resources/icons/Draft_Move.svg
index ce01222974..51b5bb786a 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Move.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Move.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,316 +6,207 @@
    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"
+   version="1.1"
    id="svg2963"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Move.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2965">
     <linearGradient
        id="linearGradient3354">
       <stop
-         style="stop-color:#2157c7;stop-opacity:1;"
+         id="stop3356"
          offset="0"
-         id="stop3356" />
+         style="stop-color:#2157c7;stop-opacity:1;" />
       <stop
-         style="stop-color:#6daaff;stop-opacity:1;"
+         id="stop3358"
          offset="1"
-         id="stop3358" />
+         style="stop-color:#6daaff;stop-opacity:1;" />
     </linearGradient>
-    <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="perspective2971" />
     <linearGradient
-       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)"
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3036"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
+       id="linearGradient3036"
+       gradientUnits="userSpaceOnUse"
+       x1="56.172409"
+       y1="29.279999"
+       x2="21.689653"
+       y2="36.079998"
+       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientTransform="matrix(0,-0.58000003,0.58823527,0,13.176471,38.379999)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3918-3"
        xlink:href="#linearGradient3895-6"
-       inkscape:collect="always" />
+       id="linearGradient3918-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-0.58000003,0.58823527,0,13.176471,38.379999)"
+       x1="56.172409"
+       y1="29.279999"
+       x2="21.689653"
+       y2="36.079998" />
     <linearGradient
        id="linearGradient3895-6">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897-7"
          offset="0"
-         id="stop3897-7" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899-5"
          offset="1"
-         id="stop3899-5" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientTransform="matrix(0.58000003,0,0,0.58823527,25.620001,13.176471)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3029-6"
        xlink:href="#linearGradient3895-6-2"
-       inkscape:collect="always" />
+       id="linearGradient3029-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.58000003,0,0,0.58823527,25.620001,13.176471)"
+       x1="56.172409"
+       y1="29.279999"
+       x2="21.689653"
+       y2="36.079998" />
     <linearGradient
        id="linearGradient3895-6-2">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897-7-9"
          offset="0"
-         id="stop3897-7-9" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899-5-1"
          offset="1"
-         id="stop3899-5-1" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientTransform="matrix(0,-0.58000003,0.58823527,0,13.176471,38.379999)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3918-0"
        xlink:href="#linearGradient3895-9"
-       inkscape:collect="always" />
+       id="linearGradient3918-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,-0.58000003,0.58823527,0,13.176471,38.379999)"
+       x1="56.172409"
+       y1="29.279999"
+       x2="21.689653"
+       y2="36.079998" />
     <linearGradient
        id="linearGradient3895-9">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897-3"
          offset="0"
-         id="stop3897-3" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899-6"
          offset="1"
-         id="stop3899-6" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3154"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,-0.58000003,0.58823527,0,13.176471,38.379999)"
-       x1="45.482754"
-       y1="11.599999"
+       y2="52.400002"
        x2="-23.482759"
-       y2="52.400002" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-6-2"
-       id="linearGradient3156"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.58000003,0,0,0.58823527,38.379999,13.176471)"
-       x1="31.689651"
-       y1="-2.0000007"
-       x2="-9.6896563"
-       y2="66" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-6"
-       id="linearGradient3158"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.58000003,0,0,0.58823527,25.620001,13.176471)"
-       x1="-9.6896563"
-       y1="-2.0000007"
-       x2="31.689651"
-       y2="66" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-9"
-       id="linearGradient3160"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,0.58000003,0.58823527,0,13.176471,25.620001)"
-       x1="-23.482759"
        y1="11.599999"
+       x1="45.482754"
+       gradientTransform="matrix(0,-0.58000003,0.58823527,0,13.176471,38.379999)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3154"
+       xlink:href="#linearGradient3895" />
+    <linearGradient
+       y2="66"
+       x2="-9.6896563"
+       y1="-2.0000007"
+       x1="31.689651"
+       gradientTransform="matrix(-0.58000003,0,0,0.58823527,38.379999,13.176471)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3156"
+       xlink:href="#linearGradient3895-6-2" />
+    <linearGradient
+       y2="66"
+       x2="31.689651"
+       y1="-2.0000007"
+       x1="-9.6896563"
+       gradientTransform="matrix(0.58000003,0,0,0.58823527,25.620001,13.176471)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3158"
+       xlink:href="#linearGradient3895-6" />
+    <linearGradient
+       y2="52.400002"
        x2="45.482754"
-       y2="52.400002" />
+       y1="11.599999"
+       x1="-23.482759"
+       gradientTransform="matrix(0,0.58000003,0.58823527,0,13.176471,25.620001)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3160"
+       xlink:href="#linearGradient3895-9" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-9"
+       gradientUnits="userSpaceOnUse"
+       y2="52"
+       x2="44"
+       y1="12"
+       x1="20"
        id="linearGradient3936"
-       x1="20"
-       y1="12"
-       x2="44"
-       y2="52"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3895-9" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-9"
-       id="linearGradient3944"
-       x1="20"
-       y1="12"
-       x2="44"
+       gradientUnits="userSpaceOnUse"
        y2="52"
-       gradientUnits="userSpaceOnUse" />
+       x2="44"
+       y1="12"
+       x1="20"
+       id="linearGradient3944"
+       xlink:href="#linearGradient3895-9" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="21.49082"
-     inkscape:cy="36.860521"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-global="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3009"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3011"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039"
-       color="#ff0000"
-       opacity="0.1254902" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <rect
-       style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
-       id="rect3126"
-       width="12"
-       height="6"
+       y="29"
        x="26"
-       y="29" />
+       height="6"
+       width="12"
+       id="rect3126"
+       style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none" />
     <rect
-       style="fill:url(#linearGradient3944);fill-opacity:1;stroke:none"
-       id="rect3126-2"
-       width="6"
-       height="11.999999"
+       y="26"
        x="29"
-       y="26" />
+       height="11.999999"
+       width="6"
+       id="rect3126-2"
+       style="fill:url(#linearGradient3944);fill-opacity:1;stroke:none" />
     <g
-       id="g4351"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/move.png"
-       inkscape:export-xdpi="6.5591564"
-       inkscape:export-ydpi="6.5591564"
-       transform="matrix(0.1378133,0,0,0.1378133,-221.39699,-138.35275)" />
+       transform="matrix(0.1378133,0,0,0.1378133,-221.39699,-138.35275)"
+       id="g4351" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3154);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 37,28 0,-15 6,0 -11,-10 -11,10 6,0 0,15"
        id="path3343"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 37,28 0,-15 6,0 -11,-10 -11,10 6,0 0,15"
+       style="fill:url(#linearGradient3154);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 35,29 35,11 37.831259,11 32,5.7026937 26.168741,11 29,11 29,29"
        id="path3343-2"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 35,29 35,11 37.831259,11 32,5.7026937 26.168741,11 29,11 29,29"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3158);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 37,37 14,0 0,6 10,-11 -10,-11 0,6 -14,0"
        id="path3343-3"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 37,37 14,0 0,6 10,-11 -10,-11 0,6 -14,0"
+       style="fill:url(#linearGradient3158);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 35,35 18,0 0,2.831259 L 58.297306,32 53,26.168741 53,29 34,29"
        id="path3343-2-5"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 35,35 18,0 0,2.831259 L 58.297306,32 53,26.168741 53,29 34,29"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3156);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 27,37 -14,0 0,6 -10,-11 10,-11 0,6 14,0"
        id="path3343-3-2"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 27,37 -14,0 0,6 -10,-11 10,-11 0,6 14,0"
+       style="fill:url(#linearGradient3156);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 29,35 11,35 11,37.831259 5.702694,32 11,26.168741 11,29 30,29"
        id="path3343-2-5-7"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 29,35 11,35 11,37.831259 5.702694,32 11,26.168741 11,29 30,29"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3160);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 37,36 0,15 6,0 -11,10 -11,-10 6,0 0,-15"
        id="path3343-0"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 37,36 0,15 6,0 -11,10 -11,-10 6,0 0,-15"
+       style="fill:url(#linearGradient3160);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 35,34 0,19 2.831259,0 L 32,58.297306 26.168741,53 29,53 29,34"
        id="path3343-2-6"
-       sodipodi:nodetypes="ccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 35,34 0,19 2.831259,0 L 32,58.297306 26.168741,53 29,53 29,34"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <metadata
      id="metadata5006">
@@ -327,7 +216,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Move</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Offset.svg b/src/Mod/Draft/Resources/icons/Draft_Offset.svg
index 8efcc6fa88..f4d9cad1d2 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Offset.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Offset.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,176 +6,108 @@
    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"
+   version="1.1"
    id="svg3136"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Offset.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs3138">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3802">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3804"
          offset="0"
-         id="stop3804" />
+         style="stop-color:#729fcf;stop-opacity:1" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3806"
          offset="1"
-         id="stop3806" />
+         style="stop-color:#204a87;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841">
       <stop
-         style="stop-color:#0619c0;stop-opacity:1;"
+         id="stop3843"
          offset="0"
-         id="stop3843" />
+         style="stop-color:#0619c0;stop-opacity:1;" />
       <stop
-         style="stop-color:#379cfb;stop-opacity:1;"
+         id="stop3845"
          offset="1"
-         id="stop3845" />
+         style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841"
-       id="linearGradient4243"
-       x1="19.25"
-       y1="31.75"
-       x2="37"
+       gradientTransform="translate(1,0)"
+       gradientUnits="userSpaceOnUse"
        y2="31.75"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,0)" />
+       x2="37"
+       y1="31.75"
+       x1="19.25"
+       id="linearGradient4243"
+       xlink:href="#linearGradient3841" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841"
-       id="linearGradient4246"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.1390891,0,0,0.1390891,-116.65366,-325.33528)"
-       x1="844.9165"
-       y1="2560.25"
+       y2="2560.25"
        x2="1270.7085"
-       y2="2560.25" />
+       y1="2560.25"
+       x1="844.9165"
+       gradientTransform="matrix(0.1390891,0,0,0.1390891,-116.65366,-325.33528)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4246"
+       xlink:href="#linearGradient3841" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3802"
+       gradientTransform="translate(1,0)"
+       gradientUnits="userSpaceOnUse"
+       y2="56"
+       x2="44"
+       y1="4"
+       x1="29"
        id="linearGradient3808"
-       x1="29"
-       y1="4"
-       x2="44"
-       y2="56"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(1,0)" />
+       xlink:href="#linearGradient3802" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3802-5"
+       gradientTransform="matrix(0.35072612,0,0,0.35072612,18.762241,21.142012)"
+       gradientUnits="userSpaceOnUse"
+       y2="56"
+       x2="44"
+       y1="4"
+       x1="29"
        id="linearGradient3808-7"
-       x1="29"
-       y1="4"
-       x2="44"
-       y2="56"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.35072612,0,0,0.35072612,18.762241,21.142012)" />
+       xlink:href="#linearGradient3802-5" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3802-5">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3804-3"
          offset="0"
-         id="stop3804-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3806-5"
          offset="1"
-         id="stop3806-5" />
+         style="stop-color:#204a87;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.4135726"
-     inkscape:cx="2.5228833"
-     inkscape:cy="21.53794"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4167"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid2994"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 8,19 19,8 54,8 54,34 c 0,9 -8,22 -24,22"
        id="path2996"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:url(#linearGradient3808);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
        d="M 8,19 19,8 54,8 54,34 c 0,9 -8,22 -24,22"
+       style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
        id="path2996-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 8,19 19,8 54,8 54,34 c 0,9 -8,22 -24,22"
+       style="fill:none;stroke:url(#linearGradient3808);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 7.03125,18.59375 18.6875,6.9375 54.353553,7 M 53,11 53,33 c 0,9 -7,22 -23,22"
        id="path2996-3-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 7.03125,18.59375 18.6875,6.9375 54.353553,7 M 53,11 53,33 c 0,9 -7,22 -23,22"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#0b1521;stroke-width:8.00000095;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 21,28 25.075311,23.947821 38,24 l 0,9 c 0,3.156535 -3.388382,8 -9,8"
        id="path2996-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 21,28 25.075311,23.947821 38,24 l 0,9 c 0,3.156535 -3.388382,8 -9,8"
+       style="fill:none;stroke:#0b1521;stroke-width:8.00000095;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:url(#linearGradient3808-7);stroke-width:4.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 21,28 25.075311,23.947821 38,24 38,33.118879 C 38,36.275414 34.611618,41 29,41"
        id="path2996-3-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 21,28 25.075311,23.947821 38,24 38,33.118879 C 38,36.275414 34.611618,41 29,41"
+       style="fill:none;stroke:url(#linearGradient3808-7);stroke-width:4.00000048;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 20.158808,27.44735 25,23 38,23 M 37,27.096525 37,32 c 0,4 -3,8 -8,8"
        id="path2996-3-6-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
+       d="M 20.158808,27.44735 25,23 38,23 M 37,27.096525 37,32 c 0,4 -3,8 -8,8"
+       style="fill:none;stroke:#729fcf;stroke-width:2.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
   </g>
   <metadata
      id="metadata5033">
@@ -187,7 +117,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Offset</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_PathArray.svg b/src/Mod/Draft/Resources/icons/Draft_PathArray.svg
index 7f9ed14c2e..bda9697e14 100644
--- a/src/Mod/Draft/Resources/icons/Draft_PathArray.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_PathArray.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -9,538 +7,434 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_PathArray.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4711"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4707"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4703"
-       is_visible="true" />
     <linearGradient
-       id="linearGradient5419"
-       osb:paint="solid">
+       osb:paint="solid"
+       id="linearGradient5419">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop5421"
          offset="0"
-         id="stop5421" />
+         style="stop-color:#000000;stop-opacity:1;" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5225"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96" />
       <stop
-         id="stop3148-4"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5301"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-8-4"
-       id="radialGradient4339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4339"
+       xlink:href="#linearGradient3144-8-4" />
     <linearGradient
        id="linearGradient3144-8-4">
       <stop
-         id="stop3146-96-8"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96-8" />
       <stop
-         id="stop3148-4-0"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4-0" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5377"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3"
-       id="linearGradient4567"
-       x1="324.44156"
-       y1="225.43279"
-       x2="355.91556"
+       gradientUnits="userSpaceOnUse"
        y2="225.43279"
-       gradientUnits="userSpaceOnUse" />
+       x2="355.91556"
+       y1="225.43279"
+       x1="324.44156"
+       id="linearGradient4567"
+       xlink:href="#linearGradient3841-3" />
     <linearGradient
        id="linearGradient3841-3">
       <stop
-         id="stop3843-15"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15" />
       <stop
-         id="stop3845-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3"
-       id="linearGradient5512"
-       x1="323.83154"
-       y1="225.43279"
-       x2="356.52557"
+       gradientUnits="userSpaceOnUse"
        y2="225.43279"
-       gradientUnits="userSpaceOnUse" />
+       x2="356.52557"
+       y1="225.43279"
+       x1="323.83154"
+       id="linearGradient5512"
+       xlink:href="#linearGradient3841-3" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6"
-       id="radialGradient5536-6"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse" />
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       id="radialGradient5536-6"
+       xlink:href="#linearGradient3841-3-6" />
     <linearGradient
        id="linearGradient3841-3-6">
       <stop
-         id="stop3843-15-0"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0" />
       <stop
-         id="stop3845-8-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7" />
     </linearGradient>
     <radialGradient
-       r="18.080753"
-       fy="33.923443"
-       fx="-3.5461323"
-       cy="33.923443"
-       cx="-3.5461323"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5571"
        xlink:href="#linearGradient3841-3-6"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-1"
-       id="radialGradient5536-65"
+       id="radialGradient5571"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
        cx="-3.5461323"
        cy="33.923443"
        fx="-3.5461323"
        fy="33.923443"
-       r="18.080753"
+       r="18.080753" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse" />
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       id="radialGradient5536-65"
+       xlink:href="#linearGradient3841-3-1" />
     <linearGradient
        id="linearGradient3841-3-1">
       <stop
-         id="stop3843-15-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-7" />
       <stop
-         id="stop3845-8-3"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-3" />
     </linearGradient>
     <radialGradient
-       r="18.080753"
-       fy="33.923443"
-       fx="-3.5461323"
-       cy="33.923443"
-       cx="-3.5461323"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5571-0"
        xlink:href="#linearGradient3841-3-6-1"
-       inkscape:collect="always" />
+       id="radialGradient5571-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
     <linearGradient
        id="linearGradient3841-3-6-1">
       <stop
-         id="stop3843-15-0-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-3" />
       <stop
-         id="stop3845-8-7-0"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-0" />
     </linearGradient>
     <radialGradient
-       r="18.080753"
-       fy="33.923443"
-       fx="-3.5461323"
-       cy="33.923443"
-       cx="-3.5461323"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5644"
        xlink:href="#linearGradient3841-3-6-1"
-       inkscape:collect="always" />
-    <radialGradient
-       r="18.080753"
-       fy="33.923443"
-       fx="-3.5461323"
-       cy="33.923443"
-       cx="-3.5461323"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       id="radialGradient5644"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient5571-05"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
+    <radialGradient
        xlink:href="#linearGradient3841-3-6-2"
-       inkscape:collect="always" />
+       id="radialGradient5571-05"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
     <linearGradient
        id="linearGradient3841-3-6-2">
       <stop
-         id="stop3843-15-0-8"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-8" />
       <stop
-         id="stop3845-8-7-3"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-3" />
     </linearGradient>
     <radialGradient
-       r="18.080753"
-       fy="33.923443"
-       fx="-3.5461323"
-       cy="33.923443"
-       cx="-3.5461323"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5571-7"
        xlink:href="#linearGradient3841-3-6-9"
-       inkscape:collect="always" />
+       id="radialGradient5571-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
     <linearGradient
        id="linearGradient3841-3-6-9">
       <stop
-         id="stop3843-15-0-4"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-4" />
       <stop
-         id="stop3845-8-7-4"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-4" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3841-3-6-9"
+       id="radialGradient5644-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
     <radialGradient
        r="18.080753"
        fy="33.923443"
@@ -549,104 +443,96 @@
        cx="-3.5461323"
        gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient5644-0"
-       xlink:href="#linearGradient3841-3-6-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6"
        id="radialGradient6075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
+       xlink:href="#linearGradient3841-3-6" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-1"
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient6077"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
+       xlink:href="#linearGradient3841-3-6-1" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9"
-       id="radialGradient6079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
+       r="18.080753"
        fy="33.923443"
-       r="18.080753" />
-    <linearGradient
-       y2="225.43279"
-       x2="355.91556"
-       y1="225.43279"
-       x1="324.44156"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient5390"
+       id="radialGradient6079"
+       xlink:href="#linearGradient3841-3-6-9" />
+    <linearGradient
        xlink:href="#linearGradient3841-3-8"
-       inkscape:collect="always" />
+       id="linearGradient5390"
+       gradientUnits="userSpaceOnUse"
+       x1="324.44156"
+       y1="225.43279"
+       x2="355.91556"
+       y2="225.43279" />
     <linearGradient
        id="linearGradient3841-3-8">
       <stop
-         id="stop3843-15-2"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-2" />
       <stop
-         id="stop3845-8-9"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-9" />
     </linearGradient>
     <linearGradient
-       y2="225.43279"
-       x2="355.91556"
-       y1="225.43279"
-       x1="324.44156"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6107"
        xlink:href="#linearGradient3841-3-8"
-       inkscape:collect="always" />
+       id="linearGradient6107"
+       gradientUnits="userSpaceOnUse"
+       x1="324.44156"
+       y1="225.43279"
+       x2="355.91556"
+       y2="225.43279" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9"
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3270"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
+       xlink:href="#linearGradient3841-3-6-9" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-4"
-       id="radialGradient3270-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
+       r="18.080753"
        fy="33.923443"
-       r="18.080753" />
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3270-5"
+       xlink:href="#linearGradient3841-3-6-9-4" />
     <linearGradient
        id="linearGradient3841-3-6-9-4">
       <stop
-         id="stop3843-15-0-4-8"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-4-8" />
       <stop
-         id="stop3845-8-7-4-2"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-4-2" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3841-3-6-9-4"
+       id="radialGradient3287"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
     <radialGradient
        r="18.080753"
        fy="33.923443"
@@ -655,30 +541,79 @@
        cx="-3.5461323"
        gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3287"
-       xlink:href="#linearGradient3841-3-6-9-4"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-45"
        id="radialGradient3270-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
+       xlink:href="#linearGradient3841-3-6-9-45" />
     <linearGradient
        id="linearGradient3841-3-6-9-45">
       <stop
-         id="stop3843-15-0-4-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-4-5" />
       <stop
-         id="stop3845-8-7-4-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-4-8" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3841-3-6-9-45"
+       id="radialGradient3287-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
+    <radialGradient
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3292"
+       xlink:href="#linearGradient3841-3-6-9" />
+    <radialGradient
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3294"
+       xlink:href="#linearGradient3841-3-6-9-4" />
+    <radialGradient
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3296"
+       xlink:href="#linearGradient3841-3-6-9-45" />
+    <radialGradient
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3301-9"
+       xlink:href="#linearGradient3841-3-6-9-8" />
+    <linearGradient
+       id="linearGradient3841-3-6-9-8">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3843-15-0-4-81" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3845-8-7-4-3" />
     </linearGradient>
     <radialGradient
        r="18.080753"
@@ -688,369 +623,251 @@
        cx="-3.5461323"
        gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3287-3"
-       xlink:href="#linearGradient3841-3-6-9-45"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9"
-       id="radialGradient3292"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-4"
-       id="radialGradient3294"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-45"
-       id="radialGradient3296"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-8"
-       id="radialGradient3301-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
-    <linearGradient
-       id="linearGradient3841-3-6-9-8">
-      <stop
-         id="stop3843-15-0-4-81"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3845-8-7-4-3"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-7"
        id="radialGradient3301-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
+       xlink:href="#linearGradient3841-3-6-9-7" />
     <linearGradient
        id="linearGradient3841-3-6-9-7">
       <stop
-         id="stop3843-15-0-4-2"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-4-2" />
       <stop
-         id="stop3845-8-7-4-32"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-4-32" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6"
-       id="linearGradient3797-3"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-3"
+       xlink:href="#linearGradient3791-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7"
          offset="0"
-         id="stop3793-7" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5"
          offset="1"
-         id="stop3795-5" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834"
        xlink:href="#linearGradient3791-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791"
-       id="linearGradient3797"
+       id="linearGradient3834"
+       gradientUnits="userSpaceOnUse"
        x1="939.98767"
        y1="1097.5122"
        x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       y2="989.77716" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797"
+       xlink:href="#linearGradient3791" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793"
          offset="0"
-         id="stop3793" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795"
          offset="1"
-         id="stop3795" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3896"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-7"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3797-36"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-7">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-5"
          offset="0"
-         id="stop3793-5" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-3"
          offset="1"
-         id="stop3795-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-9"
-       id="linearGradient3797-3-0"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-3-0"
+       xlink:href="#linearGradient3791-6-9" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6-9">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7-3"
          offset="0"
-         id="stop3793-7-3" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5-6"
          offset="1"
-         id="stop3795-5-6" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834-0"
        xlink:href="#linearGradient3791-6-9"
-       inkscape:collect="always" />
+       id="linearGradient3834-0"
+       gradientUnits="userSpaceOnUse"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-0"
-       id="linearGradient3797-3-2"
-       x1="896.17792"
-       y1="1050.1741"
-       x2="937.06708"
+       gradientUnits="userSpaceOnUse"
        y2="1030.5859"
-       gradientUnits="userSpaceOnUse" />
+       x2="937.06708"
+       y1="1050.1741"
+       x1="896.17792"
+       id="linearGradient3797-3-2"
+       xlink:href="#linearGradient3791-6-0" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6-0">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7-2"
          offset="0"
-         id="stop3793-7-2" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5-3"
          offset="1"
-         id="stop3795-5-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="1037.1154"
-       x2="937.06708"
-       y1="1050.1741"
-       x1="896.17792"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834-7"
        xlink:href="#linearGradient3791-6-0"
-       inkscape:collect="always" />
+       id="linearGradient3834-7"
+       gradientUnits="userSpaceOnUse"
+       x1="896.17792"
+       y1="1050.1741"
+       x2="937.06708"
+       y2="1037.1154" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.7707698"
-     inkscape:cx="-14.68784"
-     inkscape:cy="29.659264"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3185"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 9,48 C 20,48 32,48 32,31 32,14 44,14 55,14"
        id="path3347"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:none;stroke:#eeeeec;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="M 9,48 C 20,48 32,48 32,31 32,14 44,14 55,14"
+       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3347-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       d="M 9,48 C 20,48 32,48 32,31 32,14 44,14 55,14"
+       style="fill:none;stroke:#eeeeec;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <g
-       transform="matrix(0.11724541,0,0,0.12538745,-103.41875,-91.213827)"
-       id="g3799-3">
+       id="g3799-3"
+       transform="matrix(0.11724541,0,0,0.12538745,-103.41875,-91.213827)">
       <g
          id="g3956-5">
         <g
-           id="g3812-6"
+           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1"
            transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1">
+           id="g3812-6">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
              id="rect3808-2"
-             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
         <g
-           id="g3812-0-9"
+           style="fill:url(#linearGradient3797-3);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-           style="fill:url(#linearGradient3797-3);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+           id="g3812-0-9">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:url(#linearGradient3834);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
              id="rect3808-6-1"
-             style="fill:url(#linearGradient3834);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
       </g>
     </g>
     <g
-       transform="matrix(0.11724541,0,0,0.12538745,-57.418732,-125.21383)"
-       id="g3799-3-2">
+       id="g3799-3-2"
+       transform="matrix(0.11724541,0,0,0.12538745,-57.418732,-125.21383)">
       <g
          id="g3956-5-6">
         <g
-           id="g3812-6-1"
+           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1"
            transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1">
+           id="g3812-6-1">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
              id="rect3808-2-8"
-             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
         <g
-           id="g3812-0-9-7"
+           style="fill:url(#linearGradient3797-3-0);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-           style="fill:url(#linearGradient3797-3-0);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+           id="g3812-0-9-7">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:url(#linearGradient3834-0);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
              id="rect3808-6-1-9"
-             style="fill:url(#linearGradient3834-0);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
       </g>
     </g>
     <path
-       inkscape:connector-curvature="0"
-       id="path4678-5"
+       style="fill:#2e76ff;fill-opacity:1;stroke:#000343;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="m 22.756108,33.610146 17.549857,0 0,-8.305601 -17.549857,0 z"
-       style="fill:#2e76ff;fill-opacity:1;stroke:#000343;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       id="path4678-5" />
     <g
-       transform="matrix(0,-0.11724541,0.12538745,0,-107.21383,143.41875)"
-       id="g3799-3-9">
+       id="g3799-3-9"
+       transform="matrix(0,-0.11724541,0.12538745,0,-107.21383,143.41875)">
       <g
          id="g3956-5-2">
         <g
-           id="g3812-6-2"
+           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1"
            transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1">
+           id="g3812-6-2">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
              id="rect3808-2-89"
-             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
         <g
-           id="g3812-0-9-73"
+           style="fill:url(#linearGradient3797-3-2);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-           style="fill:url(#linearGradient3797-3-2);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+           id="g3812-0-9-73">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:url(#linearGradient3834-7);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
              id="rect3808-6-1-6"
-             style="fill:url(#linearGradient3834-7);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
       </g>
     </g>
@@ -1063,7 +880,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_PathArray</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Wed Nov 27 18:41:35 2013 -0500</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_PathLinkArray.svg b/src/Mod/Draft/Resources/icons/Draft_PathLinkArray.svg
index bd197b54a2..a54c93058f 100644
--- a/src/Mod/Draft/Resources/icons/Draft_PathLinkArray.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_PathLinkArray.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -9,538 +7,434 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Draft_PathLinkArray.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4711"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4707"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect4703"
-       is_visible="true" />
     <linearGradient
-       id="linearGradient5419"
-       osb:paint="solid">
+       osb:paint="solid"
+       id="linearGradient5419">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop5421"
          offset="0"
-         id="stop5421" />
+         style="stop-color:#000000;stop-opacity:1;" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5225"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96" />
       <stop
-         id="stop3148-4"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5301"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-8-4"
-       id="radialGradient4339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4339"
+       xlink:href="#linearGradient3144-8-4" />
     <linearGradient
        id="linearGradient3144-8-4">
       <stop
-         id="stop3146-96-8"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96-8" />
       <stop
-         id="stop3148-4-0"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4-0" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5377"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3"
-       id="linearGradient4567"
-       x1="324.44156"
-       y1="225.43279"
-       x2="355.91556"
+       gradientUnits="userSpaceOnUse"
        y2="225.43279"
-       gradientUnits="userSpaceOnUse" />
+       x2="355.91556"
+       y1="225.43279"
+       x1="324.44156"
+       id="linearGradient4567"
+       xlink:href="#linearGradient3841-3" />
     <linearGradient
        id="linearGradient3841-3">
       <stop
-         id="stop3843-15"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15" />
       <stop
-         id="stop3845-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3"
-       id="linearGradient5512"
-       x1="323.83154"
-       y1="225.43279"
-       x2="356.52557"
+       gradientUnits="userSpaceOnUse"
        y2="225.43279"
-       gradientUnits="userSpaceOnUse" />
+       x2="356.52557"
+       y1="225.43279"
+       x1="323.83154"
+       id="linearGradient5512"
+       xlink:href="#linearGradient3841-3" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6"
-       id="radialGradient5536-6"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse" />
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       id="radialGradient5536-6"
+       xlink:href="#linearGradient3841-3-6" />
     <linearGradient
        id="linearGradient3841-3-6">
       <stop
-         id="stop3843-15-0"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0" />
       <stop
-         id="stop3845-8-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7" />
     </linearGradient>
     <radialGradient
-       r="18.080753"
-       fy="33.923443"
-       fx="-3.5461323"
-       cy="33.923443"
-       cx="-3.5461323"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5571"
        xlink:href="#linearGradient3841-3-6"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-1"
-       id="radialGradient5536-65"
+       id="radialGradient5571"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
        cx="-3.5461323"
        cy="33.923443"
        fx="-3.5461323"
        fy="33.923443"
-       r="18.080753"
+       r="18.080753" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse" />
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       id="radialGradient5536-65"
+       xlink:href="#linearGradient3841-3-1" />
     <linearGradient
        id="linearGradient3841-3-1">
       <stop
-         id="stop3843-15-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-7" />
       <stop
-         id="stop3845-8-3"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-3" />
     </linearGradient>
     <radialGradient
-       r="18.080753"
-       fy="33.923443"
-       fx="-3.5461323"
-       cy="33.923443"
-       cx="-3.5461323"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5571-0"
        xlink:href="#linearGradient3841-3-6-1"
-       inkscape:collect="always" />
+       id="radialGradient5571-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
     <linearGradient
        id="linearGradient3841-3-6-1">
       <stop
-         id="stop3843-15-0-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-3" />
       <stop
-         id="stop3845-8-7-0"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-0" />
     </linearGradient>
     <radialGradient
-       r="18.080753"
-       fy="33.923443"
-       fx="-3.5461323"
-       cy="33.923443"
-       cx="-3.5461323"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5644"
        xlink:href="#linearGradient3841-3-6-1"
-       inkscape:collect="always" />
-    <radialGradient
-       r="18.080753"
-       fy="33.923443"
-       fx="-3.5461323"
-       cy="33.923443"
-       cx="-3.5461323"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       id="radialGradient5644"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient5571-05"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
+    <radialGradient
        xlink:href="#linearGradient3841-3-6-2"
-       inkscape:collect="always" />
+       id="radialGradient5571-05"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
     <linearGradient
        id="linearGradient3841-3-6-2">
       <stop
-         id="stop3843-15-0-8"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-8" />
       <stop
-         id="stop3845-8-7-3"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-3" />
     </linearGradient>
     <radialGradient
-       r="18.080753"
-       fy="33.923443"
-       fx="-3.5461323"
-       cy="33.923443"
-       cx="-3.5461323"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5571-7"
        xlink:href="#linearGradient3841-3-6-9"
-       inkscape:collect="always" />
+       id="radialGradient5571-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
     <linearGradient
        id="linearGradient3841-3-6-9">
       <stop
-         id="stop3843-15-0-4"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-4" />
       <stop
-         id="stop3845-8-7-4"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-4" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3841-3-6-9"
+       id="radialGradient5644-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
     <radialGradient
        r="18.080753"
        fy="33.923443"
@@ -549,104 +443,96 @@
        cx="-3.5461323"
        gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient5644-0"
-       xlink:href="#linearGradient3841-3-6-9"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6"
        id="radialGradient6075"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
+       xlink:href="#linearGradient3841-3-6" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-1"
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient6077"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
+       xlink:href="#linearGradient3841-3-6-1" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9"
-       id="radialGradient6079"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
+       r="18.080753"
        fy="33.923443"
-       r="18.080753" />
-    <linearGradient
-       y2="225.43279"
-       x2="355.91556"
-       y1="225.43279"
-       x1="324.44156"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient5390"
+       id="radialGradient6079"
+       xlink:href="#linearGradient3841-3-6-9" />
+    <linearGradient
        xlink:href="#linearGradient3841-3-8"
-       inkscape:collect="always" />
+       id="linearGradient5390"
+       gradientUnits="userSpaceOnUse"
+       x1="324.44156"
+       y1="225.43279"
+       x2="355.91556"
+       y2="225.43279" />
     <linearGradient
        id="linearGradient3841-3-8">
       <stop
-         id="stop3843-15-2"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-2" />
       <stop
-         id="stop3845-8-9"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-9" />
     </linearGradient>
     <linearGradient
-       y2="225.43279"
-       x2="355.91556"
-       y1="225.43279"
-       x1="324.44156"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient6107"
        xlink:href="#linearGradient3841-3-8"
-       inkscape:collect="always" />
+       id="linearGradient6107"
+       gradientUnits="userSpaceOnUse"
+       x1="324.44156"
+       y1="225.43279"
+       x2="355.91556"
+       y2="225.43279" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9"
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3270"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
+       xlink:href="#linearGradient3841-3-6-9" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-4"
-       id="radialGradient3270-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
+       r="18.080753"
        fy="33.923443"
-       r="18.080753" />
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3270-5"
+       xlink:href="#linearGradient3841-3-6-9-4" />
     <linearGradient
        id="linearGradient3841-3-6-9-4">
       <stop
-         id="stop3843-15-0-4-8"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-4-8" />
       <stop
-         id="stop3845-8-7-4-2"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-4-2" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3841-3-6-9-4"
+       id="radialGradient3287"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
     <radialGradient
        r="18.080753"
        fy="33.923443"
@@ -655,30 +541,79 @@
        cx="-3.5461323"
        gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3287"
-       xlink:href="#linearGradient3841-3-6-9-4"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-45"
        id="radialGradient3270-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
+       xlink:href="#linearGradient3841-3-6-9-45" />
     <linearGradient
        id="linearGradient3841-3-6-9-45">
       <stop
-         id="stop3843-15-0-4-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-4-5" />
       <stop
-         id="stop3845-8-7-4-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-4-8" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3841-3-6-9-45"
+       id="radialGradient3287-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       cx="-3.5461323"
+       cy="33.923443"
+       fx="-3.5461323"
+       fy="33.923443"
+       r="18.080753" />
+    <radialGradient
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3292"
+       xlink:href="#linearGradient3841-3-6-9" />
+    <radialGradient
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3294"
+       xlink:href="#linearGradient3841-3-6-9-4" />
+    <radialGradient
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3296"
+       xlink:href="#linearGradient3841-3-6-9-45" />
+    <radialGradient
+       r="18.080753"
+       fy="33.923443"
+       fx="-3.5461323"
+       cy="33.923443"
+       cx="-3.5461323"
+       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3301-9"
+       xlink:href="#linearGradient3841-3-6-9-8" />
+    <linearGradient
+       id="linearGradient3841-3-6-9-8">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3843-15-0-4-81" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3845-8-7-4-3" />
     </linearGradient>
     <radialGradient
        r="18.080753"
@@ -688,404 +623,282 @@
        cx="-3.5461323"
        gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3287-3"
-       xlink:href="#linearGradient3841-3-6-9-45"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9"
-       id="radialGradient3292"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-4"
-       id="radialGradient3294"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-45"
-       id="radialGradient3296"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-8"
-       id="radialGradient3301-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
-    <linearGradient
-       id="linearGradient3841-3-6-9-8">
-      <stop
-         id="stop3843-15-0-4-81"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3845-8-7-4-3"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3-6-9-7"
        id="radialGradient3301-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97061831,0,0.99672801)"
-       cx="-3.5461323"
-       cy="33.923443"
-       fx="-3.5461323"
-       fy="33.923443"
-       r="18.080753" />
+       xlink:href="#linearGradient3841-3-6-9-7" />
     <linearGradient
        id="linearGradient3841-3-6-9-7">
       <stop
-         id="stop3843-15-0-4-2"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15-0-4-2" />
       <stop
-         id="stop3845-8-7-4-32"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8-7-4-32" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6"
-       id="linearGradient3797-3"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-3"
+       xlink:href="#linearGradient3791-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7"
          offset="0"
-         id="stop3793-7" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5"
          offset="1"
-         id="stop3795-5" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834"
        xlink:href="#linearGradient3791-6"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791"
-       id="linearGradient3797"
+       id="linearGradient3834"
+       gradientUnits="userSpaceOnUse"
        x1="939.98767"
        y1="1097.5122"
        x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       y2="989.77716" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797"
+       xlink:href="#linearGradient3791" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793"
          offset="0"
-         id="stop3793" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795"
          offset="1"
-         id="stop3795" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3896"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-7"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3797-36"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-7">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-5"
          offset="0"
-         id="stop3793-5" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-3"
          offset="1"
-         id="stop3795-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-9"
-       id="linearGradient3797-3-0"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797-3-0"
+       xlink:href="#linearGradient3791-6-9" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6-9">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7-3"
          offset="0"
-         id="stop3793-7-3" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5-6"
          offset="1"
-         id="stop3795-5-6" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834-0"
        xlink:href="#linearGradient3791-6-9"
-       inkscape:collect="always" />
+       id="linearGradient3834-0"
+       gradientUnits="userSpaceOnUse"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-0"
-       id="linearGradient3797-3-2"
-       x1="896.17792"
-       y1="1050.1741"
-       x2="937.06708"
+       gradientUnits="userSpaceOnUse"
        y2="1030.5859"
-       gradientUnits="userSpaceOnUse" />
+       x2="937.06708"
+       y1="1050.1741"
+       x1="896.17792"
+       id="linearGradient3797-3-2"
+       xlink:href="#linearGradient3791-6-0" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6-0">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7-2"
          offset="0"
-         id="stop3793-7-2" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5-3"
          offset="1"
-         id="stop3795-5-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="1037.1154"
-       x2="937.06708"
-       y1="1050.1741"
-       x1="896.17792"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834-7"
        xlink:href="#linearGradient3791-6-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3774"
-       id="linearGradient5137"
+       id="linearGradient3834-7"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.0710797,0,0,0.06845086,70.092874,-0.30201349)"
-       x1="288.11227"
-       y1="358.15811"
-       x2="372.52457"
-       y2="7.5416322" />
+       x1="896.17792"
+       y1="1050.1741"
+       x2="937.06708"
+       y2="1037.1154" />
+    <linearGradient
+       y2="7.5416322"
+       x2="372.52457"
+       y1="358.15811"
+       x1="288.11227"
+       gradientTransform="matrix(-0.0710797,0,0,0.06845086,70.092874,-0.30201349)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5137"
+       xlink:href="#linearGradient3774" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3774">
       <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
+         id="stop3776"
          offset="0"
-         id="stop3776" />
+         style="stop-color:#4e9a06;stop-opacity:1" />
       <stop
-         style="stop-color:#8ae234;stop-opacity:1"
+         id="stop3778"
          offset="1"
-         id="stop3778" />
+         style="stop-color:#8ae234;stop-opacity:1" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.8853849"
-     inkscape:cx="-1.2689271"
-     inkscape:cy="10.876912"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1375"
-     inkscape:window-height="876"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3185"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 9,14 c 11,0 23,0 23,17 0,17 12,17 23,17"
        id="path3347"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="fill:none;stroke:#eeeeec;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 9,14 c 11,0 23,0 23,17 0,17 12,17 23,17"
+       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3347-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
+       d="m 9,14 c 11,0 23,0 23,17 0,17 12,17 23,17"
+       style="fill:none;stroke:#eeeeec;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <g
-       transform="matrix(0.11724541,0,0,0.12538745,-103.41875,-125.1873)"
-       id="g3799-3">
+       id="g3799-3"
+       transform="matrix(0.11724541,0,0,0.12538745,-103.41875,-125.1873)">
       <g
          id="g3956-5">
         <g
-           id="g3812-6"
+           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1"
            transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1">
+           id="g3812-6">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="rect3808-2"
-             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
         <g
-           id="g3812-0-9"
+           style="fill:url(#linearGradient3797-3);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-           style="fill:url(#linearGradient3797-3);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+           id="g3812-0-9">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:url(#linearGradient3834);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="rect3808-6-1"
-             style="fill:url(#linearGradient3834);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
       </g>
     </g>
     <g
-       transform="matrix(0.11724541,0,0,0.12538745,-57.161357,-88.795302)"
-       id="g3799-3-2">
+       id="g3799-3-2"
+       transform="matrix(0.11724541,0,0,0.12538745,-57.161357,-88.795302)">
       <g
          id="g3956-5-6">
         <g
-           id="g3812-6-1"
+           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1"
            transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1">
+           id="g3812-6-1">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="rect3808-2-8"
-             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
         <g
-           id="g3812-0-9-7"
+           style="fill:url(#linearGradient3797-3-0);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
            transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-           style="fill:url(#linearGradient3797-3-0);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+           id="g3812-0-9-7">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:url(#linearGradient3834-0);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
              id="rect3808-6-1-9"
-             style="fill:url(#linearGradient3834-0);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
       </g>
     </g>
     <path
-       inkscape:connector-curvature="0"
-       id="path4678-5"
+       style="fill:#2e76ff;fill-opacity:1;stroke:#000343;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="m 22.756108,33.610146 17.549857,0 0,-8.305601 -17.549857,0 z"
-       style="fill:#2e76ff;fill-opacity:1;stroke:#000343;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       id="path4678-5" />
     <g
-       transform="matrix(0,-0.11724541,0.12538745,0,-107.21383,143.41875)"
-       id="g3799-3-9">
+       id="g3799-3-9"
+       transform="matrix(0,-0.11724541,0.12538745,0,-107.21383,143.41875)">
       <g
          id="g3956-5-2">
         <g
-           id="g3812-6-2"
+           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1"
            transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1">
+           id="g3812-6-2">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
              id="rect3808-2-89"
-             style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:10.29296303;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
         <g
-           id="g3812-0-9-73"
+           style="fill:url(#linearGradient3797-3-2);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
            transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-           style="fill:url(#linearGradient3797-3-2);fill-opacity:1;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+           id="g3812-0-9-73">
           <rect
-             y="983.79187"
-             x="887.41589"
-             height="119.7056"
-             width="58.413097"
+             style="fill:url(#linearGradient3834-7);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
              id="rect3808-6-1-6"
-             style="fill:url(#linearGradient3834-7);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:13.34120274;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+             width="58.413097"
+             height="119.7056"
+             x="887.41589"
+             y="983.79187" />
         </g>
       </g>
     </g>
     <path
-       id="path4228"
+       style="opacity:1;fill:#8ae234;fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 37.156319,12.274191 C 39.699682,9.7596475 43.75173,8.3201905 49.312353,7.9553405 l 0,-5.120267 c 0,-0.547186 0.263916,-0.931468 0.791555,-1.153117 0.554628,-0.2211 1.028236,-0.13019 1.420512,0.273738 L 61.914448,11.961702 c 0.257144,0.247871 0.385518,0.540894 0.385518,0.879577 0,0.338779 -0.128429,0.631748 -0.385518,0.879399 L 51.524133,23.726624 c -0.243931,0.247583 -0.548021,0.371347 -0.91335,0.371347 -0.162296,0 -0.331323,-0.03258 -0.507244,-0.09768 -0.527612,-0.221647 -0.791747,-0.605593 -0.791747,-1.153053 l 0,-4.905403 c -2.178021,0.169424 -3.987361,0.511403 -5.428788,1.026007 -1.440784,0.514686 -2.593974,1.234455 -3.459955,2.159568 -2.015956,2.149707 -2.733072,5.830024 -2.151293,11.041897 0.02671,0.338888 -0.128428,0.560317 -0.466783,0.664508 -0.04059,0.01327 -0.101413,0.01942 -0.182596,0.01942 -0.270536,0 -0.459739,-0.110728 -0.56821,-0.332185 L 36.648363,31.739346 C 36.45916,31.374455 36.185232,30.784797 35.826688,29.970522 35.46839,29.155877 35.14318,28.341793 34.852263,27.527354 c -0.290931,-0.814084 -0.551221,-1.713043 -0.78131,-2.696701 -0.229869,-0.98404 -0.344961,-1.853564 -0.344961,-2.609062 0,-4.377695 1.143616,-7.693244 3.430327,-9.9474 z"
-       inkscape:connector-curvature="0"
-       style="opacity:1;fill:#8ae234;fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+       id="path4228" />
     <path
-       style="opacity:1;fill:url(#linearGradient5137);fill-opacity:1;stroke:none;stroke-width:34.75331116;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 51.803546,5.5591045 c 2.522901,2.429557 5.083417,4.8143585 7.565131,7.2939245 -2.611333,2.46307 -5.135232,5.031602 -7.766001,7.471049 -0.0025,-1.678956 -0.0119,-3.35798 0.0044,-5.036895 -3.617492,0.224452 -7.382275,0.489011 -10.644669,2.356869 -2.326667,1.310453 -3.896823,3.804109 -4.724435,6.440993 -0.488915,-2.95416 -0.176413,-6.202 1.450893,-8.707939 1.508383,-2.311866 4.040092,-3.51906 6.514994,-4.150151 2.022235,-0.591998 4.13862,-0.548883 6.172838,-1.05677 1.072295,-0.6016145 1.425135,-2.0420015 1.260841,-3.2612055 -0.0085,-0.51868 -0.03948,-1.044021 -0.05913,-1.56634 0.07507,0.07216 0.150151,0.14431 0.225219,0.216465 z"
        id="path5135"
-       inkscape:connector-curvature="0" />
+       d="m 51.803546,5.5591045 c 2.522901,2.429557 5.083417,4.8143585 7.565131,7.2939245 -2.611333,2.46307 -5.135232,5.031602 -7.766001,7.471049 -0.0025,-1.678956 -0.0119,-3.35798 0.0044,-5.036895 -3.617492,0.224452 -7.382275,0.489011 -10.644669,2.356869 -2.326667,1.310453 -3.896823,3.804109 -4.724435,6.440993 -0.488915,-2.95416 -0.176413,-6.202 1.450893,-8.707939 1.508383,-2.311866 4.040092,-3.51906 6.514994,-4.150151 2.022235,-0.591998 4.13862,-0.548883 6.172838,-1.05677 1.072295,-0.6016145 1.425135,-2.0420015 1.260841,-3.2612055 -0.0085,-0.51868 -0.03948,-1.044021 -0.05913,-1.56634 0.07507,0.07216 0.150151,0.14431 0.225219,0.216465 z"
+       style="opacity:1;fill:url(#linearGradient5137);fill-opacity:1;stroke:none;stroke-width:34.75331116;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
   </g>
   <metadata
      id="metadata5217">
@@ -1098,10 +911,10 @@
         <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
-        <dc:date>Wed Nov 27 18:41:35 2013 -0500</dc:date>
+        <dc:date>Jul 15, 2019, 11:50:00 CDT</dc:date>
         <dc:creator>
           <cc:Agent>
-            <dc:title>[WandererFan]</dc:title>
+            <dc:title>[realthunder]</dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:rights>
@@ -1114,11 +927,11 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_PathArray.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_PathLinkArray.svg</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
+            <dc:title>[agryson] Alexander Gryson, [WandererFan]</dc:title>
           </cc:Agent>
         </dc:contributor>
         <dc:subject>
@@ -1128,9 +941,10 @@
             <rdf:li>path</rdf:li>
             <rdf:li>sequence</rdf:li>
             <rdf:li>repetition</rdf:li>
+            <rdf:li>arrow</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <dc:description>Three rectangles joined by a path, one in the lower left aligned top-bottom, another in the center aligned left-right and a third aligned top-bottom in the top right corner</dc:description>
+        <dc:description>Three rectangles joined by a path, one in the lower left aligned top-bottom, another in the center aligned left-right and a third aligned top-bottom in the top right corner. An arrow on top.</dc:description>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Point.svg b/src/Mod/Draft/Resources/icons/Draft_Point.svg
index a8b12761d7..0360dd5da3 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Point.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Point.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,228 +6,159 @@
    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"
+   version="1.1"
    id="svg2869"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Point.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2871">
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2368"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <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="perspective2877" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3171"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3173"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3175"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3189"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3191"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3193"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3205"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       id="radialGradient3205"
+       xlink:href="#linearGradient3144" />
+    <linearGradient
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="-0.96482293"
-     inkscape:cy="27.667431"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3019"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3021"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       transform="translate(20.005735,-20)"
-       id="g3827-1">
+       id="g3827-1"
+       transform="translate(20.005735,-20)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9">
+         id="g3797-9"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
   </g>
@@ -241,7 +170,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Point</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Sat Dec 17 15:36:02 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_PointArray.svg b/src/Mod/Draft/Resources/icons/Draft_PointArray.svg
index 4118153747..814d95d265 100644
--- a/src/Mod/Draft/Resources/icons/Draft_PointArray.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_PointArray.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,336 +6,267 @@
    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.91 r13725"
-   sodipodi:docname="Draft_PointArray.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Draft_wb_primitives/Draft_Array/Draft_Array_Ortho_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   id="svg5821"
+   height="64px"
+   width="64px">
   <defs
      id="defs5823">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793"
          offset="0"
-         id="stop3793" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795"
          offset="1"
-         id="stop3795" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6351"
          offset="0"
-         id="stop6351" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6353"
          offset="1"
-         id="stop6353" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#0019a3;stop-opacity:1;" />
       <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#0069ff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
        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" />
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3377" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
+       r="194.40614"
+       fy="1424.4465"
+       fx="1103.6399"
+       cy="1424.4465"
+       cx="1103.6399"
+       id="radialGradient6355"
+       xlink:href="#linearGradient6349" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791"
-       id="linearGradient3797"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3797"
+       xlink:href="#linearGradient3791" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7"
          offset="0"
-         id="stop3793-7" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5"
          offset="1"
-         id="stop3795-5" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3820"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791-6" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-7"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3797-3-2"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791-6-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6-7">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7-0"
          offset="0"
-         id="stop3793-7-0" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5-9"
          offset="1"
-         id="stop3795-5-9" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834-3"
        xlink:href="#linearGradient3791-6-7"
-       inkscape:collect="always" />
+       id="linearGradient3834-3"
+       gradientUnits="userSpaceOnUse"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-0">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-6"
          offset="0"
-         id="stop3793-6" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-2"
          offset="1"
-         id="stop3795-2" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-0"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3896"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791-0" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-2"
+       gradientUnits="userSpaceOnUse"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
        id="linearGradient3797-1"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3791-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-2">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-9"
          offset="0"
-         id="stop3793-9" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-3"
          offset="1"
-         id="stop3795-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-2"
-       id="linearGradient3896-1"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
-       y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3916-9"
+       y2="989.77716"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3896-1"
+       xlink:href="#linearGradient3791-2" />
+    <linearGradient
        xlink:href="#linearGradient3791-2"
-       inkscape:collect="always" />
+       id="linearGradient3916-9"
+       gradientUnits="userSpaceOnUse"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.299484"
-     inkscape:cx="35.198497"
-     inkscape:cy="32.167922"
-     inkscape:current-layer="g3360"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="747"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3010"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <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.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)"
+       id="g3360">
       <g
          id="g3799">
         <g
            id="g3956">
           <g
-             id="g3812"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0"
+             style="fill:url(#linearGradient3797);stroke:#729fcf;stroke-width:11.82571345000000029;stroke-opacity:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:miter;fill-opacity:1"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797);stroke:#729fcf;stroke-width:11.82571345000000029;stroke-opacity:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:miter;fill-opacity:1">
+             id="g3812-0">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3797);fill-opacity:1.0;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571345000000029;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6"
-               style="fill:url(#linearGradient3797);fill-opacity:1.0;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571345000000029;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(146.21345,219.32019)"
-         id="g3799-3-2">
+         id="g3799-3-2"
+         transform="translate(146.21345,219.32019)">
         <g
            id="g3956-5-3">
           <g
-             id="g3812-6-7"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-6-7">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-2-5"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-9-9"
+             style="fill:url(#linearGradient3797-3-2);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-3-2);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-9-9">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3834-3);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-1-2"
-               style="fill:url(#linearGradient3834-3);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
       <g
-         transform="translate(292.42692,-3.1029367e-7)"
-         id="g3799-4">
+         id="g3799-4"
+         transform="translate(292.42692,-3.1029367e-7)">
         <g
            id="g3956-7">
           <g
-             id="g3812-84"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1"
              transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
-             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+             id="g3812-84">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-5"
-               style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:9.12373734;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
           <g
-             id="g3812-0-0"
+             style="fill:url(#linearGradient3797-1);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
              transform="matrix(1.251547,0,0,1.2214422,-188.36328,-164.48243)"
-             style="fill:url(#linearGradient3797-1);fill-opacity:1;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+             id="g3812-0-0">
             <rect
-               y="983.79187"
-               x="887.41589"
-               height="119.7056"
-               width="58.413097"
+               style="fill:url(#linearGradient3916-9);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
                id="rect3808-6-3"
-               style="fill:url(#linearGradient3916-9);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:11.82571316;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+               width="58.413097"
+               height="119.7056"
+               x="887.41589"
+               y="983.79187" />
           </g>
         </g>
       </g>
@@ -351,7 +280,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Array</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Sat Dec 10 18:31:32 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_PolarArray.svg b/src/Mod/Draft/Resources/icons/Draft_PolarArray.svg
index 474c8e5689..36180b4c19 100644
--- a/src/Mod/Draft/Resources/icons/Draft_PolarArray.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_PolarArray.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,313 +6,210 @@
    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 (2405546, 2018-03-11)"
-   sodipodi:docname="Draft_PolarArray.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/Draft_wb_primitives/Draft_Array/Draft_Array_Ortho_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   id="svg5821"
+   height="64px"
+   width="64px">
+  <title
+     id="title862">Draft_PolarArray</title>
   <defs
      id="defs5823">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient6349">
       <stop
-         style="stop-color:#000000;stop-opacity:1;"
+         id="stop6351"
          offset="0"
-         id="stop6351" />
+         style="stop-color:#000000;stop-opacity:1;" />
       <stop
-         style="stop-color:#000000;stop-opacity:0;"
+         id="stop6353"
          offset="1"
-         id="stop6353" />
+         style="stop-color:#000000;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#0019a3;stop-opacity:1;" />
       <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#0069ff;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
        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" />
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       id="linearGradient3383"
+       xlink:href="#linearGradient3377" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
+       r="194.40614"
+       fy="1424.4465"
+       fx="1103.6399"
+       cy="1424.4465"
+       cx="1103.6399"
+       id="radialGradient6355"
+       xlink:href="#linearGradient6349" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7"
          offset="0"
-         id="stop3793-7" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5"
          offset="1"
-         id="stop3795-5" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6"
-       id="linearGradient3820"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3820"
+       xlink:href="#linearGradient3791-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-0">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-6"
          offset="0"
-         id="stop3793-6" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-2"
          offset="1"
-         id="stop3795-2" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-0"
-       id="linearGradient3896"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       id="linearGradient3896"
+       xlink:href="#linearGradient3791-0" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-6-9">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-7-7"
          offset="0"
-         id="stop3793-7-7" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-5-3"
          offset="1"
-         id="stop3795-5-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="989.77716"
-       x2="893.2572"
-       y1="1097.5122"
-       x1="939.98767"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3834-6"
+       gradientTransform="matrix(1.251547,0,0,1.2214422,104.06364,54.837797)"
        xlink:href="#linearGradient3791-6-9"
-       inkscape:collect="always"
-       gradientTransform="matrix(1.251547,0,0,1.2214422,104.06364,54.837797)" />
+       id="linearGradient3834-6"
+       gradientUnits="userSpaceOnUse"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791-2">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3793-9"
          offset="0"
-         id="stop3793-9" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3795-3"
          offset="1"
-         id="stop3795-3" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-2"
-       id="linearGradient3896-1"
-       x1="939.98767"
-       y1="1097.5122"
-       x2="893.2572"
+       gradientUnits="userSpaceOnUse"
        y2="989.77716"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-9"
-       id="linearGradient911"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.251547,0,0,1.2214422,104.06364,54.837797)"
-       x1="939.98767"
+       x2="893.2572"
        y1="1097.5122"
-       x2="893.2572"
-       y2="1049.63" />
+       x1="939.98767"
+       id="linearGradient3896-1"
+       xlink:href="#linearGradient3791-2" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-9"
+       y2="1049.63"
+       x2="893.2572"
+       y1="1097.5122"
+       x1="939.98767"
+       gradientTransform="matrix(1.251547,0,0,1.2214422,104.06364,54.837797)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient911"
+       xlink:href="#linearGradient3791-6-9" />
+    <linearGradient
+       y2="941.8949"
+       x2="893.2572"
+       y1="989.77716"
+       x1="939.98773"
+       gradientTransform="matrix(1.251547,0,0,1.2214422,104.06352,186.42979)"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient926"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.251547,0,0,1.2214422,104.06352,186.42979)"
-       x1="939.98773"
-       y1="989.77716"
-       x2="893.2572"
-       y2="941.8949" />
+       xlink:href="#linearGradient3791-6-9" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-9"
+       y2="941.8949"
+       x2="893.2572"
+       y1="989.77716"
+       x1="939.98773"
+       gradientTransform="matrix(1.251547,0,0,1.2214422,104.06352,186.42979)"
+       gradientUnits="userSpaceOnUse"
        id="linearGradient934"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.251547,0,0,1.2214422,104.06352,186.42979)"
-       x1="939.98773"
-       y1="989.77716"
-       x2="893.2572"
-       y2="941.8949" />
+       xlink:href="#linearGradient3791-6-9" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791-6-9"
-       id="linearGradient942"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.251547,0,0,1.2214422,104.06352,186.42979)"
-       x1="939.98773"
-       y1="989.77716"
+       y2="941.8949"
        x2="893.2572"
-       y2="941.8949" />
+       y1="989.77716"
+       x1="939.98773"
+       gradientTransform="matrix(1.251547,0,0,1.2214422,104.06352,186.42979)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient942"
+       xlink:href="#linearGradient3791-6-9" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.149742"
-     inkscape:cx="-4.8471235"
-     inkscape:cy="44.978809"
-     inkscape:current-layer="g3360"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1853"
-     inkscape:window-height="1025"
-     inkscape:window-x="1433"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:bbox-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3010"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1"
-       spacingy="1"
-       originx="0"
-       originy="0" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <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.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)"
+       id="g3360">
       <path
-         sodipodi:nodetypes="cc"
-         style="fill:none;fill-rule:evenodd;stroke:#0c1622;stroke-width:14.62134731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:43.86404194,14.62134731;stroke-opacity:0.50196078;stroke-dashoffset:0"
-         d="m 1002.6968,1380.7642 h 233.9416"
          id="path864"
-         inkscape:connector-curvature="0" />
+         d="m 1002.6968,1380.7642 h 233.9416"
+         style="fill:none;fill-rule:evenodd;stroke:#0c1622;stroke-width:14.62134731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:43.86404194,14.62134731;stroke-opacity:0.50196078;stroke-dashoffset:0" />
       <path
-         inkscape:connector-curvature="0"
-         id="path862"
+         style="fill:none;fill-rule:evenodd;stroke:#0c1622;stroke-width:14.62134731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:43.86404194,14.62134731;stroke-opacity:0.50196078;stroke-dashoffset:0"
          d="M 944.21145,1322.2788 V 1088.3372"
-         style="fill:none;fill-rule:evenodd;stroke:#0c1622;stroke-width:14.62134731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:43.86404194,14.62134731;stroke-opacity:0.50196078;stroke-dashoffset:0"
-         sodipodi:nodetypes="cc" />
+         id="path862" />
       <path
-         style="fill:none;fill-rule:evenodd;stroke:#0c1622;stroke-width:14.62134731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:43.86404194,14.62134731;stroke-opacity:0.50196078;stroke-dashoffset:0"
-         d="M 973.45414,1329.5894 1096.1609,1117.5799"
          id="path858"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="M 973.45414,1329.5894 1096.1609,1117.5799"
+         style="fill:none;fill-rule:evenodd;stroke:#0c1622;stroke-width:14.62134731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:43.86404194,14.62134731;stroke-opacity:0.50196078;stroke-dashoffset:0" />
       <path
-         inkscape:connector-curvature="0"
-         id="path860"
-         d="M 1002.6968,1351.5215 1222.017,1234.5507"
          style="fill:none;fill-rule:evenodd;stroke:#0c1622;stroke-width:14.62134731;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:43.86404194,14.62134731;stroke-opacity:0.50196078;stroke-dashoffset:0"
-         sodipodi:nodetypes="cc" />
+         d="M 1002.6968,1351.5215 1222.017,1234.5507"
+         id="path860" />
       <path
-         style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="path944"
-         sodipodi:type="arc"
-         sodipodi:cx="943.94775"
-         sodipodi:cy="1380.7642"
-         sodipodi:rx="285.37994"
-         sodipodi:ry="281.36465"
-         sodipodi:start="4.712389"
-         sodipodi:end="0"
          d="m 943.94776,1099.3995 a 285.37994,281.36465 0 0 1 285.37994,281.3647"
-         sodipodi:open="true" />
+         id="path944"
+         style="opacity:0.5;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <g
          id="g903">
         <rect
-           y="1329.5894"
-           x="1214.7063"
-           height="73.106735"
-           width="73.106735"
+           style="fill:url(#linearGradient3834-6);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect3808-6-1-20"
-           style="fill:url(#linearGradient3834-6);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+           width="73.106735"
+           height="73.106735"
+           x="1214.7063"
+           y="1329.5894" />
       </g>
       <g
-         id="g916"
-         transform="translate(0,14.621347)">
+         transform="translate(0,14.621347)"
+         id="g916">
         <rect
-           y="1314.968"
-           x="1200.0851"
-           height="102.34943"
-           width="102.34941"
+           style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:14.62134838;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect3808-2-6"
-           style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:14.62134838;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-        <rect
-           style="fill:url(#linearGradient911);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect905"
-           width="73.106735"
-           height="73.106735"
-           x="1214.7063"
-           y="1329.5894" />
-      </g>
-      <g
-         id="g922"
-         transform="translate(-29.242576,-131.59199)">
-        <rect
-           style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:14.62134838;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect918"
            width="102.34941"
            height="102.34943"
            x="1200.0851"
@@ -324,33 +219,33 @@
            x="1214.7063"
            height="73.106735"
            width="73.106735"
-           id="rect920"
-           style="fill:url(#linearGradient926);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+           id="rect905"
+           style="fill:url(#linearGradient911);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       </g>
       <g
-         transform="translate(-153.52403,-248.56277)"
-         id="g932">
+         transform="translate(-29.242576,-131.59199)"
+         id="g922">
         <rect
            y="1314.968"
            x="1200.0851"
            height="102.34943"
            width="102.34941"
-           id="rect928"
+           id="rect918"
            style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:14.62134838;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
         <rect
-           style="fill:url(#linearGradient934);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect930"
+           style="fill:url(#linearGradient926);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           id="rect920"
            width="73.106735"
            height="73.106735"
            x="1214.7063"
            y="1329.5894" />
       </g>
       <g
-         id="g940"
-         transform="translate(-307.04835,-292.42682)">
+         id="g932"
+         transform="translate(-153.52403,-248.56277)">
         <rect
            style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:14.62134838;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="rect936"
+           id="rect928"
            width="102.34941"
            height="102.34943"
            x="1200.0851"
@@ -360,8 +255,26 @@
            x="1214.7063"
            height="73.106735"
            width="73.106735"
+           id="rect930"
+           style="fill:url(#linearGradient934);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      </g>
+      <g
+         transform="translate(-307.04835,-292.42682)"
+         id="g940">
+        <rect
+           y="1314.968"
+           x="1200.0851"
+           height="102.34943"
+           width="102.34941"
+           id="rect936"
+           style="fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#0b1521;stroke-width:14.62134838;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <rect
+           style="fill:url(#linearGradient942);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="rect938"
-           style="fill:url(#linearGradient942);fill-opacity:1;fill-rule:nonzero;stroke:#729fcf;stroke-width:14.62134743;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+           width="73.106735"
+           height="73.106735"
+           x="1214.7063"
+           y="1329.5894" />
       </g>
     </g>
   </g>
@@ -373,13 +286,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Array</dc:title>
+        <dc:title>Draft_PolarArray</dc:title>
         <cc:license
            rdf:resource="" />
-        <dc:date>Sat Dec 10 18:31:32 2011 +0000</dc:date>
+        <dc:date>Dec 24 18:30:00 2019 CST</dc:date>
         <dc:creator>
           <cc:Agent>
-            <dc:title>[yorikvanhavre]</dc:title>
+            <dc:title>[vocx]</dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:rights>
@@ -392,14 +305,14 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_Array.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_PolarArray.svg</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
+            <dc:title>[agryson] Alexander Gryson, [yorikvanhavre]</dc:title>
           </cc:Agent>
         </dc:contributor>
-        <dc:description>Six rectangles in a 2 x 3 linear array</dc:description>
+        <dc:description>Four rectangles in a polar pattern spanning 90 degrees</dc:description>
         <dc:subject>
           <rdf:Bag>
             <rdf:li>rectangle</rdf:li>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Polygon.svg b/src/Mod/Draft/Resources/icons/Draft_Polygon.svg
index bf62753ab2..2efe72ff23 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Polygon.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Polygon.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,190 +6,104 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Polygon.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-6"
-       id="linearGradient3801-1-3"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-3"
+       xlink:href="#linearGradient3836-0-6" />
     <linearGradient
        id="linearGradient3836-0-6">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-7"
          offset="0"
-         id="stop3838-2-7" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-5"
          offset="1"
-         id="stop3840-5-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-6-4"
-       id="linearGradient3801-1-3-7"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-3-7"
+       xlink:href="#linearGradient3836-0-6-4" />
     <linearGradient
        id="linearGradient3836-0-6-4">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-7-0"
          offset="0"
-         id="stop3838-2-7-0" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-5-9"
          offset="1"
-         id="stop3840-5-5-9" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="14.416016"
-     inkscape:cx="4.3139914"
-     inkscape:cy="29.028443"
-     inkscape:current-layer="g3448"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2998"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       transform="translate(0.86678264,-132.17127)"
-       id="g3448">
+       id="g3448"
+       transform="translate(0.86678264,-132.17127)">
       <path
-         sodipodi:type="star"
-         style="fill:none;stroke:#2e3436;stroke-width:7.80773497;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(1.0301416,0.03861457,-0.03908769,1.0176726,9.8173932,151.7708)"
+         d="M 30,34.000001 0.78496017,30.211053 -4.6394802,1.255049 21.223072,-12.851798 42.631448,7.3856954 Z"
          id="path3002"
-         sodipodi:sides="5"
-         sodipodi:cx="18"
-         sodipodi:cy="12"
-         sodipodi:r1="25.059929"
-         sodipodi:r2="20.273909"
-         sodipodi:arg1="1.0714496"
-         sodipodi:arg2="1.6997681"
-         inkscape:flatsided="true"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="M 30,34.000001 0.78496017,30.211053 -4.6394802,1.255049 21.223072,-12.851798 42.631448,7.3856954 z"
-         transform="matrix(1.0301416,0.03861457,-0.03908769,1.0176726,9.8173932,151.7708)"
-         inkscape:transform-center-x="-1.3261816"
-         inkscape:transform-center-y="-1.1571748" />
+         style="fill:none;stroke:#2e3436;stroke-width:7.80773497;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:type="star"
-         style="fill:none;stroke:#d3d7cf;stroke-width:3.90386748;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(1.0301416,0.03861457,-0.03908769,1.0176726,9.8173932,151.7708)"
+         d="M 30,34.000001 0.78496017,30.211053 -4.6394802,1.255049 21.223072,-12.851798 42.631448,7.3856954 Z"
          id="path3002-1"
-         sodipodi:sides="5"
-         sodipodi:cx="18"
-         sodipodi:cy="12"
-         sodipodi:r1="25.059929"
-         sodipodi:r2="20.273909"
-         sodipodi:arg1="1.0714496"
-         sodipodi:arg2="1.6997681"
-         inkscape:flatsided="true"
-         inkscape:rounded="0"
-         inkscape:randomized="0"
-         d="M 30,34.000001 0.78496017,30.211053 -4.6394802,1.255049 21.223072,-12.851798 42.631448,7.3856954 z"
-         transform="matrix(1.0301416,0.03861457,-0.03908769,1.0176726,9.8173932,151.7708)"
-         inkscape:transform-center-x="-1.3261816"
-         inkscape:transform-center-y="-1.1571748" />
+         style="fill:none;stroke:#d3d7cf;stroke-width:3.90386748;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:18.89999962;stroke-opacity:1;stroke-dasharray:none"
-         d="M 4.1332167,152.17127 32.372817,138.27734 54.551723,160.646"
          id="path3790"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
+         d="M 4.1332167,152.17127 32.372817,138.27734 54.551723,160.646"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:18.89999962;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 6.3487101,155.16038 3.9758949,26.52229 28.522295,4.74287 12.598235,-23.87947"
          id="path3792"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         d="m 6.3487101,155.16038 3.9758949,26.52229 28.522295,4.74287 12.598235,-23.87947"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <g
-         transform="translate(39.138953,108.17127)"
-         id="g3827-1-3">
+         id="g3827-1-3"
+         transform="translate(39.138953,108.17127)">
         <g
-           transform="translate(31.322131,40.570289)"
-           id="g3797-9-5">
+           id="g3797-9-5"
+           transform="translate(31.322131,40.570289)">
           <path
-             inkscape:connector-curvature="0"
-             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
              id="path4250-71-6"
-             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
              id="path4250-7-3-2"
-             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+             style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
       <g
-         transform="translate(15.138953,113.17127)"
-         id="g3827-1-3-4">
+         id="g3827-1-3-4"
+         transform="translate(15.138953,113.17127)">
         <g
-           transform="translate(31.322131,40.570289)"
-           id="g3797-9-5-8">
+           id="g3797-9-5-8"
+           transform="translate(31.322131,40.570289)">
           <path
-             inkscape:connector-curvature="0"
-             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
              id="path4250-71-6-8"
-             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
           <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
              id="path4250-7-3-2-2"
-             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+             style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
     </g>
@@ -204,7 +116,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Polygon</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Rectangle.svg b/src/Mod/Draft/Resources/icons/Draft_Rectangle.svg
index e3e4dc85f6..cf5f2a0be5 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Rectangle.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Rectangle.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,159 +6,100 @@
    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"
+   version="1.1"
    id="svg2825"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Rectangle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2827">
-    <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="perspective2833" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-6"
-       id="linearGradient3801-1-3"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-3"
+       xlink:href="#linearGradient3836-0-6" />
     <linearGradient
        id="linearGradient3836-0-6">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-7"
          offset="0"
-         id="stop3838-2-7" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-5"
          offset="1"
-         id="stop3840-5-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="11.008482"
-     inkscape:cy="33.474762"
-     inkscape:current-layer="g3527"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3038"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       inkscape:export-ydpi="6.5895667"
-       inkscape:export-xdpi="6.5895667"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
-       id="g3527"
-       transform="matrix(0.12582859,0,0,0.13656891,-113.21901,-47.81056)">
+       transform="matrix(0.12582859,0,0,0.13656891,-113.21901,-47.81056)"
+       id="g3527">
       <path
-         id="rect2233"
-         d="m 971.31349,415.98457 0,336.82629 365.57671,0 0,-336.82629 z m 43.86921,44.36492 274.0236,-0.43105 0,248.95857 -274.0236,0.0646 z"
          style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:15.25683403;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccc" />
+         d="m 971.31349,415.98457 0,336.82629 365.57671,0 0,-336.82629 z m 43.86921,44.36492 274.0236,-0.43105 0,248.95857 -274.0236,0.0646 z"
+         id="rect2233" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 55.913045,10.935149 -46.7391286,0 0,43.063378"
+         transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
          id="path3040"
-         inkscape:connector-curvature="0"
-         transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
-         sodipodi:nodetypes="ccc" />
+         d="m 55.913045,10.935149 -46.7391286,0 0,43.063378"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:2.08668017;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 13,51 39.685575,0.03219 -0.06987,-36.128755"
-         id="path3042"
-         inkscape:connector-curvature="0"
          transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
-         sodipodi:nodetypes="ccc" />
+         id="path3042"
+         d="m 13,51 39.685575,0.03219 -0.06987,-36.128755"
+         style="fill:none;stroke:#ffffff;stroke-width:2.08668017;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
     </g>
     <g
-       transform="translate(40.005735,-40.005445)"
-       id="g3827-1">
+       id="g3827-1"
+       transform="translate(40.005735,-40.005445)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9">
+         id="g3797-9"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
     <g
        id="g3827-1-3">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9-5">
+         id="g3797-9-5"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71-6"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3-2"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
   </g>
@@ -172,7 +111,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Rectangle</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Rotate.svg b/src/Mod/Draft/Resources/icons/Draft_Rotate.svg
index 2528efbdb6..71638dd7c0 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Rotate.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Rotate.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,117 +6,66 @@
    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"
+   version="1.1"
    id="svg3000"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Rotate.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs3002">
     <linearGradient
        id="linearGradient3393">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3395"
          offset="0"
-         id="stop3395" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3397"
          offset="1"
-         id="stop3397" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3393"
-       id="linearGradient3399"
-       x1="1942.7382"
-       y1="1934.756"
-       x2="1809.5021"
+       gradientTransform="matrix(0.98657811,0,0,0.99922078,20.129251,-2.6811697)"
+       gradientUnits="userSpaceOnUse"
        y2="1547.4135"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98657811,0,0,0.99922078,20.129251,-2.6811697)" />
-    <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="perspective3008" />
+       x2="1809.5021"
+       y1="1934.756"
+       x1="1942.7382"
+       id="linearGradient3399"
+       xlink:href="#linearGradient3393" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3393-7"
-       id="linearGradient3399-1"
-       x1="1669.7314"
-       y1="1726.0585"
-       x2="2067.1702"
-       y2="1726.0585"
+       gradientTransform="matrix(0.98657811,0,0,0.99922078,20.129251,-2.6811697)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98657811,0,0,0.99922078,20.129251,-2.6811697)" />
+       y2="1726.0585"
+       x2="2067.1702"
+       y1="1726.0585"
+       x1="1669.7314"
+       id="linearGradient3399-1"
+       xlink:href="#linearGradient3393-7" />
     <linearGradient
        id="linearGradient3393-7">
       <stop
-         style="stop-color:#003ddd;stop-opacity:1;"
+         id="stop3395-4"
          offset="0"
-         id="stop3395-4" />
+         style="stop-color:#003ddd;stop-opacity:1;" />
       <stop
-         style="stop-color:#639ef0;stop-opacity:1;"
+         id="stop3397-0"
          offset="1"
-         id="stop3397-0" />
+         style="stop-color:#639ef0;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.283648"
-     inkscape:cx="16.790051"
-     inkscape:cy="31.55604"
-     inkscape:current-layer="g3405"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="false"
-     inkscape:snap-nodes="true"
-     inkscape:snap-global="false"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2990"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3405"
-       transform="matrix(0.1369365,0,0,0.1369365,-222.21754,-203.36512)">
+       transform="matrix(0.1369365,0,0,0.1369365,-222.21754,-203.36512)"
+       id="g3405">
       <path
-         id="path2396"
-         d="m 1681.1922,1792.577 c 29.7518,101.921 135.5669,160.1819 236.1982,130.0489 100.6312,-30.1331 158.1551,-137.3041 128.4034,-239.225 -15.6793,-53.7124 -52.4795,-95.2899 -98.5144,-118.201 l 22.4906,-51.7025 -179.7526,9.3827 95.6674,159.2221 33.287,-51.8662 c 28.9167,15.1354 51.9438,41.7071 61.8953,75.7977 19.374,66.3699 -18.0797,136.1493 -83.6101,155.7716 -65.5304,19.6223 -134.4562,-18.3026 -153.8303,-84.6726 -5.5433,-18.9902 -6.4147,-38.2469 -3.3235,-56.5414 l -63.9321,-15.3717 c -4.8496,28.2514 -3.545,58.0124 5.0211,87.3574 z"
          style="fill:url(#linearGradient3399);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:14.60531044;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssscccccsssccs" />
+         d="m 1681.1922,1792.577 c 29.7518,101.921 135.5669,160.1819 236.1982,130.0489 100.6312,-30.1331 158.1551,-137.3041 128.4034,-239.225 -15.6793,-53.7124 -52.4795,-95.2899 -98.5144,-118.201 l 22.4906,-51.7025 -179.7526,9.3827 95.6674,159.2221 33.287,-51.8662 c 28.9167,15.1354 51.9438,41.7071 61.8953,75.7977 19.374,66.3699 -18.0797,136.1493 -83.6101,155.7716 -65.5304,19.6223 -134.4562,-18.3026 -153.8303,-84.6726 -5.5433,-18.9902 -6.4147,-38.2469 -3.3235,-56.5414 l -63.9321,-15.3717 c -4.8496,28.2514 -3.545,58.0124 5.0211,87.3574 z"
+         id="path2396" />
       <path
-         id="path2396-9"
-         d="m 1697.0737,1793.0149 c 21.9026,75.8066 96.1332,121.8482 173.4769,123.2187 112.1455,1.9872 169.4022,-113.003 169.7692,-173.4204 0.634,-104.377 -76.0228,-155.0448 -111.3214,-172.2498 l 16.5412,-38.5909 -129.6065,5.1902 69.827,116.736 27.1659,-44.8244 c 69.2745,42.5347 87.4573,82.1574 88.2314,134.8018 0.7921,53.8699 -42.6637,133.9795 -133.4309,137.6387 -78.1642,3.1511 -123.0143,-52.9131 -137.87,-102.7532 -6.574,-16.2522 -6.5783,-33.3683 -6.1997,-47.1065 l -35.6611,-8.6388 c -1.0631,21.5472 2.4301,46.9893 9.078,69.9986 z"
          style="fill:none;stroke:#729fcf;stroke-width:14.60530949;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"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssscccccsscccs" />
+         d="m 1697.0737,1793.0149 c 21.9026,75.8066 96.1332,121.8482 173.4769,123.2187 112.1455,1.9872 169.4022,-113.003 169.7692,-173.4204 0.634,-104.377 -76.0228,-155.0448 -111.3214,-172.2498 l 16.5412,-38.5909 -129.6065,5.1902 69.827,116.736 27.1659,-44.8244 c 69.2745,42.5347 87.4573,82.1574 88.2314,134.8018 0.7921,53.8699 -42.6637,133.9795 -133.4309,137.6387 -78.1642,3.1511 -123.0143,-52.9131 -137.87,-102.7532 -6.574,-16.2522 -6.5783,-33.3683 -6.1997,-47.1065 l -35.6611,-8.6388 c -1.0631,21.5472 2.4301,46.9893 9.078,69.9986 z"
+         id="path2396-9" />
     </g>
   </g>
   <metadata
@@ -129,7 +76,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Rotate</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Scale.svg b/src/Mod/Draft/Resources/icons/Draft_Scale.svg
index 5985b6cb3b..faf9585371 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Scale.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Scale.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,271 +6,193 @@
    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"
+   version="1.1"
    id="svg2766"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Scale.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2768">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3856">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1"
+         id="stop3858"
          offset="0"
-         id="stop3858" />
+         style="stop-color:#3465a4;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3860"
          offset="1"
-         id="stop3860" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3824">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3826"
          offset="0"
-         id="stop3826" />
+         style="stop-color:#729fcf;stop-opacity:1" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3828"
          offset="1"
-         id="stop3828" />
+         style="stop-color:#204a87;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3787">
       <stop
-         id="stop3789"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3789" />
       <stop
-         id="stop3791"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3791" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864">
       <stop
-         id="stop3866"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866" />
       <stop
-         id="stop3868"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868" />
     </linearGradient>
-    <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="perspective2774" />
     <linearGradient
-       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)"
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3036"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
+       id="linearGradient3036"
+       gradientUnits="userSpaceOnUse"
+       x1="56.172409"
+       y1="29.279999"
+       x2="21.689653"
+       y2="36.079998"
+       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="43.940212"
-       x2="32.329041"
-       y1="18.865765"
-       x1="44.058071"
-       gradientTransform="matrix(0.38366341,-0.38366341,0.41875298,0.41875298,12.196434,25.003375)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3012"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3824"
-       id="linearGradient3830"
-       x1="591.59064"
-       y1="103.1946"
-       x2="599.1272"
-       y2="128.1946"
+       id="linearGradient3012"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.9420628,1.000004)" />
+       gradientTransform="matrix(0.38366341,-0.38366341,0.41875298,0.41875298,12.196434,25.003375)"
+       x1="44.058071"
+       y1="18.865765"
+       x2="32.329041"
+       y2="43.940212" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3856"
-       id="linearGradient3862"
-       x1="613.25824"
-       y1="135.1946"
-       x2="595.35895"
+       gradientTransform="translate(-0.9420628,1.000004)"
+       gradientUnits="userSpaceOnUse"
+       y2="128.1946"
+       x2="599.1272"
+       y1="103.1946"
+       x1="591.59064"
+       id="linearGradient3830"
+       xlink:href="#linearGradient3824" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
        y2="68.194603"
-       gradientUnits="userSpaceOnUse" />
+       x2="595.35895"
+       y1="135.1946"
+       x1="613.25824"
+       id="linearGradient3862"
+       xlink:href="#linearGradient3856" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.0968312"
-     inkscape:cx="-80.372097"
-     inkscape:cy="39.976197"
-     inkscape:current-layer="g3518"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-global="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2997"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3518"
-       transform="matrix(1.0614931,0,0,1,-612.96941,-69.194602)">
+       transform="matrix(1.0614931,0,0,1,-612.96941,-69.194602)"
+       id="g3518">
       <path
-         id="rect3446"
-         d="m 580.28581,72.194602 3e-5,14 5.65241,0 0,-8 1.88414,0 0,-6 z m 11.30486,0 0,6 7.53655,0 0,-6 z m 11.30483,0 0,6 7.53655,0 0,-6 z m 11.30483,0 0,6 7.53655,0 0,-6 z m 11.30483,0 0,6 3.76828,0 0,4 5.65241,0 0,-10 z m 3.76828,14 0,8 5.65241,0 0,-8 z m -48.9876,4 0,8 5.65241,0 0,-8 z m 48.9876,8 0,7.999998 5.65241,0 0,-7.999998 z m 0,11.999998 0,8 5.65241,0 0,-8 z m 0,12 0,2 -3.76828,0 0,6 9.42069,0 0,-8 z m -18.84139,2 0,6 11.30483,0 0,-6 z"
          style="fill:url(#linearGradient3862);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1.94120501999999990;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+         d="m 580.28581,72.194602 3e-5,14 5.65241,0 0,-8 1.88414,0 0,-6 z m 11.30486,0 0,6 7.53655,0 0,-6 z m 11.30483,0 0,6 7.53655,0 0,-6 z m 11.30483,0 0,6 7.53655,0 0,-6 z m 11.30483,0 0,6 3.76828,0 0,4 5.65241,0 0,-10 z m 3.76828,14 0,8 5.65241,0 0,-8 z m -48.9876,4 0,8 5.65241,0 0,-8 z m 48.9876,8 0,7.999998 5.65241,0 0,-7.999998 z m 0,11.999998 0,8 5.65241,0 0,-8 z m 0,12 0,2 -3.76828,0 0,6 9.42069,0 0,-8 z m -18.84139,2 0,6 11.30483,0 0,-6 z"
+         id="rect3446" />
       <path
-         style="fill:none;stroke:#0b1521;stroke-width:7.7648201;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 583.11204,105.1946 0,22 20.72553,0 0,-22 z"
          id="path3018"
-         inkscape:connector-curvature="0" />
+         d="m 583.11204,105.1946 0,22 20.72553,0 0,-22 z"
+         style="fill:none;stroke:#0b1521;stroke-width:7.7648201;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:url(#linearGradient3830);stroke-width:3.88241005;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 583.11204,105.1946 0,19.93618 0,2.06382 20.72553,0 0,-22 z"
          id="path3018-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
+         d="m 583.11204,105.1946 0,19.93618 0,2.06382 20.72553,0 0,-22 z"
+         style="fill:none;stroke:url(#linearGradient3830);stroke-width:3.88241005;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 586.88032,126.1946 16.01518,0 0,-17 m 1.88413,-5 -22.60966,0 0,24"
          id="path3018-1-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
+         d="m 586.88032,126.1946 16.01518,0 0,-17 m 1.88413,-5 -22.60966,0 0,24"
+         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 36,57 10,0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3832"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="m 36,57 10,0"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 52,57 5,0 0,-2 3,0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3834"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="m 52,57 5,0 0,-2 3,0"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 57,48 0,-6"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3836"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="m 57,48 0,-6"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 57,36 0,-6"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3838"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="m 57,36 0,-6"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 57,24 0,-6"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3840"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="m 57,24 0,-6"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 53,8 0,-3 7,0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3842"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="m 53,8 0,-3 7,0"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 46,5 40,5"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3844"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="M 46,5 40,5"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 34,5 28,5"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3846"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="M 34,5 28,5"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 22,5 16,5"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3848"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="M 22,5 16,5"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 10,5 5,5 5,16"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3850"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="M 10,5 5,5 5,16"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 5,22 0,6"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3852"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="m 5,22 0,6"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 57,12 57,9"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)"
          id="path3854"
-         inkscape:connector-curvature="0"
-         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+         d="M 57,12 57,9"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3012);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 35,15 39.062816,19.37832 31,27 l 6,6 7.71967,-7.964826 4.24264,4.242641 L 49,15 z"
        id="path3343"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 35,15 39.062816,19.37832 31,27 l 6,6 7.71967,-7.964826 4.24264,4.242641 L 49,15 z"
+       style="fill:url(#linearGradient3012);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 39.550023,17 2.32515,2.37832 -7.987667,7.653821 3.080353,3.112494 7.751811,-7.937888 2.221642,2.240472 L 47.000002,17 z"
        id="path3343-2"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 39.550023,17 2.32515,2.37832 -7.987667,7.653821 3.080353,3.112494 7.751811,-7.937888 2.221642,2.240472 L 47.000002,17 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <metadata
      id="metadata5370">
@@ -282,7 +202,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Scale</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
@@ -313,7 +233,7 @@
             <rdf:li>square</rdf:li>
             <rdf:li>arrow</rdf:li>
             <rdf:li>dotted line</rdf:li>
-            <rdf:li></rdf:li>
+            <rdf:li />
           </rdf:Bag>
         </dc:subject>
         <dc:description>A small square in the bottom left corner of a large dotted box with an arrow pointing from the top left corner of the inner box to the top left corner of the outer box</dc:description>
diff --git a/src/Mod/Draft/Resources/icons/Draft_SelectGroup.svg b/src/Mod/Draft/Resources/icons/Draft_SelectGroup.svg
index 193302896d..399d15ad58 100644
--- a/src/Mod/Draft/Resources/icons/Draft_SelectGroup.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_SelectGroup.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,530 +6,400 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_SelectGroup.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <marker
-       inkscape:stockid="Arrow1Lstart"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
+       style="overflow:visible"
        id="Arrow1Lstart"
-       style="overflow:visible">
+       refX="0.0"
+       refY="0.0"
+       orient="auto">
       <path
-         id="path3809"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         transform="scale(0.8) translate(12.5,0)"
          style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none"
-         transform="scale(0.8) translate(12.5,0)" />
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path3809" />
     </marker>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="140.22731"
-       x2="434.73947"
-       y1="185.1304"
-       x1="394.15784"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5087"
        xlink:href="#linearGradient4247"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective5141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       id="linearGradient5087"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
+       x1="394.15784"
+       y1="185.1304"
+       x2="434.73947"
+       y2="140.22731" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2080077"
-     inkscape:cx="-4.8180467"
-     inkscape:cy="26.046567"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3080"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       sodipodi:nodetypes="ccc"
-       id="path5098-3"
-       d="m 8.999987,12.999996 0,32 14.000001,0"
        style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path5100-6"
-       d="M 23,29 8.999999,29"
-       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       sodipodi:nodetypes="ccc"
-       id="path5098-1"
        d="m 8.999987,12.999996 0,32 14.000001,0"
-       style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0" />
+       id="path5098-3" />
     <path
-       id="path5100-7"
+       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        d="M 23,29 8.999999,29"
+       id="path5100-6" />
+    <path
+       style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 8.999987,12.999996 0,32 14.000001,0"
+       id="path5098-1" />
+    <path
        style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       d="M 23,29 8.999999,29"
+       id="path5100-7" />
     <rect
-       ry="0"
-       rx="0"
-       y="3"
-       x="3"
-       height="10"
-       width="37.999989"
+       style="color:#000000;fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect4258-1-7-4-4"
-       style="color:#000000;fill:#eeeeec;stroke:#2e3436;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       ry="0"
-       rx="0"
-       y="25"
-       x="23"
+       width="37.999989"
        height="10"
-       width="28"
+       x="3"
+       y="3"
+       rx="0"
+       ry="0" />
+    <rect
+       style="color:#000000;fill:#3465a4;stroke:#0b1521;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect4258-1-7-4-7"
-       style="color:#000000;fill:#3465a4;stroke:#0b1521;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       style="fill:#3465a4;fill-opacity:1;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3852"
-       width="24.387096"
-       height="5.9999914"
-       x="24.806452"
-       y="27" />
-    <rect
-       style="fill:#d3d7cf;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3852-5-3"
-       width="34"
-       height="6"
-       x="5"
-       y="5" />
-    <rect
-       ry="0"
-       rx="0"
-       y="41"
-       x="23"
-       height="10"
        width="28"
-       id="rect4258-1-7-4-7-0"
-       style="color:#000000;fill:#3465a4;stroke:#0b1521;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       height="10"
+       x="23"
+       y="25"
+       rx="0"
+       ry="0" />
     <rect
-       style="fill:#3465a4;fill-opacity:1;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3852-9"
-       width="24.387094"
-       height="6"
+       y="27"
        x="24.806452"
-       y="43" />
+       height="5.9999914"
+       width="24.387096"
+       id="rect3852"
+       style="fill:#3465a4;fill-opacity:1;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <rect
+       y="5"
+       x="5"
+       height="6"
+       width="34"
+       id="rect3852-5-3"
+       style="fill:#d3d7cf;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <rect
+       style="color:#000000;fill:#3465a4;stroke:#0b1521;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4258-1-7-4-7-0"
+       width="28"
+       height="10"
+       x="23"
+       y="41"
+       rx="0"
+       ry="0" />
+    <rect
+       y="43"
+       x="24.806452"
+       height="6"
+       width="24.387094"
+       id="rect3852-9"
+       style="fill:#3465a4;fill-opacity:1;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 20.999999,19 4,0"
        id="path3953-1"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#204a87;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 53.000001,19 C 57,19 57,19 57,19"
-       id="path3957-5"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="m 20.999999,19 4,0"
-       id="path3953-1-1"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3957-5"
        d="M 53.000001,19 C 57,19 57,19 57,19"
+       style="fill:none;stroke:#204a87;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3953-1-1"
+       d="m 20.999999,19 4,0"
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3957-5-8"
-       inkscape:connector-curvature="0" />
+       d="M 53.000001,19 C 57,19 57,19 57,19"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 37,19 4,0"
        id="path3953-1-5"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="m 37,19 4,0"
+       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3953-1-1-7"
-       inkscape:connector-curvature="0" />
+       d="m 37,19 4,0"
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 19,57 4,0"
        id="path3953-1-6"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#204a87;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 51.000002,57 c 3.999999,0 3.999999,0 3.999999,0"
-       id="path3957-5-1"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="m 19,57 4,0"
-       id="path3953-1-1-8"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3957-5-1"
        d="m 51.000002,57 c 3.999999,0 3.999999,0 3.999999,0"
+       style="fill:none;stroke:#204a87;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3953-1-1-8"
+       d="m 19,57 4,0"
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3957-5-8-9"
-       inkscape:connector-curvature="0" />
+       d="m 51.000002,57 c 3.999999,0 3.999999,0 3.999999,0"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 35.000001,57 4,0"
        id="path3953-1-5-2"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="m 35.000001,57 4,0"
+       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3953-1-1-7-7"
-       inkscape:connector-curvature="0" />
+       d="m 35.000001,57 4,0"
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 17,26.999999 17,31"
        id="path3953-1-9"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 17,26.999999 17,31"
+       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3953-1-1-4"
-       inkscape:connector-curvature="0" />
+       d="M 17,26.999999 17,31"
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 17,43.000001 17,47"
        id="path3953-1-5-1"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 17,43.000001 17,47"
+       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3953-1-1-7-2"
-       inkscape:connector-curvature="0" />
+       d="M 17,43.000001 17,47"
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 57,28.999999 57,33"
        id="path3953-1-9-3"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 57,28.999999 57,33"
+       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3953-1-1-4-3"
-       inkscape:connector-curvature="0" />
+       d="M 57,28.999999 57,33"
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 57,45.000001 57,49"
        id="path3953-1-5-1-4"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 57,45.000001 57,49"
+       style="fill:none;stroke:#204a87;stroke-width:5.99999952000000030;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
        id="path3953-1-1-7-2-1"
-       inkscape:connector-curvature="0" />
+       d="M 57,45.000001 57,49"
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
   <metadata
      id="metadata5469">
@@ -541,7 +409,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_SelectGroup</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_SelectPlane.svg b/src/Mod/Draft/Resources/icons/Draft_SelectPlane.svg
index a6c856a01c..ef0a10695a 100644
--- a/src/Mod/Draft/Resources/icons/Draft_SelectPlane.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_SelectPlane.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,114 +6,22 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_SelectPlane.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3809">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3811"
          offset="0"
-         id="stop3811" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3813"
          offset="1"
-         id="stop3813" />
-    </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3684"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3144-6">
-      <stop
-         id="stop3146-9"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3148-2"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3686"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3701">
-      <stop
-         id="stop3703"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3705"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       id="linearGradient3708">
-      <stop
-         id="stop3710"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3712"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <radialGradient
        r="34.345188"
@@ -125,188 +31,185 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3723"
-       xlink:href="#linearGradient3144-6"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
+       id="radialGradient3684"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-0"
-       id="linearGradient3934"
+       id="linearGradient3144-6">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3146-9" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3148-2" />
+    </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,519.98085,464.19243)"
-       x1="696.67322"
-       y1="77.046234"
+       id="radialGradient3686"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3701">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3703" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3705" />
+    </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3708">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3710" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3712" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-6"
+       id="radialGradient3723"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       y2="115.01974"
        x2="654.80023"
-       y2="115.01974" />
+       y1="77.046234"
+       x1="696.67322"
+       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,519.98085,464.19243)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3934"
+       xlink:href="#linearGradient3864-0-0" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3942"
-       x1="597.77283"
-       y1="44.024342"
-       x2="619.30328"
+       gradientUnits="userSpaceOnUse"
        y2="30.27434"
-       gradientUnits="userSpaceOnUse" />
+       x2="619.30328"
+       y1="44.024342"
+       x1="597.77283"
+       id="linearGradient3942"
+       xlink:href="#linearGradient3377" />
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0"
-       id="linearGradient3657"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,536.41251,472.3612)"
-       x1="696.67322"
-       y1="77.046234"
+       y2="139.40982"
        x2="650.70459"
-       y2="139.40982" />
+       y1="77.046234"
+       x1="696.67322"
+       gradientTransform="matrix(0.2210246,-0.5789261,-0.71699693,-0.35346705,536.41251,472.3612)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3657"
+       xlink:href="#linearGradient3864-0" />
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3809"
-       id="linearGradient3815"
-       x1="34"
-       y1="52"
-       x2="22"
+       gradientUnits="userSpaceOnUse"
        y2="10"
-       gradientUnits="userSpaceOnUse" />
+       x2="22"
+       y1="52"
+       x1="34"
+       id="linearGradient3815"
+       xlink:href="#linearGradient3809" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.6040039"
-     inkscape:cx="-38.631572"
-     inkscape:cy="36.854079"
-     inkscape:current-layer="g4075"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="true"
-     inkscape:object-nodes="false"
-     inkscape:object-paths="true"
-     inkscape:snap-grids="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3021"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4075"
-       style="stroke:#042a2a;stroke-width:2;fill:#16d0d2">
+       style="stroke:#042a2a;stroke-width:2;fill:#16d0d2"
+       id="g4075">
       <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path3305"
+         style="fill:url(#linearGradient3815);fill-opacity:1;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="M 35,3 9,16 9,61 13,61 51.020744,40.40543 51,3 z"
-         style="fill:url(#linearGradient3815);fill-opacity:1;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path3305" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3190"
+         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="M 3,19 35,3"
-         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path3190" />
       <path
-         sodipodi:nodetypes="ccccccc"
-         inkscape:connector-curvature="0"
-         id="path3305-1"
+         style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="M 35.5,5 11,17.2 11,59 12.5,59 49,39.2 49,5 z"
-         style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path3305-1" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3190-7"
+         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="M 3,43 61,11"
-         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path3190-7" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3190-9"
+         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="M 13,61 61,35"
-         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path3190-9" />
       <path
-         sodipodi:nodetypes="cc"
-         inkscape:connector-curvature="0"
-         id="path3190-1"
+         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="M 51,61 61,55"
-         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         id="path3190-1" />
       <path
-         inkscape:connector-curvature="0"
-         id="path3224"
+         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="M 9,3 9,61"
-         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
+         id="path3224" />
       <path
-         inkscape:connector-curvature="0"
-         id="path3224-4"
+         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          d="m 31,3 0,58"
-         style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
+         id="path3224-4" />
       <path
-         transform="matrix(0.87830639,-0.4780982,0,1,0,0)"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.13406180999999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 21.632542,35.342479 27.325317,1.064185 0,20 -27.325317,-1.064185 z"
          id="rect3170"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="m 21.632542,35.342479 27.325317,1.064185 0,20 -27.325317,-1.064185 z"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.13406180999999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(0.87830639,-0.4780982,0,1,0,0)" />
       <path
-         inkscape:connector-curvature="0"
-         id="path3224-7"
-         d="m 51,3 0,58"
          style="fill:#16d0d2;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:nodetypes="cc" />
+         d="m 51,3 0,58"
+         id="path3224-7" />
     </g>
   </g>
   <metadata
@@ -317,7 +220,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_SelectPlane</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_ShapeString.svg b/src/Mod/Draft/Resources/icons/Draft_ShapeString.svg
index 4f57f62411..1fcca51e11 100644
--- a/src/Mod/Draft/Resources/icons/Draft_ShapeString.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_ShapeString.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,135 +6,81 @@
    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"
+   version="1.1"
    id="svg4594"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_ShapeString.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs4596">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3811">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop3813"
          offset="0"
-         id="stop3813" />
+         style="stop-color:#c4a000;stop-opacity:1" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop3815"
          offset="1"
-         id="stop3815" />
+         style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3788">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop3790"
          offset="0"
-         id="stop3790" />
+         style="stop-color:#c4a000;stop-opacity:1" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop3792"
          offset="1"
-         id="stop3792" />
+         style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
-    <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="perspective4602" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3788"
-       id="linearGradient3794"
-       x1="36.046734"
-       y1="50.470772"
-       x2="20.47628"
+       gradientUnits="userSpaceOnUse"
        y2="11.793966"
-       gradientUnits="userSpaceOnUse" />
+       x2="20.47628"
+       y1="50.470772"
+       x1="36.046734"
+       id="linearGradient3794"
+       xlink:href="#linearGradient3788" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3811"
-       id="linearGradient3817"
-       x1="43.087261"
-       y1="57.876183"
-       x2="31.328201"
+       gradientUnits="userSpaceOnUse"
        y2="11.339914"
-       gradientUnits="userSpaceOnUse" />
+       x2="31.328201"
+       y1="57.876183"
+       x1="43.087261"
+       id="linearGradient3817"
+       xlink:href="#linearGradient3811" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.4135725"
-     inkscape:cx="36.288687"
-     inkscape:cy="13.525881"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="1912"
-     inkscape:window-y="-8"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2991"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4061"
+       transform="matrix(1.0012484,0,0,1.2260559,45.70983,21.37906)"
        style="fill:#fce94f;stroke:#302b00;stroke-width:1.80511105000000010"
-       transform="matrix(1.0012484,0,0,1.2260559,45.70983,21.37906)">
+       id="g4061">
       <g
-         transform="scale(1.258685,0.79447996)"
-         inkscape:transform-center-x="1.9859923"
-         inkscape:transform-center-y="17.646795"
+         id="text3103"
          style="font-size:80.06713104000000700px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;color:#000000;stroke:#302b00;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman, Italic';fill:#fce94f"
-         id="text3103">
+         transform="scale(1.258685,0.79447996)">
         <path
-           d="m -32.302817,38.622148 4.378671,-19.664925 1.32924,0 c -0.182451,1.902653 -0.273673,3.479495 -0.273667,4.730529 -6e-6,3.570712 1.140271,6.476791 3.420836,8.718247 2.280547,2.241465 5.258301,3.362195 8.933272,3.362194 3.414299,1e-6 6.0076165,-1.049054 7.7799602,-3.14717 1.7722914,-2.098107 2.6584502,-4.515496 2.658479,-7.252174 -2.88e-5,-1.772306 -0.404013,-3.388243 -1.2119537,-4.847815 -1.2250117,-2.163253 -4.4959801,-5.968523 -9.8129145,-11.4158215 -2.580304,-2.606321 -4.235336,-4.5480512 -4.965101,-5.8251965 -1.198933,-2.1111088 -1.798394,-4.3265058 -1.798383,-6.6461974 -1.1e-5,-3.7009753 1.381354,-6.8676896 4.1441,-9.5001526 2.762715,-2.632363 6.30735,-3.948569 10.6339157,-3.948623 1.4595298,5.4e-5 2.840895,0.143403 4.1440995,0.430048 0.8079384,0.156434 2.28052579,0.677704 4.4177666,1.563811 1.5116482,0.599512 2.34568,0.925306 2.5020978,0.977382 0.3648521,0.07824 0.7688362,0.117337 1.2119536,0.117286 0.7558033,5.1e-5 1.4073906,-0.195425 1.954764,-0.586429 0.5472933,-0.390901 1.1858489,-1.224933 1.9156686,-2.502098 l 1.4856202,0 -4.0659086,17.59287513 -1.3292394,0 C 5.2546759,-0.78585482 5.3068029,-2.0499342 5.3068411,-3.0143239 5.3068029,-6.1679662 4.2642632,-8.748252 2.1792188,-10.755189 c -2.08511451,-2.006841 -4.834813,-3.010285 -8.2491039,-3.010337 -2.71063,5.2e-5 -4.9129949,0.794988 -6.6071019,2.384812 -1.694147,1.5899223 -2.541211,3.4273986 -2.541193,5.5124347 -1.8e-5,1.8244878 0.5408,3.564226 1.622454,5.21921976 1.081615,1.65506984 3.570679,4.35264144 7.467198,8.09272274 3.8964655,3.7401408 6.41810849,6.6592528 7.5649365,8.7573428 1.1467594,2.098132 1.7201562,4.333077 1.7201922,6.70484 -3.6e-5,2.684554 -0.7102662,5.284388 -2.1306927,7.799508 -1.42049421,2.515134 -3.4599625,4.46338 -6.1184111,5.844744 -2.6585041,1.381366 -5.5645839,2.072049 -8.7182469,2.07205 -1.563829,-1e-6 -3.023385,-0.14335 -4.378672,-0.430048 -1.355316,-0.286699 -3.518586,-0.990414 -6.489816,-2.111145 -1.016484,-0.390951 -1.863548,-0.586427 -2.541193,-0.586429 -1.537752,2e-6 -2.736672,1.042541 -3.596766,3.127622 z"
+           id="path2997"
            style="stroke:#302b00;marker:none;fill:#fce94f"
-           id="path2997" />
+           d="m -32.302817,38.622148 4.378671,-19.664925 1.32924,0 c -0.182451,1.902653 -0.273673,3.479495 -0.273667,4.730529 -6e-6,3.570712 1.140271,6.476791 3.420836,8.718247 2.280547,2.241465 5.258301,3.362195 8.933272,3.362194 3.414299,1e-6 6.0076165,-1.049054 7.7799602,-3.14717 1.7722914,-2.098107 2.6584502,-4.515496 2.658479,-7.252174 -2.88e-5,-1.772306 -0.404013,-3.388243 -1.2119537,-4.847815 -1.2250117,-2.163253 -4.4959801,-5.968523 -9.8129145,-11.4158215 -2.580304,-2.606321 -4.235336,-4.5480512 -4.965101,-5.8251965 -1.198933,-2.1111088 -1.798394,-4.3265058 -1.798383,-6.6461974 -1.1e-5,-3.7009753 1.381354,-6.8676896 4.1441,-9.5001526 2.762715,-2.632363 6.30735,-3.948569 10.6339157,-3.948623 1.4595298,5.4e-5 2.840895,0.143403 4.1440995,0.430048 0.8079384,0.156434 2.28052579,0.677704 4.4177666,1.563811 1.5116482,0.599512 2.34568,0.925306 2.5020978,0.977382 0.3648521,0.07824 0.7688362,0.117337 1.2119536,0.117286 0.7558033,5.1e-5 1.4073906,-0.195425 1.954764,-0.586429 0.5472933,-0.390901 1.1858489,-1.224933 1.9156686,-2.502098 l 1.4856202,0 -4.0659086,17.59287513 -1.3292394,0 C 5.2546759,-0.78585482 5.3068029,-2.0499342 5.3068411,-3.0143239 5.3068029,-6.1679662 4.2642632,-8.748252 2.1792188,-10.755189 c -2.08511451,-2.006841 -4.834813,-3.010285 -8.2491039,-3.010337 -2.71063,5.2e-5 -4.9129949,0.794988 -6.6071019,2.384812 -1.694147,1.5899223 -2.541211,3.4273986 -2.541193,5.5124347 -1.8e-5,1.8244878 0.5408,3.564226 1.622454,5.21921976 1.081615,1.65506984 3.570679,4.35264144 7.467198,8.09272274 3.8964655,3.7401408 6.41810849,6.6592528 7.5649365,8.7573428 1.1467594,2.098132 1.7201562,4.333077 1.7201922,6.70484 -3.6e-5,2.684554 -0.7102662,5.284388 -2.1306927,7.799508 -1.42049421,2.515134 -3.4599625,4.46338 -6.1184111,5.844744 -2.6585041,1.381366 -5.5645839,2.072049 -8.7182469,2.07205 -1.563829,-1e-6 -3.023385,-0.14335 -4.378672,-0.430048 -1.355316,-0.286699 -3.518586,-0.990414 -6.489816,-2.111145 -1.016484,-0.390951 -1.863548,-0.586427 -2.541193,-0.586429 -1.537752,2e-6 -2.736672,1.042541 -3.596766,3.127622 z" />
       </g>
     </g>
     <text
-       xml:space="preserve"
-       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#edd400;fill-opacity:1;stroke:#302b00;font-family:Sans;stroke-width:2"
-       x="15.684914"
-       y="19.773684"
        id="text3097"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan3099"
+       y="19.773684"
+       x="15.684914"
+       style="font-style:normal;font-weight:normal;line-height:0%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#edd400;fill-opacity:1;stroke:#302b00;stroke-width:2"
+       xml:space="preserve"><tspan
+         style="font-size:40px;line-height:1.25;font-family:sans-serif"
+         y="19.773684"
          x="15.684914"
-         y="19.773684" /></text>
+         id="tspan3099"> </tspan></text>
     <path
-       style="font-size:80.06713104000000700px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:url(#linearGradient3817);stroke:#fce94f;stroke-width:1.99999988000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman, Italic';fill-opacity:1"
-       d="m 29.3519,8.1347804 c -6.562684,1.410881 -12.046817,9.5244946 -7.125,15.3437496 6.101664,7.122025 16.730075,11.103607 20.25,20.375 1.126065,4.464765 -1.197115,9.158945 -4.84375,11.71875 7.159093,-1.69687 13.379117,-10.628 8.40625,-17.25 -5.88152,-7.936101 -17.468774,-10.974591 -21.125,-20.625 -1.1145,-3.968568 1.528727,-7.9065687 4.90625,-9.7187496 z M 55.421432,9.446023 c -1.454337,1.571174 -6.612341,-0.6947496 -3.340117,1.766067 1.949211,2.859194 1.686574,5.783269 2.487426,0.446825 0.281039,-0.770956 1.351842,-2.274891 0.852691,-2.212892 z M 8.4769001,54.72853 c 1.6840469,-1.546034 6.5798229,0.09763 5.9374999,-0.6875 -1.89754,-1.615914 -3.316472,-3.755951 -3.96875,-6.15625 -0.6562499,2.28125 -1.3124999,4.5625 -1.9687499,6.84375 z"
        id="path2997-0"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccccccccccc" />
+       d="m 29.3519,8.1347804 c -6.562684,1.410881 -12.046817,9.5244946 -7.125,15.3437496 6.101664,7.122025 16.730075,11.103607 20.25,20.375 1.126065,4.464765 -1.197115,9.158945 -4.84375,11.71875 7.159093,-1.69687 13.379117,-10.628 8.40625,-17.25 -5.88152,-7.936101 -17.468774,-10.974591 -21.125,-20.625 -1.1145,-3.968568 1.528727,-7.9065687 4.90625,-9.7187496 z M 55.421432,9.446023 c -1.454337,1.571174 -6.612341,-0.6947496 -3.340117,1.766067 1.949211,2.859194 1.686574,5.783269 2.487426,0.446825 0.281039,-0.770956 1.351842,-2.274891 0.852691,-2.212892 z M 8.4769001,54.72853 c 1.6840469,-1.546034 6.5798229,0.09763 5.9374999,-0.6875 -1.89754,-1.615914 -3.316472,-3.755951 -3.96875,-6.15625 -0.6562499,2.28125 -1.3124999,4.5625 -1.9687499,6.84375 z"
+       style="font-size:80.06713104000000700px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:url(#linearGradient3817);stroke:#fce94f;stroke-width:1.99999988000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman, Italic';fill-opacity:1" />
   </g>
   <metadata
      id="metadata5540">
@@ -146,7 +90,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_ShapeString</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Apr 15 13:25:25 2013 -0400</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Slope.svg b/src/Mod/Draft/Resources/icons/Draft_Slope.svg
index 0aea1c6026..a38ea3a253 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Slope.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Slope.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,477 +6,343 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Slope.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3880">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3882"
          offset="0"
-         id="stop3882" />
+         style="stop-color:#ffffff;stop-opacity:1" />
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
+         id="stop3884"
          offset="1"
-         id="stop3884" />
+         style="stop-color:#d3d7cf;stop-opacity:1" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#0048c8;stop-opacity:1"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#0048c8;stop-opacity:1" />
       <stop
-         style="stop-color:#30a1e4;stop-opacity:1"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#30a1e4;stop-opacity:1" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5225"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-8"
-       id="radialGradient4317"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4317"
+       xlink:href="#linearGradient3144-8" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96" />
       <stop
-         id="stop3148-4"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5301"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-8-4">
       <stop
-         id="stop3146-96-8"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96-8" />
       <stop
-         id="stop3148-4-0"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4-0" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4095"
-       id="linearGradient4248"
-       x1="11.263056"
-       y1="21.430153"
-       x2="55.130848"
+       gradientUnits="userSpaceOnUse"
        y2="21.430153"
-       gradientUnits="userSpaceOnUse" />
+       x2="55.130848"
+       y1="21.430153"
+       x1="11.263056"
+       id="linearGradient4248"
+       xlink:href="#linearGradient4095" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3909"
-       x1="43"
-       y1="22"
-       x2="48"
+       gradientUnits="userSpaceOnUse"
        y2="44"
-       gradientUnits="userSpaceOnUse" />
+       x2="48"
+       y1="22"
+       x1="43"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3895" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(0.93570344,0.35278756,-0.35278756,0.93570344,13.795598,-24.167017)"
-       y2="44"
-       x2="48"
-       y1="22"
-       x1="43"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3023"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3880"
-       id="linearGradient3886"
-       x1="31"
-       y1="30"
-       x2="34"
-       y2="54"
+       id="linearGradient3023"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99519621,0.09790048,-0.09790048,0.99519621,4.3300722,-2.6052795)" />
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientTransform="matrix(0.93570344,0.35278756,-0.35278756,0.93570344,13.795598,-24.167017)" />
+    <linearGradient
+       gradientTransform="matrix(0.99519621,0.09790048,-0.09790048,0.99519621,4.3300722,-2.6052795)"
+       gradientUnits="userSpaceOnUse"
+       y2="54"
+       x2="34"
+       y1="30"
+       x1="31"
+       id="linearGradient3886"
+       xlink:href="#linearGradient3880" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2080078"
-     inkscape:cx="1.8958283"
-     inkscape:cy="40.118885"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3053"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 48.739034,5.0383997 45.211158,14.395434 24.625682,6.6341071 19.686656,19.733957 l 20.585476,7.761326 -3.527876,9.357036 22.840055,-9.556784 z"
        id="path3343"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 48.739034,5.0383997 45.211158,14.395434 24.625682,6.6341071 19.686656,19.733957 l 20.585476,7.761326 -3.527876,9.357036 22.840055,-9.556784 z"
+       style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 48.978634,10.090777 46.37699,16.972417 25.791513,9.21109 22.263638,18.568126 42.849115,26.329451 40.24748,33.211095 56.777189,26.237172 z"
        id="path3343-2"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 48.978634,10.090777 46.37699,16.972417 25.791513,9.21109 22.263638,18.568126 42.849115,26.329451 40.24748,33.211095 56.777189,26.237172 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 5.6837355,34.706483 58.053724,53.925856"
        id="path3074"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:url(#linearGradient3886);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
        d="M 5.6837355,34.706483 58.053724,53.925856"
-       id="path3074-1"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       id="path3074-1"
+       d="M 5.6837355,34.706483 58.053724,53.925856"
+       style="fill:none;stroke:url(#linearGradient3886);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 5.781636,33.711287 58.151625,52.93066"
        id="path3074-1-7"
-       inkscape:connector-curvature="0" />
+       d="M 5.781636,33.711287 58.151625,52.93066"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
   </g>
   <metadata
      id="metadata5630">
@@ -488,7 +352,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Slope</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Aug 22 17:34:38 2016 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Snap.svg b/src/Mod/Draft/Resources/icons/Draft_Snap.svg
index 114b6b4ae5..1072e8090b 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Snap.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Snap.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,219 +6,156 @@
    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="64"
-   height="64"
-   id="svg4025"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Snap.svg">
+   id="svg4025"
+   height="64"
+   width="64">
   <defs
      id="defs4027">
     <linearGradient
        id="linearGradient3760">
       <stop
-         style="stop-color:#003b8c;stop-opacity:1;"
+         id="stop3762"
          offset="0"
-         id="stop3762" />
+         style="stop-color:#003b8c;stop-opacity:1;" />
       <stop
-         style="stop-color:#419ff7;stop-opacity:1;"
+         id="stop3764"
          offset="1"
-         id="stop3764" />
+         style="stop-color:#419ff7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective4033" />
-    <inkscape:perspective
-       id="perspective4010"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4095"
-       id="linearGradient3999"
-       gradientUnits="userSpaceOnUse"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
+       gradientTransform="matrix(0.10456791,0,0,0.10456791,420.90006,31.02362)"
        y2="1190.875"
-       gradientTransform="matrix(0.10456791,0,0,0.10456791,420.90006,31.02362)" />
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3999"
+       xlink:href="#linearGradient4095" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4095"
-       id="linearGradient2979"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.11154583,0,0,0.10632854,-99.034281,-135.70449)"
-       x1="901.1875"
-       y1="1190.875"
+       y2="1190.875"
        x2="1267.9062"
-       y2="1190.875" />
+       y1="1190.875"
+       x1="901.1875"
+       gradientTransform="matrix(0.11154583,0,0,0.10632854,-99.034281,-135.70449)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2979"
+       xlink:href="#linearGradient4095" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3760"
-       id="linearGradient3766"
-       x1="21.512983"
-       y1="40.196293"
-       x2="18.734758"
+       gradientUnits="userSpaceOnUse"
        y2="17.210812"
-       gradientUnits="userSpaceOnUse" />
+       x2="18.734758"
+       y1="40.196293"
+       x1="21.512983"
+       id="linearGradient3766"
+       xlink:href="#linearGradient3760" />
     <linearGradient
        id="linearGradient3760-8">
       <stop
-         style="stop-color:#003b8c;stop-opacity:1;"
+         id="stop3762-0"
          offset="0"
-         id="stop3762-0" />
+         style="stop-color:#003b8c;stop-opacity:1;" />
       <stop
-         style="stop-color:#419ff7;stop-opacity:1;"
+         id="stop3764-3"
          offset="1"
-         id="stop3764-3" />
+         style="stop-color:#419ff7;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3759"
-       id="linearGradient3765"
-       x1="182.81459"
-       y1="728.49023"
-       x2="127.30297"
+       gradientUnits="userSpaceOnUse"
        y2="598.96307"
-       gradientUnits="userSpaceOnUse" />
+       x2="127.30297"
+       y1="728.49023"
+       x1="182.81459"
+       id="linearGradient3765"
+       xlink:href="#linearGradient3759" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3759">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3761"
          offset="0"
-         id="stop3761" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3763"
          offset="1"
-         id="stop3763" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(0.09504067,0,0,0.09264468,4.970005,-73.062176)"
-       y2="598.96307"
-       x2="127.30297"
-       y1="728.49023"
-       x1="182.81459"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3011"
        xlink:href="#linearGradient3759"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836"
-       id="linearGradient3922"
+       id="linearGradient3011"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.19425077,0.01140678,-0.0186946,-0.19481462,52.138813,96.130272)"
-       x1="18.784323"
-       y1="436.03323"
+       x1="182.81459"
+       y1="728.49023"
+       x2="127.30297"
+       y2="598.96307"
+       gradientTransform="matrix(0.09504067,0,0,0.09264468,4.970005,-73.062176)" />
+    <linearGradient
+       y2="499.08353"
        x2="43.604301"
-       y2="499.08353" />
+       y1="436.03323"
+       x1="18.784323"
+       gradientTransform="matrix(-0.19425077,0.01140678,-0.0186946,-0.19481462,52.138813,96.130272)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836" />
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.376965"
-     inkscape:cx="5.5204286"
-     inkscape:cy="33.852871"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3001"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,32)">
+     transform="translate(0,32)"
+     id="layer1">
     <path
-       style="color:#000000;fill:url(#linearGradient3011);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 15,-29 0,16 -12,0 0,8 34,0 0,-8 -14,0 0,-16 z"
        id="rect3942"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       d="m 15,-29 0,16 -12,0 0,8 34,0 0,-8 -14,0 0,-16 z"
+       style="color:#000000;fill:url(#linearGradient3011);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 17,-27 0,16 -12,0 0,4 30,0 0,-4 -14,0 0,-16 z"
        id="rect3942-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       d="m 17,-27 0,16 -12,0 0,4 30,0 0,-4 -14,0 0,-16 z"
+       style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <g
-       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-193.32124,-0.82063019)"
-       id="g3856">
+       id="g3856"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-193.32124,-0.82063019)">
       <rect
-         style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="rect3852"
-         width="58"
-         height="6"
-         x="3"
+         transform="translate(127.44439,128.22016)"
          y="37"
-         transform="translate(127.44439,128.22016)" />
+         x="3"
+         height="6"
+         width="58"
+         id="rect3852"
+         style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 59,41 5,41"
+         transform="translate(127.44439,128.22016)"
          id="path3854"
-         inkscape:connector-curvature="0"
-         transform="translate(127.44439,128.22016)" />
+         d="M 59,41 5,41"
+         style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <path
-       inkscape:connector-curvature="0"
-       style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 29.355216,6.0610588 A 8.9934077,8.993818 45.020423 1 1 47.288878,4.6731528 8.9934077,8.993818 45.020423 1 1 29.355216,6.0610588 z"
        id="path4250"
-       d="M 29.355216,6.0610588 A 8.9934077,8.993818 45.020423 1 1 47.288878,4.6731528 8.9934077,8.993818 45.020423 1 1 29.355216,6.0610588 z" />
+       style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="M 31.358859,5.9113978 A 7.0000001,6.9999997 0 1 1 45.317147,4.8315208 7.0000001,6.9999997 0 0 1 31.358859,5.9113978 z"
        id="path4250-7"
-       d="M 31.358859,5.9113978 A 7.0000001,6.9999997 0 1 1 45.317147,4.8315208 7.0000001,6.9999997 0 0 1 31.358859,5.9113978 z" />
+       style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <metadata
      id="metadata5667">
@@ -230,7 +165,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Snap</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Thu Feb 23 14:44:03 2012 -0200</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Split.svg b/src/Mod/Draft/Resources/icons/Draft_Split.svg
index 242836db88..8f00feece5 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Split.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Split.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,483 +6,347 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   sodipodi:docname="Draft_Split.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
+  <title
+     id="title899">Draft_Split</title>
   <defs
      id="defs3614">
     <linearGradient
        id="linearGradient3836">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         id="stop3838"
          offset="0"
-         id="stop3838" />
+         style="stop-color:#3465a4;stop-opacity:1;" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3840"
          offset="1"
-         id="stop3840" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5225"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96" />
       <stop
-         id="stop3148-4"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4" />
     </linearGradient>
     <linearGradient
        id="linearGradient3895-6">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897-7"
          offset="0"
-         id="stop3897-7" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899-5"
          offset="1"
-         id="stop3899-5" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(-4.1019476,3.5128061,-3.5129662,-4.1021347,429.5903,607.18857)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-6"
+       gradientUnits="userSpaceOnUse"
+       y2="57"
+       x2="34"
+       y1="6"
+       x1="30"
        id="linearGradient3900"
-       x1="30"
-       y1="6"
-       x2="34"
-       y2="57"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="matrix(-4.1019476,3.5128061,-3.5129662,-4.1021347,380.37293,649.40717)"
-       inkscape:collect="always"
        xlink:href="#linearGradient3895-6"
-       id="linearGradient3900-2"
-       x1="30"
-       y1="6"
-       x2="34"
+       gradientTransform="matrix(-4.1019476,3.5128061,-3.5129662,-4.1021347,429.5903,607.18857)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
        y2="57"
-       gradientUnits="userSpaceOnUse" />
+       x2="34"
+       y1="6"
+       x1="30"
+       id="linearGradient3900-2"
+       xlink:href="#linearGradient3895-6"
+       gradientTransform="matrix(-4.1019476,3.5128061,-3.5129662,-4.1021347,380.37293,649.40717)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.138944"
-     inkscape:cx="38.037308"
-     inkscape:cy="23.844104"
-     inkscape:current-layer="g3906"
-     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"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3054"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1"
-       spacingy="1"
-       originx="0"
-       originy="0" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3056"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16"
-       spacingy="16"
-       color="#ff0000"
-       opacity="0.1254902"
-       empcolor="#ff0000"
-       empopacity="0.25098039"
-       originx="0"
-       originy="0" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       transform="translate(-127.44439,-128.22016)"
-       id="g5199">
+       id="g5199"
+       transform="translate(-127.44439,-128.22016)">
       <g
-         id="g3912"
-         transform="translate(0,-21)">
+         transform="translate(0,-21)"
+         id="g3912">
         <g
-           transform="translate(0,13.01548)"
-           id="g3856">
+           id="g3856"
+           transform="translate(0,13.01548)">
           <rect
-             style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             id="rect3852"
-             width="58"
-             height="6"
-             x="3"
+             transform="translate(127.44439,128.22016)"
              y="37"
-             transform="translate(127.44439,128.22016)" />
+             x="3"
+             height="6"
+             width="58"
+             id="rect3852"
+             style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
           <path
-             style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 59,41 H 5"
+             transform="translate(127.44439,128.22016)"
              id="path3854"
-             inkscape:connector-curvature="0"
-             transform="translate(127.44439,128.22016)" />
+             d="M 59,41 H 5"
+             style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
         <g
-           style="stroke:#3465a4;stroke-width:0.8096711"
+           transform="matrix(1.2349522,0.01894995,-0.0189508,1.2348959,-7.1881028,-111.34439)"
            id="g4312"
-           transform="matrix(1.2349522,0.01894995,-0.0189508,1.2348959,-7.1881028,-111.34439)">
+           style="stroke:#3465a4;stroke-width:0.8096711">
           <g
-             style="stroke:#3465a4;stroke-width:0.8096711"
+             id="g4248"
              transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
-             id="g4248">
+             style="stroke:#3465a4;stroke-width:0.8096711">
             <g
-               transform="translate(-3.7314339,-3.2817175)"
+               style="stroke-width:0.8096711"
                id="g3906"
-               style="stroke-width:0.8096711">
+               transform="translate(-3.7314339,-3.2817175)">
               <path
-                 style="fill:none;stroke:#0b1521;stroke-width:43.20526505;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-                 d="M 101.60188,489.87883 270.22425,686.7813"
                  id="path3087"
-                 inkscape:connector-curvature="0" />
-              <path
-                 style="fill:none;stroke:url(#linearGradient3900);stroke-width:21.60263252;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                  d="M 101.60188,489.87883 270.22425,686.7813"
+                 style="fill:none;stroke:#0b1521;stroke-width:43.20526505;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+              <path
                  id="path3087-6"
-                 inkscape:connector-curvature="0" />
+                 d="M 101.60188,489.87883 270.22425,686.7813"
+                 style="fill:none;stroke:url(#linearGradient3900);stroke-width:21.60263252;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
               <path
-                 style="fill:none;stroke:#729fcf;stroke-width:10.80131626;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-                 d="M 105.70382,486.36603 274.3262,683.26849"
                  id="path3087-6-2"
-                 inkscape:connector-curvature="0" />
+                 d="M 105.70382,486.36603 274.3262,683.26849"
+                 style="fill:none;stroke:#729fcf;stroke-width:10.80131626;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
               <path
-                 style="fill:none;stroke:#0b1521;stroke-width:43.20526505;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-                 d="M 52.384508,532.09743 221.00688,728.99989"
                  id="path3087-3"
-                 inkscape:connector-curvature="0" />
-              <path
-                 style="fill:none;stroke:url(#linearGradient3900-2);stroke-width:21.60263252;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
                  d="M 52.384508,532.09743 221.00688,728.99989"
-                 id="path3087-6-3"
-                 inkscape:connector-curvature="0" />
+                 style="fill:none;stroke:#0b1521;stroke-width:43.20526505;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+              <path
+                 id="path3087-6-3"
+                 d="M 52.384508,532.09743 221.00688,728.99989"
+                 style="fill:none;stroke:url(#linearGradient3900-2);stroke-width:21.60263252;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
               <path
-                 style="fill:none;stroke:#729fcf;stroke-width:10.80131626;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-                 d="M 56.486448,528.58463 225.10882,725.48708"
                  id="path3087-6-2-1"
-                 inkscape:connector-curvature="0" />
+                 d="M 56.486448,528.58463 225.10882,725.48708"
+                 style="fill:none;stroke:#729fcf;stroke-width:10.80131626;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
             </g>
           </g>
         </g>
@@ -499,13 +361,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title>Draft_Split</dc:title>
         <cc:license
            rdf:resource="" />
-        <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
+        <dc:date>Tue Jan 29, 2019 9:26 am </dc:date>
         <dc:creator>
           <cc:Agent>
-            <dc:title>[wmayer]</dc:title>
+            <dc:title>[bitacovir]</dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:rights>
@@ -518,7 +380,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_AddPoint.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_Split.svg</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
@@ -527,14 +389,11 @@
         </dc:contributor>
         <dc:subject>
           <rdf:Bag>
-            <rdf:li>plus</rdf:li>
-            <rdf:li>add</rdf:li>
-            <rdf:li>cross</rdf:li>
-            <rdf:li>dot</rdf:li>
             <rdf:li>line</rdf:li>
+            <rdf:li>vertical lines</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <dc:description>A plus sign hovering above a line with a dot at its midpoint</dc:description>
+        <dc:description>One horizontal line. Two vertical lines, perpendicular to the first one, placed close to the midpoint of the first one</dc:description>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Stretch.svg b/src/Mod/Draft/Resources/icons/Draft_Stretch.svg
index 2059699adc..8b61e8ee12 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Stretch.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Stretch.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,226 +6,153 @@
    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"
+   version="1.1"
    id="svg2766"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Stretch.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2768">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3856">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1"
+         id="stop3858"
          offset="0"
-         id="stop3858" />
+         style="stop-color:#3465a4;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3860"
          offset="1"
-         id="stop3860" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3824">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3826"
          offset="0"
-         id="stop3826" />
+         style="stop-color:#729fcf;stop-opacity:1" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3828"
          offset="1"
-         id="stop3828" />
+         style="stop-color:#204a87;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3787">
       <stop
-         id="stop3789"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3789" />
       <stop
-         id="stop3791"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3791" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864">
       <stop
-         id="stop3866"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866" />
       <stop
-         id="stop3868"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868" />
     </linearGradient>
-    <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="perspective2774" />
     <linearGradient
-       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)"
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3036"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
+       id="linearGradient3036"
+       gradientUnits="userSpaceOnUse"
+       x1="56.172409"
+       y1="29.279999"
+       x2="21.689653"
+       y2="36.079998"
+       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3824"
-       id="linearGradient3830-3"
-       x1="591.59064"
-       y1="103.1946"
-       x2="599.1272"
+       gradientTransform="matrix(1.1400105,0,0,2.3311849,-82.179086,-167.4987)"
+       gradientUnits="userSpaceOnUse"
        y2="128.1946"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1400105,0,0,2.3311849,-82.179086,-167.4987)" />
+       x2="599.1272"
+       y1="103.1946"
+       x1="591.59064"
+       id="linearGradient3830-3"
+       xlink:href="#linearGradient3824" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3856"
-       id="linearGradient3862-9"
-       x1="613.25824"
-       y1="135.1946"
-       x2="595.35895"
+       gradientTransform="matrix(1.0614931,0,0,1,-614.9391,-71.223999)"
+       gradientUnits="userSpaceOnUse"
        y2="68.194603"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0614931,0,0,1,-614.9391,-71.223999)" />
+       x2="595.35895"
+       y1="135.1946"
+       x1="613.25824"
+       id="linearGradient3862-9"
+       xlink:href="#linearGradient3856" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3856"
-       id="linearGradient4383"
-       x1="47.999996"
-       y1="88"
-       x2="51.999996"
-       y2="6"
+       gradientTransform="matrix(0.95385159,0,0,1.0280131,576.7393,67.974913)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95385159,0,0,1.0280131,576.7393,67.974913)" />
+       y2="6"
+       x2="51.999996"
+       y1="88"
+       x1="47.999996"
+       id="linearGradient4383"
+       xlink:href="#linearGradient3856" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.4464321"
-     inkscape:cx="11.576002"
-     inkscape:cy="14.040122"
-     inkscape:current-layer="g3518"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-global="false"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2997"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3518"
-       transform="matrix(1.0614931,0,0,1,-612.96941,-69.194602)">
+       transform="matrix(1.0614931,0,0,1,-612.96941,-69.194602)"
+       id="g3518">
       <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(#linearGradient4383);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1.94120502;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif"
-         d="m 609.86837,74.194602 -5.08872,1.851433 3.45586,7.284437 4.5298,-3.030034 z m 4.24202,8.942911 -4.5298,3.028026 2.66221,5.611907 4.5298,-3.028026 z m 4.00729,8.446975 -4.5298,3.030033 2.77772,5.854859 4.5298,-3.028029 z m 4.12281,8.691942 -4.52982,3.03003 2.76655,5.83277 4.52981,-3.02803 z m 4.11347,8.66984 -4.53165,3.02802 2.84414,5.44815 4.43049,-2.59358 -4.4644,2.551 4.50101,-2.57271 z m 4.12281,8.69595 -4.52981,3.03003 0.76755,2.59958 -2.11683,0.85572 0,6.06705 7.3141,0 c 2.89746,-4e-5 3.86363,-2.31781 2.60581,-4.96798 z m -23.21423,6.48533 0.3433,6.06705 4.71035,0 0,-6.06705 z m 8.82193,0.067 0,6 5.65241,5e-5 3e-5,-6.00005 z"
          id="path4267"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccc" />
+         d="m 609.86837,74.194602 -5.08872,1.851433 3.45586,7.284437 4.5298,-3.030034 z m 4.24202,8.942911 -4.5298,3.028026 2.66221,5.611907 4.5298,-3.028026 z m 4.00729,8.446975 -4.5298,3.030033 2.77772,5.854859 4.5298,-3.028029 z m 4.12281,8.691942 -4.52982,3.03003 2.76655,5.83277 4.52981,-3.02803 z m 4.11347,8.66984 -4.53165,3.02802 2.84414,5.44815 4.43049,-2.59358 -4.4644,2.551 4.50101,-2.57271 z m 4.12281,8.69595 -4.52981,3.03003 0.76755,2.59958 -2.11683,0.85572 0,6.06705 7.3141,0 c 2.89746,-4e-5 3.86363,-2.31781 2.60581,-4.96798 z m -23.21423,6.48533 0.3433,6.06705 4.71035,0 0,-6.06705 z m 8.82193,0.067 0,6 5.65241,5e-5 3e-5,-6.00005 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(#linearGradient4383);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1.94120502;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:sans-serif" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 617.02654,126.1946 3.76827,0"
          id="path3834"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="m 617.02654,126.1946 3.76827,0"
+         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 607.60763,126.19124 3.80887,0"
          id="path3834-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="m 607.60763,126.19124 3.80887,0"
+         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#0b1521;stroke-width:7.7648201;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 583.11204,75.194602 0,51.999998 24.4938,0 0,-51.999998 z"
          id="path3018-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="m 583.11204,75.194602 0,51.999998 24.4938,0 0,-51.999998 z"
+         style="fill:none;stroke:#0b1521;stroke-width:7.7648201;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:url(#linearGradient3830-3);stroke-width:3.88241005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 583.11204,75.194602 0,45.999998 0,6 24.4938,0 0,-51.999998 z"
          id="path3018-1-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
+         d="m 583.11204,75.194602 0,45.999998 0,6 24.4938,0 0,-51.999998 z"
+         style="fill:none;stroke:url(#linearGradient3830-3);stroke-width:3.88241005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 585.93825,126.1946 20.72552,0 0,-47.999998 m 0.94207,-4 -25.43587,0 0,52.999998"
          id="path3018-1-7-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
+         d="m 585.93825,126.1946 20.72552,0 0,-47.999998 m 0.94207,-4 -25.43587,0 0,52.999998"
+         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 625.10479,110.9921 2.05437,3.81019"
          id="path3834-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="m 625.10479,110.9921 2.05437,3.81019"
+         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:1.94120514;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 621.00676,102.235 2.10423,3.91605"
          id="path3834-2-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="m 621.00676,102.235 2.10423,3.91605"
+         style="fill:none;stroke:#729fcf;stroke-width:1.94120514;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:1.94120491;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 616.89977,93.53055 2.05436,4.02191"
          id="path3834-2-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="m 616.89977,93.53055 2.05436,4.02191"
+         style="fill:none;stroke:#729fcf;stroke-width:1.94120491;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:1.94120491;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 612.81382,85.229516 1.92181,3.728232"
          id="path3834-2-8"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+         d="m 612.81382,85.229516 1.92181,3.728232"
+         style="fill:none;stroke:#729fcf;stroke-width:1.94120491;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-         d="m 625.6855,125.52981 c 0,0 1.91811,-0.40021 2.46967,-0.86591 0.27577,-0.23286 0.82382,-0.84479 0.70224,-1.8277 -0.12158,-0.98291 -0.86646,-2.3859 -0.86646,-2.3859"
          id="path3834-2-7"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssc" />
+         d="m 625.6855,125.52981 c 0,0 1.91811,-0.40021 2.46967,-0.86591 0.27577,-0.23286 0.82382,-0.84479 0.70224,-1.8277 -0.12158,-0.98291 -0.86646,-2.3859 -0.86646,-2.3859"
+         style="fill:none;stroke:#729fcf;stroke-width:1.94120502;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
     </g>
   </g>
   <metadata
@@ -238,7 +163,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:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_SubelementHighlight.svg b/src/Mod/Draft/Resources/icons/Draft_SubelementHighlight.svg
index 047bb396e3..fd5d89cfbf 100644
--- a/src/Mod/Draft/Resources/icons/Draft_SubelementHighlight.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_SubelementHighlight.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,80 +6,341 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)"
-   sodipodi:docname="Draft_SubelementHighlight.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
+  <title
+     id="title4635">Draft_SubelementHighlight</title>
   <defs
      id="defs3614">
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="radialGradient1263"
        cx="20.892099"
-       id="radialGradient1263">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop1259"
+         offset="0"
          style="stop-color:#3465a4;stop-opacity:1"
-         offset="0" />
+         id="stop1259" />
       <stop
-         id="stop1261"
+         offset="1.0000000"
          style="stop-color:#729fcf;stop-opacity:1"
-         offset="1.0000000" />
+         id="stop1261" />
     </radialGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
+    <linearGradient
+       id="linearGradient3708">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3710" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop3712" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3864-0-0">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3866-5-7" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3868-7-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3377">
+      <stop
+         style="stop-color:#ffaa00;stop-opacity:1;"
+         offset="0"
+         id="stop3379" />
+      <stop
+         style="stop-color:#faff2b;stop-opacity:1;"
+         offset="1"
+         id="stop3381" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3864-0">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3866-5" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3868-7" />
+    </linearGradient>
+    <linearGradient
+       y2="609.50507"
+       x2="302.85715"
+       y1="366.64789"
+       x1="302.85715"
+       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5027"
+       xlink:href="#linearGradient5048" />
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         id="stop5050"
+         offset="0"
+         style="stop-color:black;stop-opacity:0;" />
+      <stop
+         style="stop-color:black;stop-opacity:1;"
+         offset="0.5"
+         id="stop5056" />
+      <stop
+         id="stop5052"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </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,-1891.633,-872.8854)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient5029"
+       xlink:href="#linearGradient5060" />
+    <linearGradient
+       id="linearGradient5060">
+      <stop
+         id="stop5062"
+         offset="0"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         id="stop5064"
+         offset="1"
+         style="stop-color:black;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient5060"
+       id="radialGradient5392"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
+       cx="605.71429"
+       cy="486.64789"
+       fx="605.71429"
+       fy="486.64789"
+       r="117.14286" />
+    <linearGradient
+       xlink:href="#linearGradient3841-0-3"
+       id="linearGradient3847-7-5"
+       x1="3709.3296"
+       y1="1286.7291"
+       x2="3935.5251"
+       y2="1076.6174"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3841-0-3">
+      <stop
+         style="stop-color:#0619c0;stop-opacity:1;"
+         offset="0"
+         id="stop3843-1-3" />
+      <stop
+         style="stop-color:#379cfb;stop-opacity:1;"
+         offset="1"
+         id="stop3845-0-8" />
+    </linearGradient>
+    <radialGradient
+       r="5.256"
+       fy="114.5684"
+       fx="20.892099"
+       cy="114.5684"
+       cx="20.892099"
+       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2283"
+       xlink:href="#aigrd2" />
+    <radialGradient
+       id="aigrd2"
+       cx="20.892099"
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop15566" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+         id="stop15568" />
+    </radialGradient>
+    <radialGradient
+       r="5.257"
+       fy="64.567902"
+       fx="20.892099"
+       cy="64.567902"
+       cx="20.892099"
+       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2285"
+       xlink:href="#aigrd3" />
+    <radialGradient
+       id="aigrd3"
+       cx="20.892099"
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
+      <stop
+         offset="0"
+         style="stop-color:#F0F0F0"
+         id="stop15573" />
+      <stop
+         offset="1.0000000"
+         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+         id="stop15575" />
+    </radialGradient>
+    <radialGradient
+       xlink:href="#linearGradient15662"
+       id="radialGradient15668"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
+       cx="8.1435566"
+       cy="7.2678967"
+       fx="8.1435566"
+       fy="7.2678967"
+       r="38.158695" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         id="stop15664"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop15666"
+         offset="1.0000000"
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient259"
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         id="stop260"
+         offset="0.0000000"
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+      <stop
+         id="stop261"
+         offset="1.0000000"
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient269"
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         id="stop270"
+         offset="0.0000000"
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+      <stop
+         id="stop271"
+         offset="1.0000000"
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient259"
+       id="radialGradient3972"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,8.6869921,-61.713721)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
+    <radialGradient
+       xlink:href="#linearGradient269"
+       id="radialGradient3974"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
+    <linearGradient
+       y2="1190.875"
+       x2="1267.9062"
+       y1="1190.875"
+       x1="901.1875"
+       gradientTransform="matrix(0.10456791,0,0,0.10456791,368.43605,-33.490763)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4937"
+       xlink:href="#linearGradient4095" />
+    <linearGradient
+       id="linearGradient4095">
+      <stop
+         id="stop4097"
+         offset="0"
+         style="stop-color:#005bff;stop-opacity:1;" />
+      <stop
+         id="stop4099"
+         offset="1"
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-6"
+       id="radialGradient3688-1"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        cx="225.26402"
@@ -89,93 +348,9 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <linearGradient
-       id="linearGradient3708">
-      <stop
-         id="stop3710"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3712"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="linearGradient3864-0-0">
-      <stop
-         id="stop3866-5-7"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3868-7-6"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         id="stop3379"
-         offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
-      <stop
-         id="stop3381"
-         offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3864-0">
-      <stop
-         id="stop3866-5"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3868-7"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       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">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
     <radialGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient5060"
-       id="radialGradient5029"
+       id="radialGradient5029-9"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
        cx="605.71429"
@@ -183,18 +358,6 @@
        fx="605.71429"
        fy="486.64789"
        r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
     <radialGradient
        r="117.14286"
        fy="486.64789"
@@ -203,33 +366,11 @@
        cx="605.71429"
        gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient5392"
-       xlink:href="#linearGradient5060"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="1076.6174"
-       x2="3935.5251"
-       y1="1286.7291"
-       x1="3709.3296"
-       id="linearGradient3847-7-5"
-       xlink:href="#linearGradient3841-0-3"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3841-0-3">
-      <stop
-         id="stop3843-1-3"
-         offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
-      <stop
-         id="stop3845-0-8"
-         offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
-    </linearGradient>
+       id="radialGradient5392-2"
+       xlink:href="#linearGradient5060" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd2"
-       id="radialGradient2283"
+       xlink:href="#aigrd2-9"
+       id="radialGradient2283-5"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
        cx="20.892099"
@@ -244,20 +385,19 @@
        r="5.256"
        cy="114.5684"
        cx="20.892099"
-       id="aigrd2">
+       id="aigrd2-9">
       <stop
-         id="stop15566"
+         id="stop15566-2"
          style="stop-color:#F0F0F0"
          offset="0" />
       <stop
-         id="stop15568"
+         id="stop15568-2"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
          offset="1.0000000" />
     </radialGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#aigrd3"
-       id="radialGradient2285"
+       xlink:href="#aigrd3-9"
+       id="radialGradient2285-8"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
        cx="20.892099"
@@ -272,13 +412,13 @@
        r="5.257"
        cy="64.567902"
        cx="20.892099"
-       id="aigrd3">
+       id="aigrd3-9">
       <stop
-         id="stop15573"
+         id="stop15573-7"
          style="stop-color:#F0F0F0"
          offset="0" />
       <stop
-         id="stop15575"
+         id="stop15575-3"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
          offset="1.0000000" />
     </radialGradient>
@@ -290,525 +430,215 @@
        cx="8.1435566"
        gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient15668"
-       xlink:href="#linearGradient15662"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop15664" />
-      <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop15666" />
-    </linearGradient>
-    <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
-       xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop260" />
-      <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop261" />
-    </linearGradient>
-    <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
-       xlink:href="#linearGradient269"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient269">
-      <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop270" />
-      <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop271" />
-    </linearGradient>
-    <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,8.6869921,-61.713721)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3972"
-       xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3974"
-       xlink:href="#linearGradient269"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4095"
-       id="linearGradient4937"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.10456791,0,0,0.10456791,368.43605,-33.490763)"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875" />
-    <linearGradient
-       id="linearGradient4095">
-      <stop
-         style="stop-color:#005bff;stop-opacity:1;"
-         offset="0"
-         id="stop4097" />
-      <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
-         offset="1"
-         id="stop4099" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective3620-7"
-       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" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3588-5" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3692-3" />
-    <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3688-1"
-       xlink:href="#linearGradient3144-6"
-       inkscape:collect="always" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3805-0" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective3902-6" />
-    <radialGradient
-       r="117.14286"
-       fy="486.64789"
-       fx="605.71429"
-       cy="486.64789"
-       cx="605.71429"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient5029-9"
-       xlink:href="#linearGradient5060"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5392-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <radialGradient
-       r="5.256"
-       fy="114.5684"
-       fx="20.892099"
-       cy="114.5684"
-       cx="20.892099"
-       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2283-5"
-       xlink:href="#aigrd2-9"
-       inkscape:collect="always" />
-    <radialGradient
-       id="aigrd2-9"
-       cx="20.892099"
-       cy="114.5684"
-       r="5.256"
-       fx="20.892099"
-       fy="114.5684"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         offset="0"
-         style="stop-color:#F0F0F0"
-         id="stop15566-2" />
-      <stop
-         offset="1.0000000"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         id="stop15568-2" />
-    </radialGradient>
-    <radialGradient
-       r="5.257"
-       fy="64.567902"
-       fx="20.892099"
-       cy="64.567902"
-       cx="20.892099"
-       gradientTransform="matrix(0.229703,0,0,0.229703,4.613529,3.979808)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient2285-8"
-       xlink:href="#aigrd3-9"
-       inkscape:collect="always" />
-    <radialGradient
-       id="aigrd3-9"
-       cx="20.892099"
-       cy="64.567902"
-       r="5.257"
-       fx="20.892099"
-       fy="64.567902"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         offset="0"
-         style="stop-color:#F0F0F0"
-         id="stop15573-7" />
-      <stop
-         offset="1.0000000"
-         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         id="stop15575-3" />
-    </radialGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15662"
        id="radialGradient15668-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
-       cx="8.1435566"
-       cy="7.2678967"
-       fx="8.1435566"
-       fy="7.2678967"
-       r="38.158695" />
+       xlink:href="#linearGradient15662" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient4452-9"
-       gradientUnits="userSpaceOnUse"
+       r="86.70845"
+       fy="35.736916"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
        gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       cx="33.966679"
-       cy="35.736916"
-       fx="33.966679"
-       fy="35.736916"
-       r="86.70845" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient269"
-       id="radialGradient4454-9"
        gradientUnits="userSpaceOnUse"
+       id="radialGradient4452-9"
+       xlink:href="#linearGradient259" />
+    <radialGradient
+       r="37.751713"
+       fy="3.7561285"
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
        gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       cx="8.824419"
-       cy="3.7561285"
-       fx="8.824419"
-       fy="3.7561285"
-       r="37.751713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient3972-8"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,8.6869921,-61.713721)"
-       cx="33.966679"
-       cy="35.736916"
-       fx="33.966679"
+       id="radialGradient4454-9"
+       xlink:href="#linearGradient269" />
+    <radialGradient
+       r="86.70845"
        fy="35.736916"
-       r="86.70845" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient269"
-       id="radialGradient3974-4"
+       fx="33.966679"
+       cy="35.736916"
+       cx="33.966679"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,8.6869921,-61.713721)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
-       cx="8.824419"
-       cy="3.7561285"
-       fx="8.824419"
+       id="radialGradient3972-8"
+       xlink:href="#linearGradient259" />
+    <radialGradient
+       r="37.751713"
        fy="3.7561285"
-       r="37.751713" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective4947-5" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#radialGradient1263"
-       id="linearGradient1257"
-       x1="529.12408"
-       y1="123.0061"
-       x2="534.21271"
-       y2="128.0061"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="translate(40.708704,-12.000002)"
-       inkscape:collect="always"
-       xlink:href="#radialGradient1263-5"
-       id="linearGradient1257-2"
-       x1="529.12408"
-       y1="123.0061"
-       x2="534.21271"
-       y2="128.0061"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
+       fx="8.824419"
+       cy="3.7561285"
+       cx="8.824419"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
        gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="radialGradient3974-4"
+       xlink:href="#linearGradient269" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="128.0061"
+       x2="534.21271"
+       y1="123.0061"
+       x1="529.12408"
+       id="linearGradient1257"
+       xlink:href="#radialGradient1263" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="128.0061"
+       x2="534.21271"
+       y1="123.0061"
+       x1="529.12408"
+       id="linearGradient1257-2"
+       xlink:href="#radialGradient1263-5"
+       gradientTransform="translate(40.708704,-12.000002)" />
+    <radialGradient
+       id="radialGradient1263-5"
        cx="20.892099"
-       id="radialGradient1263-5">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop1259-4"
+         offset="0"
          style="stop-color:#3465a4;stop-opacity:1"
-         offset="0" />
+         id="stop1259-4" />
       <stop
-         id="stop1261-7"
+         offset="1.0000000"
          style="stop-color:#729fcf;stop-opacity:1"
-         offset="1.0000000" />
+         id="stop1261-7" />
     </radialGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#radialGradient1263-5"
-       id="linearGradient1294"
-       gradientUnits="userSpaceOnUse"
+       y2="128.0061"
+       x2="534.21271"
+       y1="123.0061"
+       x1="529.12408"
        gradientTransform="translate(27.478365,-22.000009)"
-       x1="529.12408"
-       y1="123.0061"
-       x2="534.21271"
-       y2="128.0061" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#radialGradient1263-5"
-       id="linearGradient1298"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(24.425229,-50.000016)"
-       x1="529.12408"
-       y1="123.0061"
+       id="linearGradient1294"
+       xlink:href="#radialGradient1263-5" />
+    <linearGradient
+       y2="128.0061"
        x2="534.21271"
-       y2="128.0061" />
+       y1="123.0061"
+       x1="529.12408"
+       gradientTransform="translate(24.425229,-50.000016)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1298"
+       xlink:href="#radialGradient1263-5" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="5.8535701"
-     inkscape:cx="25.567473"
-     inkscape:cy="37.810786"
-     inkscape:current-layer="g4928"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1334"
-     inkscape:window-height="644"
-     inkscape:window-x="1749"
-     inkscape:window-y="209"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3073"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4928"
-       transform="matrix(0.98259094,0,0,1,-503.91256,-68.006097)">
+       transform="matrix(0.98259094,0,0,1,-503.91256,-68.006097)"
+       id="g4928">
       <path
-         inkscape:connector-curvature="0"
-         style="fill:none;fill-opacity:1;stroke:#0b1521;stroke-width:4.03527943;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 529.03581,126.01891 c 0,0 16.45899,-5.20628 23.15126,-7.35286 6.69226,-2.14657 17.64574,-5.65995 17.64574,-5.65995 l -11.8693,-9.84899 -2.46704,-31.138218"
          id="path3278-8"
-         sodipodi:nodetypes="czccc" />
+         d="m 529.03581,126.01891 c 0,0 16.45899,-5.20628 23.15126,-7.35286 6.69226,-2.14657 17.64574,-5.65995 17.64574,-5.65995 l -11.8693,-9.84899 -2.46704,-31.138218"
+         style="fill:none;fill-opacity:1;stroke:#0b1521;stroke-width:4.03527943;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <path
-         style="fill:none;fill-opacity:1;stroke:#7e98b6;stroke-width:1.00881982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="m 531.15955,125.00609 38.67326,-11.99999 -12.21261,-10 -2.03543,-29.000009"
          id="path3278-8-3"
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0" />
+         d="m 531.15955,125.00609 38.67326,-11.99999 -12.21261,-10 -2.03543,-29.000009"
+         style="fill:none;fill-opacity:1;stroke:#7e98b6;stroke-width:1.00881982;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <g
-         transform="matrix(0.89519954,0,0,0.89481362,117.45341,-2.692555)"
+         style="stroke-width:1.11731029"
          id="g3973-3"
-         style="stroke-width:1.11731029">
+         transform="matrix(0.89519954,0,0,0.89481362,117.45341,-2.692555)">
         <path
-           style="fill:#ffffff;stroke:#0b1521;stroke-width:2.25432944;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-           d="m 477.22051,113.0061 6.10631,16 -18.31892,-4 -2.03543,-4 10.17717,-10 z"
            id="path3969-2"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccc" />
+           d="m 477.22051,113.0061 6.10631,16 -18.31892,-4 -2.03543,-4 10.17717,-10 z"
+           style="fill:#ffffff;stroke:#0b1521;stroke-width:2.25432944;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
         <path
-           style="fill:#729fcf;stroke:none;stroke-width:1.11731029"
-           d="m 456.86616,93.006094 -4.07087,4 20.35435,20.000006 c 0,-3 1.01772,-4 4.07087,-4 z"
            id="path3843-0"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           d="m 456.86616,93.006094 -4.07087,4 20.35435,20.000006 c 0,-3 1.01772,-4 4.07087,-4 z"
+           style="fill:#729fcf;stroke:none;stroke-width:1.11731029" />
         <path
-           style="fill:#3465a4;stroke:none;stroke-width:1.11731029"
-           d="m 452.79529,97.006087 -4.07087,4.000013 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
            id="path3843-7-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           d="m 452.79529,97.006087 -4.07087,4.000013 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
+           style="fill:#3465a4;stroke:none;stroke-width:1.11731029" />
         <path
-           style="fill:#204a87;stroke:none;stroke-width:1.11731029"
-           d="m 448.72442,101.0061 -4.07087,4 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
            id="path3843-5-1"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:none;stroke:#3465a4;stroke-width:2.25432944;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 447.70671,103.00609 18.31891,18.00001"
-           id="path3888-55"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#729fcf;stroke-width:2.25432944;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 451.77757,99.006097 470.09649,117.0061"
-           id="path3888-5-4"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#0b1521;stroke-width:2.25432944;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-           d="m 456.86616,93.006097 -4.07087,4 20.35435,20.000003 c 0,-3 1.01772,-4 4.07087,-4 z"
-           id="path3843-5-6-7"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:none;stroke:#0b1521;stroke-width:2.25432944;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-           d="m 452.79529,97.006097 -4.07087,4.000003 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
-           id="path3843-5-6-2-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
-        <path
-           style="fill:none;stroke:#0b1521;stroke-width:2.25432944;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
            d="m 448.72442,101.0061 -4.07087,4 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
-           id="path3843-5-6-9-5"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           style="fill:#204a87;stroke:none;stroke-width:1.11731029" />
+        <path
+           id="path3888-55"
+           d="m 447.70671,103.00609 18.31891,18.00001"
+           style="fill:none;stroke:#3465a4;stroke-width:2.25432944;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           id="path3888-5-4"
+           d="M 451.77757,99.006097 470.09649,117.0061"
+           style="fill:none;stroke:#729fcf;stroke-width:2.25432944;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           id="path3843-5-6-7"
+           d="m 456.86616,93.006097 -4.07087,4 20.35435,20.000003 c 0,-3 1.01772,-4 4.07087,-4 z"
+           style="fill:none;stroke:#0b1521;stroke-width:2.25432944;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           id="path3843-5-6-2-6"
+           d="m 452.79529,97.006097 -4.07087,4.000003 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
+           style="fill:none;stroke:#0b1521;stroke-width:2.25432944;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           id="path3843-5-6-9-5"
+           d="m 448.72442,101.0061 -4.07087,4 20.35435,20 c 0,-3 1.01772,-4 4.07087,-4 z"
+           style="fill:none;stroke:#0b1521;stroke-width:2.25432944;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
         <path
-           style="fill:#0b1521;stroke:#0b1521;stroke-width:1.12716472px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-           d="m 479.25595,122.0061 c -1.01772,0 -3.63385,2.51623 -4.07087,5 l 8.14174,2 -3.05315,-7 h -1.01772"
            id="path3971-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           d="m 479.25595,122.0061 c -1.01772,0 -3.63385,2.51623 -4.07087,5 l 8.14174,2 -3.05315,-7 h -1.01772"
+           style="fill:#0b1521;stroke:#0b1521;stroke-width:1.12716472px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       </g>
       <rect
-         style="opacity:1;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.01763972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1233"
-         width="8.1417398"
-         height="8"
+         y="121.0061"
          x="527.08868"
-         y="121.0061" />
-      <rect
-         y="109.0061"
-         x="567.79736"
          height="8"
          width="8.1417398"
+         id="rect1233"
+         style="opacity:1;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.01763972;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         style="opacity:1;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="rect1235"
+         width="8.1417398"
+         height="8"
+         x="567.79736"
+         y="109.0061" />
+      <rect
+         y="99.006096"
+         x="554.56708"
+         height="8"
+         width="8.1417398"
+         id="rect1237"
          style="opacity:1;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       <rect
          style="opacity:1;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1237"
-         width="8.1417398"
-         height="8"
-         x="554.56708"
-         y="99.006096" />
-      <rect
-         y="71.006096"
-         x="551.51392"
-         height="8"
-         width="8.1417398"
          id="rect1239"
-         style="opacity:1;fill:#729fcf;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.01763964;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         width="8.1417398"
+         height="8"
+         x="551.51392"
+         y="71.006096" />
       <rect
-         y="123.0061"
-         x="529.12415"
-         height="4.0000024"
-         width="4.0708723"
+         style="opacity:1;fill:url(#linearGradient1257);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="rect1243"
-         style="opacity:1;fill:url(#linearGradient1257);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         y="111.0061"
-         x="569.83282"
-         height="4.0000024"
          width="4.0708723"
+         height="4.0000024"
+         x="529.12415"
+         y="123.0061" />
+      <rect
+         style="opacity:1;fill:url(#linearGradient1257-2);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="rect1243-4"
-         style="opacity:1;fill:url(#linearGradient1257-2);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <rect
-         style="opacity:1;fill:url(#linearGradient1294);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="rect1292"
          width="4.0708723"
          height="4.0000024"
+         x="569.83282"
+         y="111.0061" />
+      <rect
+         y="101.0061"
          x="556.60248"
-         y="101.0061" />
-      <rect
-         y="73.006096"
-         x="553.54932"
          height="4.0000024"
          width="4.0708723"
+         id="rect1292"
+         style="opacity:1;fill:url(#linearGradient1294);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <rect
+         style="opacity:1;fill:url(#linearGradient1298);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="rect1296"
-         style="opacity:1;fill:url(#linearGradient1298);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+         width="4.0708723"
+         height="4.0000024"
+         x="553.54932"
+         y="73.006096" />
     </g>
   </g>
   <metadata
@@ -819,13 +649,13 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Edit</dc:title>
+        <dc:title>Draft_SubelementHighlight</dc:title>
         <cc:license
            rdf:resource="" />
-        <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
+        <dc:date>Oct 8 02:41:00 2019 CDT</dc:date>
         <dc:creator>
           <cc:Agent>
-            <dc:title>[wmayer]</dc:title>
+            <dc:title>[vocx]</dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:rights>
@@ -838,11 +668,11 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_Edit.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Draft/Resources/icons/Draft_SubelementHighlight.svg</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:contributor>
           <cc:Agent>
-            <dc:title>[agryson] Alexander Gryson</dc:title>
+            <dc:title>[agryson] Alexander Gryson, [wmayer]</dc:title>
           </cc:Agent>
         </dc:contributor>
         <dc:subject>
@@ -852,7 +682,7 @@
             <rdf:li>edit</rdf:li>
           </rdf:Bag>
         </dc:subject>
-        <dc:description>Irregular polygon behind a pencil</dc:description>
+        <dc:description>Three straight line segments, with a vertex at each end of a segment, next to a pencil</dc:description>
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/src/Mod/Draft/Resources/icons/Draft_SwitchMode.svg b/src/Mod/Draft/Resources/icons/Draft_SwitchMode.svg
index 18386691d1..ac1460d98c 100644
--- a/src/Mod/Draft/Resources/icons/Draft_SwitchMode.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_SwitchMode.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,354 +6,263 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_SwitchMode.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4095"
-       id="linearGradient4937"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.10456791,0,0,0.10456791,420.90006,-32.97638)"
-       x1="901.1875"
-       y1="1190.875"
+       y2="1190.875"
        x2="1267.9062"
-       y2="1190.875" />
+       y1="1190.875"
+       x1="901.1875"
+       gradientTransform="matrix(0.10456791,0,0,0.10456791,420.90006,-32.97638)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4937"
+       xlink:href="#linearGradient4095" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.8047778"
-     inkscape:cx="-2.9269531"
-     inkscape:cy="33.624764"
-     inkscape:current-layer="g5015"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3039"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       units="px"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       transform="translate(-446.8047,-67.879686)"
+       style="stroke:#2e3436"
        id="g5015"
-       style="stroke:#2e3436">
+       transform="translate(-446.8047,-67.879686)">
       <rect
-         y="92.879707"
-         x="471.80469"
-         height="33.999977"
-         width="33.999607"
+         style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:6;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect4094"
-         style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:6;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         width="33.999607"
+         height="33.999977"
+         x="471.80469"
+         y="92.879707" />
       <rect
-         y="96.879707"
-         x="475.80469"
-         height="26"
-         width="26"
+         style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:square;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"
          id="rect4094-3"
-         style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:square;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" />
+         width="26"
+         height="26"
+         x="475.80469"
+         y="96.879707" />
       <rect
-         y="92.879707"
-         x="471.80508"
-         height="33.999977"
-         width="33.999607"
+         style="color:#000000;fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect4094-67"
-         style="color:#000000;fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         y="72.879684"
-         x="451.80469"
-         height="33.999977"
          width="33.999607"
+         height="33.999977"
+         x="471.80508"
+         y="92.879707" />
+      <rect
+         style="color:#000000;fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect4094-6"
-         style="color:#000000;fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         y="72.879684"
-         x="451.80469"
-         height="33.999977"
          width="33.999607"
+         height="33.999977"
+         x="451.80469"
+         y="72.879684" />
+      <rect
+         style="color:#000000;fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect4094-6-3"
-         style="color:#000000;fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         width="33.999607"
+         height="33.999977"
+         x="451.80469"
+         y="72.879684" />
     </g>
   </g>
   <metadata
@@ -366,7 +273,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_SwitchMode</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Text.svg b/src/Mod/Draft/Resources/icons/Draft_Text.svg
index 01f2d32ee3..5d9a0af0ed 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Text.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Text.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,102 +6,49 @@
    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"
+   version="1.1"
    id="svg4594"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Text.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs4596">
     <linearGradient
        id="linearGradient3792">
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop3794"
          offset="0"
-         id="stop3794" />
+         style="stop-color:#fce94f;stop-opacity:1" />
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop3796"
          offset="1"
-         id="stop3796" />
+         style="stop-color:#c4a000;stop-opacity:1" />
     </linearGradient>
-    <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="perspective4602" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3792"
-       id="linearGradient3806"
-       x1="4115.4229"
-       y1="1473.5258"
-       x2="4157.8677"
+       gradientUnits="userSpaceOnUse"
        y2="1734.2576"
-       gradientUnits="userSpaceOnUse" />
+       x2="4157.8677"
+       y1="1473.5258"
+       x1="4115.4229"
+       id="linearGradient3806"
+       xlink:href="#linearGradient3792" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="5.6740566"
-     inkscape:cy="31.594522"
-     inkscape:current-layer="g3491"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-global="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2986"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g3491"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/text.png"
-       inkscape:export-xdpi="7.820137"
-       inkscape:export-ydpi="7.820137"
-       transform="matrix(0.1649204,0,0,0.1649204,-643.71716,-232.01446)">
+       transform="matrix(0.1649204,0,0,0.1649204,-643.71716,-232.01446)"
+       id="g3491">
       <path
-         id="text2714"
-         d="m 4151.8039,1655.4317 -109.1436,0 -33.475,40.7475 c -3.5157,5.2084 -2.3853,4.766 -2.9061,7.7608 0,6.0635 3.9238,9.9135 12.127,12.127 l 0,12.1271 -97.0165,0 0,-12.1271 c 5.4688,-1.0416 14.9354,-3.4593 18.1906,-6.0635 3.2552,-2.6042 6.0635,-6.0635 12.1271,-12.1271 l 139.4612,-200.0965 c 4.4269,-6.5102 5.282,-8.2206 6.0635,-12.1271 1.3019,-5.9893 0.9676,-9.5226 -6.0635,-12.127 l 0,-12.1271 97.0165,0 0,12.1271 c -12.1271,0 -17.1492,0.595 -18.1906,6.0635 -0.7815,3.7763 -0.6532,6.3037 0.9096,11.1211 l 60.3515,205.4688 c 2.6039,8.724 2.8332,10.5692 5.4377,13.8243 2.6039,3.1251 6.9184,5.0219 12.1271,6.0635 l 0,12.1271 -97.0165,0 0,-12.1271 c 8.9841,-1.4322 10.8248,-5.4864 12.1271,-12.127 0.5206,-2.7344 1.5622,-6.7885 0,-12.1271 l -12.1271,-36.3812 m 0,-36.3812 -24.2541,-97.0165 -72.7624,97.0165 97.0165,0"
          style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:url(#linearGradient3806);fill-opacity:1;stroke:#302b00;stroke-width:12.12706251000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Copperplate Gothic Bold;-inkscape-font-specification:'Copperplate Gothic Bold, Bold'"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccscccccccccccccccccccccc" />
+         d="m 4151.8039,1655.4317 -109.1436,0 -33.475,40.7475 c -3.5157,5.2084 -2.3853,4.766 -2.9061,7.7608 0,6.0635 3.9238,9.9135 12.127,12.127 l 0,12.1271 -97.0165,0 0,-12.1271 c 5.4688,-1.0416 14.9354,-3.4593 18.1906,-6.0635 3.2552,-2.6042 6.0635,-6.0635 12.1271,-12.1271 l 139.4612,-200.0965 c 4.4269,-6.5102 5.282,-8.2206 6.0635,-12.1271 1.3019,-5.9893 0.9676,-9.5226 -6.0635,-12.127 l 0,-12.1271 97.0165,0 0,12.1271 c -12.1271,0 -17.1492,0.595 -18.1906,6.0635 -0.7815,3.7763 -0.6532,6.3037 0.9096,11.1211 l 60.3515,205.4688 c 2.6039,8.724 2.8332,10.5692 5.4377,13.8243 2.6039,3.1251 6.9184,5.0219 12.1271,6.0635 l 0,12.1271 -97.0165,0 0,-12.1271 c 8.9841,-1.4322 10.8248,-5.4864 12.1271,-12.127 0.5206,-2.7344 1.5622,-6.7885 0,-12.1271 l -12.1271,-36.3812 m 0,-36.3812 -24.2541,-97.0165 -72.7624,97.0165 97.0165,0"
+         id="text2714" />
       <path
-         id="text2714-1"
-         d="m 4159.5466,1643.3046 -122.0515,0 -36.1634,43.7572 c -8.9781,11.6058 -6.5743,17.6706 -7.5981,18.9453 0,5.6501 9.2106,8.5485 16.6543,10.6111 l 1.2403,-0.1378 -78.1114,-0.4134 -3.7208,2.894 c 4.9624,-0.9706 23.3368,-5.4284 26.2906,-7.855 2.9538,-2.4267 7.4313,-8.4063 12.2445,-15.4346 l 117.1771,-168.1251 c 4.017,-6.0664 15.8176,-22.4055 19.0073,-28.5262 3.3862,-5.5809 9.1465,-22.5163 2.7663,-24.9431 l -10.1978,-0.5513 85.1396,0 -13.0918,-0.6889 c -11.0041,0 -10.738,5.2398 -11.5452,9.233 -0.709,3.5189 0.6477,7.8032 2.0658,12.2922 l 55.5901,189.1168 c 2.3628,8.1291 2.4331,9.7107 3.8319,14.9489 3.6029,9.9401 1.3166,12.3967 6.0431,13.3673 l 17.6394,4.272 -84.8895,0 12.5405,-6.2013 c 4.9826,-8.914 5.1625,-6.4905 6.3443,-12.6783 0.4724,-2.548 -2.5789,-12.6647 -3.9965,-17.6393 l -12.9335,-35.4166 m 4.4613,-18.4109 -33.36,-122.5662 -89.8152,122.4284 122.0295,0.024"
          style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:none;stroke:#fce94f;stroke-width:12.1270628;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Copperplate Gothic Bold;-inkscape-font-specification:'Copperplate Gothic Bold, Bold'"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccscccccccccccccccccccccc" />
+         d="m 4159.5466,1643.3046 -122.0515,0 -36.1634,43.7572 c -8.9781,11.6058 -6.5743,17.6706 -7.5981,18.9453 0,5.6501 9.2106,8.5485 16.6543,10.6111 l 1.2403,-0.1378 -78.1114,-0.4134 -3.7208,2.894 c 4.9624,-0.9706 23.3368,-5.4284 26.2906,-7.855 2.9538,-2.4267 7.4313,-8.4063 12.2445,-15.4346 l 117.1771,-168.1251 c 4.017,-6.0664 15.8176,-22.4055 19.0073,-28.5262 3.3862,-5.5809 9.1465,-22.5163 2.7663,-24.9431 l -10.1978,-0.5513 85.1396,0 -13.0918,-0.6889 c -11.0041,0 -10.738,5.2398 -11.5452,9.233 -0.709,3.5189 0.6477,7.8032 2.0658,12.2922 l 55.5901,189.1168 c 2.3628,8.1291 2.4331,9.7107 3.8319,14.9489 3.6029,9.9401 1.3166,12.3967 6.0431,13.3673 l 17.6394,4.272 -84.8895,0 12.5405,-6.2013 c 4.9826,-8.914 5.1625,-6.4905 6.3443,-12.6783 0.4724,-2.548 -2.5789,-12.6647 -3.9965,-17.6393 l -12.9335,-35.4166 m 4.4613,-18.4109 -33.36,-122.5662 -89.8152,122.4284 122.0295,0.024"
+         id="text2714-1" />
       <path
-         id="text2714-7"
-         d="m 4151.8039,1655.4317 -109.1436,0 -33.4751,40.7475 c -3.5156,5.2084 -2.3852,4.766 -2.9061,7.7608 0,6.0635 3.9239,9.9135 12.1271,12.127 l 0,12.1271 -97.0165,0 0,-12.1271 c 5.4688,-1.0416 14.9354,-3.4593 18.1906,-6.0635 3.2552,-2.6042 6.0635,-6.0635 12.1271,-12.1271 l 139.4611,-200.0965 c 4.4269,-6.5102 5.2821,-8.2206 6.0636,-12.1271 1.3019,-5.9893 0.9676,-9.5226 -6.0636,-12.127 l 0,-12.1271 97.0165,0 0,12.1271 c -12.127,0 -17.1492,0.595 -18.1906,6.0635 -0.7814,3.7763 -0.6531,6.3037 0.9097,11.1211 l 60.3514,205.4688 c 2.6039,8.724 2.8333,10.5692 5.4378,13.8243 2.6038,3.1251 6.9183,5.0219 12.1271,6.0635 l 0,12.1271 -97.0165,0 0,-12.1271 c 8.984,-1.4322 10.8247,-5.4864 12.127,-12.127 0.5207,-2.7344 1.5623,-6.7885 0,-12.1271 l -12.127,-36.3812 m 0,-36.3812 -24.2542,-97.0165 -72.7623,97.0165 97.0165,0"
          style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:none;stroke:#302b00;stroke-width:12.1270628;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Copperplate Gothic Bold;-inkscape-font-specification:'Copperplate Gothic Bold, Bold'"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccscccccccccccccccccccccc" />
+         d="m 4151.8039,1655.4317 -109.1436,0 -33.4751,40.7475 c -3.5156,5.2084 -2.3852,4.766 -2.9061,7.7608 0,6.0635 3.9239,9.9135 12.1271,12.127 l 0,12.1271 -97.0165,0 0,-12.1271 c 5.4688,-1.0416 14.9354,-3.4593 18.1906,-6.0635 3.2552,-2.6042 6.0635,-6.0635 12.1271,-12.1271 l 139.4611,-200.0965 c 4.4269,-6.5102 5.2821,-8.2206 6.0636,-12.1271 1.3019,-5.9893 0.9676,-9.5226 -6.0636,-12.127 l 0,-12.1271 97.0165,0 0,12.1271 c -12.127,0 -17.1492,0.595 -18.1906,6.0635 -0.7814,3.7763 -0.6531,6.3037 0.9097,11.1211 l 60.3514,205.4688 c 2.6039,8.724 2.8333,10.5692 5.4378,13.8243 2.6038,3.1251 6.9183,5.0219 12.1271,6.0635 l 0,12.1271 -97.0165,0 0,-12.1271 c 8.984,-1.4322 10.8247,-5.4864 12.127,-12.127 0.5207,-2.7344 1.5623,-6.7885 0,-12.1271 l -12.127,-36.3812 m 0,-36.3812 -24.2542,-97.0165 -72.7623,97.0165 97.0165,0"
+         id="text2714-7" />
     </g>
   </g>
   <metadata
@@ -114,7 +59,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Text</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Trimex.svg b/src/Mod/Draft/Resources/icons/Draft_Trimex.svg
index c654fb8a7e..31d3c7ae71 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Trimex.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Trimex.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,212 +6,129 @@
    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"
+   version="1.1"
    id="svg3111"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Trimex.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs3113">
     <linearGradient
        id="linearGradient3841">
       <stop
-         style="stop-color:#0619c0;stop-opacity:1;"
+         id="stop3843"
          offset="0"
-         id="stop3843" />
+         style="stop-color:#0619c0;stop-opacity:1;" />
       <stop
-         style="stop-color:#379cfb;stop-opacity:1;"
+         id="stop3845"
          offset="1"
-         id="stop3845" />
+         style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841"
-       id="linearGradient6655"
-       x1="155.46875"
-       y1="2545.2188"
-       x2="713.0625"
+       gradientTransform="translate(2,-2)"
+       gradientUnits="userSpaceOnUse"
        y2="2545.2188"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(2,-2)" />
-    <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="perspective3119" />
+       x2="713.0625"
+       y1="2545.2188"
+       x1="155.46875"
+       id="linearGradient6655"
+       xlink:href="#linearGradient3841" />
     <linearGradient
-       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)"
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3036"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
+       id="linearGradient3036"
+       gradientUnits="userSpaceOnUse"
+       x1="56.172409"
+       y1="29.279999"
+       x2="21.689653"
+       y2="36.079998"
+       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="39.514103"
-       x2="45.615246"
-       y1="23.526644"
-       x1="42.758076"
-       gradientTransform="matrix(0.82726526,0,0,0.85294121,12.536816,6.205883)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3025"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="39.514103"
-       x2="45.615246"
-       y1="23.526644"
-       x1="42.758076"
-       gradientTransform="matrix(0.82726526,0,0,0.85294121,12.536816,35.205883)"
+       id="linearGradient3025"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3025-3"
+       gradientTransform="matrix(0.82726526,0,0,0.85294121,12.536816,6.205883)"
+       x1="42.758076"
+       y1="23.526644"
+       x2="45.615246"
+       y2="39.514103" />
+    <linearGradient
        xlink:href="#linearGradient3895-6"
-       inkscape:collect="always" />
+       id="linearGradient3025-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82726526,0,0,0.85294121,12.536816,35.205883)"
+       x1="42.758076"
+       y1="23.526644"
+       x2="45.615246"
+       y2="39.514103" />
     <linearGradient
        id="linearGradient3895-6">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897-7"
          offset="0"
-         id="stop3897-7" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899-5"
          offset="1"
-         id="stop3899-5" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       y2="39.514103"
-       x2="45.615246"
-       y1="24.379309"
-       x1="50.120781"
-       gradientTransform="matrix(-0.82726526,0,0,0.85294121,51.46318,6.205883)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3895-6"
        id="linearGradient3066"
-       xlink:href="#linearGradient3895-6"
-       inkscape:collect="always" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.82726526,0,0,0.85294121,51.46318,6.205883)"
+       x1="50.120781"
+       y1="24.379309"
+       x2="45.615246"
+       y2="39.514103" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895-6"
-       id="linearGradient3900"
-       x1="30"
-       y1="6"
-       x2="34"
+       gradientUnits="userSpaceOnUse"
        y2="57"
-       gradientUnits="userSpaceOnUse" />
+       x2="34"
+       y1="6"
+       x1="30"
+       id="linearGradient3900"
+       xlink:href="#linearGradient3895-6" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="14.392653"
-     inkscape:cy="31.333253"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-global="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3046"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3048"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3025);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 49,19 0,8 -8,0 0,10 8,0 0,8 12,-13 z"
        id="path3343"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 49,19 0,8 -8,0 0,10 8,0 0,8 12,-13 z"
+       style="fill:url(#linearGradient3025);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 51.040748,24.487021 51,29 l -8,0 0,6 8,0 0.01705,5.130682 7.264191,-8.106576 z"
        id="path3343-2"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 51.040748,24.487021 51,29 l -8,0 0,6 8,0 0.01705,5.130682 7.264191,-8.106576 z"
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3066);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 15,19 0,8 8,0 0,10 -8,0 0,8 L 3,32 z"
        id="path3343-3"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 15,19 0,8 8,0 0,10 -8,0 0,8 L 3,32 z"
+       style="fill:url(#linearGradient3066);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 12.959252,24.487021 13,29 l 8,0 0,6 -8,0 -0.01705,5.130682 -7.264191,-8.106576 z"
        id="path3343-2-5"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 12.959252,24.487021 13,29 l 8,0 0,6 -8,0 -0.01705,5.130682 -7.264191,-8.106576 z"
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 32,56 32,8"
        id="path3087"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:url(#linearGradient3900);stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
        d="M 32,56 32,8"
-       id="path3087-6"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       id="path3087-6"
+       d="M 32,56 32,8"
+       style="fill:none;stroke:url(#linearGradient3900);stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 31,56 31,8"
        id="path3087-6-2"
-       inkscape:connector-curvature="0" />
+       d="M 31,56 31,8"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
   <metadata
      id="metadata5781">
@@ -223,7 +138,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Trimex</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Upgrade.svg b/src/Mod/Draft/Resources/icons/Draft_Upgrade.svg
index e1e9b30cb9..587533ba41 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Upgrade.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Upgrade.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,142 +6,70 @@
    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"
+   version="1.1"
    id="svg3074"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Upgrade.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs3076">
     <linearGradient
        id="linearGradient3841">
       <stop
-         style="stop-color:#0619c0;stop-opacity:1;"
+         id="stop3843"
          offset="0"
-         id="stop3843" />
+         style="stop-color:#0619c0;stop-opacity:1;" />
       <stop
-         style="stop-color:#379cfb;stop-opacity:1;"
+         id="stop3845"
          offset="1"
-         id="stop3845" />
+         style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841"
-       id="linearGradient3863"
-       gradientUnits="userSpaceOnUse"
-       x1="3709.3296"
-       y1="1286.7291"
+       y2="1076.6174"
        x2="3935.5251"
-       y2="1076.6174" />
-    <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="perspective3082" />
+       y1="1286.7291"
+       x1="3709.3296"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3863"
+       xlink:href="#linearGradient3841" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3895"
-       id="linearGradient3909"
-       x1="43"
-       y1="22"
-       x2="48"
+       gradientUnits="userSpaceOnUse"
        y2="44"
-       gradientUnits="userSpaceOnUse" />
+       x2="48"
+       y1="22"
+       x1="43"
+       id="linearGradient3909"
+       xlink:href="#linearGradient3895" />
     <linearGradient
        id="linearGradient3895">
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         id="stop3897"
          offset="0"
-         id="stop3897" />
+         style="stop-color:#729fcf;stop-opacity:1;" />
       <stop
-         style="stop-color:#204a87;stop-opacity:1;"
+         id="stop3899"
          offset="1"
-         id="stop3899" />
+         style="stop-color:#204a87;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)"
-       y2="36.079998"
-       x2="21.689653"
-       y1="29.279999"
-       x1="56.172409"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3036"
        xlink:href="#linearGradient3895"
-       inkscape:collect="always" />
+       id="linearGradient3036"
+       gradientUnits="userSpaceOnUse"
+       x1="56.172409"
+       y1="29.279999"
+       x2="21.689653"
+       y2="36.079998"
+       gradientTransform="matrix(0,-1.4500001,1.4705882,0,-15.05882,91.45)" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.753976"
-     inkscape:cx="12.184978"
-     inkscape:cy="30.864199"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-bbox="false"
-     inkscape:snap-nodes="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3038"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3040"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3036);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.99999988000000006;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 7.0000006,29.1 21.000001,29 l 0,32 22,0 0,-32 L 57,29.1 32,3 z"
        id="path3343"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="M 7.0000006,29.1 21.000001,29 l 0,32 22,0 0,-32 L 57,29.1 32,3 z"
+       style="fill:url(#linearGradient3036);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.99999988000000006;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       inkscape:connector-curvature="0"
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 12.000001,27 11,0 0,32 18,0 0,-32 11,0 L 32.172062,6.000006 z"
        id="path3343-2"
-       sodipodi:nodetypes="cccccccc"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
+       d="m 12.000001,27 11,0 0,32 18,0 0,-32 11,0 L 32.172062,6.000006 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <metadata
      id="metadata5801">
@@ -153,7 +79,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Upgrade</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_VisGroup.svg b/src/Mod/Draft/Resources/icons/Draft_VisGroup.svg
index dce5071fc2..161fc64a7f 100644
--- a/src/Mod/Draft/Resources/icons/Draft_VisGroup.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_VisGroup.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,162 +6,111 @@
    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="svg2985"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_VisGroup.svg">
+   id="svg2985"
+   height="64px"
+   width="64px">
   <defs
      id="defs2987">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3815">
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
+         id="stop3817"
          offset="0"
-         id="stop3817" />
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3819"
          offset="1"
-         id="stop3819" />
+         style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3807">
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
+         id="stop3809"
          offset="0"
-         id="stop3809" />
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3811"
          offset="1"
-         id="stop3811" />
+         style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3799">
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:1;"
+         id="stop3801"
          offset="0"
-         id="stop3801" />
+         style="stop-color:#d3d7cf;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop3803"
          offset="1"
-         id="stop3803" />
+         style="stop-color:#ffffff;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3799"
-       id="linearGradient3805"
-       x1="53.257175"
-       y1="19.086002"
-       x2="25.928942"
+       gradientTransform="translate(-0.02151317,-0.91811256)"
+       gradientUnits="userSpaceOnUse"
        y2="-1.3815211"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.02151317,-0.91811256)" />
+       x2="25.928942"
+       y1="19.086002"
+       x1="53.257175"
+       id="linearGradient3805"
+       xlink:href="#linearGradient3799" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3807"
-       id="linearGradient3813"
-       x1="61.719494"
-       y1="27.953379"
-       x2="36.843666"
+       gradientTransform="translate(0.75600263,0.0412295)"
+       gradientUnits="userSpaceOnUse"
        y2="12.022611"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0.75600263,0.0412295)" />
+       x2="36.843666"
+       y1="27.953379"
+       x1="61.719494"
+       id="linearGradient3813"
+       xlink:href="#linearGradient3807" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3815"
-       id="linearGradient3821"
-       x1="74.313408"
-       y1="43.419685"
-       x2="48.388607"
-       y2="23.542751"
+       gradientTransform="translate(-0.18895427,-1.1237431)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.18895427,-1.1237431)" />
+       y2="23.542751"
+       x2="48.388607"
+       y1="43.419685"
+       x1="74.313408"
+       id="linearGradient3821"
+       xlink:href="#linearGradient3815" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.6796359"
-     inkscape:cx="-11.390884"
-     inkscape:cy="30.609684"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-global="false"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <rect
-       style="color:#000000;fill:url(#linearGradient3821);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2993"
-       width="39.045357"
-       height="27.016869"
-       x="40.359722"
+       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)"
        y="16.492231"
-       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)" />
+       x="40.359722"
+       height="27.016869"
+       width="39.045357"
+       id="rect2993"
+       style="color:#000000;fill:url(#linearGradient3821);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 25.329927,28.679638 57.173418,41.866954 40.234042,56.653163 8.3211848,43.465847 z"
        id="rect2993-0-9-3-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 25.329927,28.679638 57.173418,41.866954 40.234042,56.653163 8.3211848,43.465847 z"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <rect
-       style="color:#000000;fill:url(#linearGradient3813);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2993-0"
-       width="39.045357"
-       height="27.016869"
-       x="31.989382"
+       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)"
        y="6.2172832"
-       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)" />
-    <path
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 25.30824,18.773895 57.151731,31.961211 40.212355,46.74742 8.2994962,33.560104 z"
-       id="rect2993-0-9-3-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient3805);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2993-0-9"
-       width="39.045357"
+       x="31.989382"
        height="27.016869"
-       x="21.896566"
-       y="-6.1819811"
-       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)" />
+       width="39.045357"
+       id="rect2993-0"
+       style="color:#000000;fill:url(#linearGradient3813);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       id="rect2993-0-9-3-6"
+       d="M 25.30824,18.773895 57.151731,31.961211 40.212355,46.74742 8.2994962,33.560104 z"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       transform="matrix(0.92408158,0.38219528,-0.75246174,0.65863596,0,0)"
+       y="-6.1819811"
+       x="21.896566"
+       height="27.016869"
+       width="39.045357"
+       id="rect2993-0-9"
+       style="color:#000000;fill:url(#linearGradient3805);fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2.1126256;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 25.281278,6.6563352 57.124769,19.843651 40.185393,34.62986 8.2725348,21.442544 z"
        id="rect2993-0-9-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 25.281278,6.6563352 57.124769,19.843651 40.185393,34.62986 8.2725348,21.442544 z"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   </g>
   <metadata
      id="metadata5826">
@@ -173,7 +120,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_VisGroup</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Tue Jun 10 10:21:01 2014 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Wipe.svg b/src/Mod/Draft/Resources/icons/Draft_Wipe.svg
index 9ce389b43d..29de726747 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Wipe.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Wipe.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,112 +6,70 @@
    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="svg2985"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Wipe.svg">
+   id="svg2985"
+   height="64px"
+   width="64px">
   <defs
      id="defs2987">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3793">
       <stop
-         style="stop-color:#a40000;stop-opacity:1"
+         id="stop3795"
          offset="0"
-         id="stop3795" />
+         style="stop-color:#a40000;stop-opacity:1" />
       <stop
-         style="stop-color:#ef2929;stop-opacity:1"
+         id="stop3797"
          offset="1"
-         id="stop3797" />
+         style="stop-color:#ef2929;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3793"
-       id="linearGradient3799"
-       x1="29"
-       y1="47"
-       x2="15"
+       gradientUnits="userSpaceOnUse"
        y2="17"
-       gradientUnits="userSpaceOnUse" />
+       x2="15"
+       y1="47"
+       x1="29"
+       id="linearGradient3799"
+       xlink:href="#linearGradient3793" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.379992"
-     inkscape:cx="9.4685168"
-     inkscape:cy="42.321644"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2986"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <rect
-       style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3801"
-       width="36"
-       height="8"
+       y="27"
        x="25"
-       y="27" />
-    <rect
-       style="color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3784"
-       width="22"
        height="8"
-       x="3"
-       y="27" />
-    <rect
-       style="fill:#3465a4;fill-opacity:1;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3801-6"
        width="36"
-       height="4"
-       x="23"
-       y="29" />
+       id="rect3801"
+       style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <rect
-       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;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"
-       id="rect3784-3"
-       width="19"
+       y="27"
+       x="3"
+       height="8"
+       width="22"
+       id="rect3784"
+       style="color:#000000;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <rect
+       y="29"
+       x="23"
        height="4"
+       width="36"
+       id="rect3801-6"
+       style="fill:#3465a4;fill-opacity:1;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <rect
+       y="29"
        x="5"
-       y="29" />
+       height="4"
+       width="19"
+       id="rect3784-3"
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;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
-       style="color:#000000;fill:url(#linearGradient3799);fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 15,15 9,21 19,31 9,41 15,47 25,37 35,47 41,41 31,31 41,21 35,15 25,25 z"
        id="rect3761"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       d="M 15,15 9,21 19,31 9,41 15,47 25,37 35,47 41,41 31,31 41,21 35,15 25,25 z"
+       style="color:#000000;fill:url(#linearGradient3799);fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <path
-       style="color:#000000;fill:none;stroke:#ef2929;stroke-width:2;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"
-       d="M 15,18 12,21 22,31 12,41 15,44 25,34 35,44 38,41 28,31 38,21 35,18 25,28 z"
        id="rect3761-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       d="M 15,18 12,21 22,31 12,41 15,44 25,34 35,44 38,41 28,31 38,21 35,18 25,28 z"
+       style="color:#000000;fill:none;stroke:#ef2929;stroke-width:2;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>
   <metadata
      id="metadata5843">
@@ -123,7 +79,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Wipe</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Fri Oct 14 18:47:29 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Wire.svg b/src/Mod/Draft/Resources/icons/Draft_Wire.svg
index f64361f74e..a9af58b208 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Wire.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Wire.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,344 +6,267 @@
    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"
+   version="1.1"
    id="svg2772"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_Wire.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2774">
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2210"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2202"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2194"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient2194"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient2192"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <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="perspective2780" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3263"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3267"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3269"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0"
-       id="linearGradient3801-1"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       id="radialGradient3269"
+       xlink:href="#linearGradient3144" />
+    <linearGradient
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1"
+       xlink:href="#linearGradient3836-0" />
     <linearGradient
        id="linearGradient3836-0">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2"
          offset="0"
-         id="stop3838-2" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5"
          offset="1"
-         id="stop3840-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-6"
-       id="linearGradient3801-1-3"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-3"
+       xlink:href="#linearGradient3836-0-6" />
     <linearGradient
        id="linearGradient3836-0-6">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-7"
          offset="0"
-         id="stop3838-2-7" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-5"
          offset="1"
-         id="stop3840-5-5" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-7"
-       id="linearGradient3801-1-1"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-1"
+       xlink:href="#linearGradient3836-0-7" />
     <linearGradient
        id="linearGradient3836-0-7">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-4"
          offset="0"
-         id="stop3838-2-4" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-0"
          offset="1"
-         id="stop3840-5-0" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3836-0-4"
-       id="linearGradient3801-1-2"
-       gradientUnits="userSpaceOnUse"
-       x1="-18"
-       y1="18"
+       y2="5"
        x2="-22"
-       y2="5" />
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3801-1-2"
+       xlink:href="#linearGradient3836-0-4" />
     <linearGradient
        id="linearGradient3836-0-4">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1;"
+         id="stop3838-2-5"
          offset="0"
-         id="stop3838-2-5" />
+         style="stop-color:#c4a000;stop-opacity:1;" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1;"
+         id="stop3840-5-51"
          offset="1"
-         id="stop3840-5-51" />
+         style="stop-color:#fce94f;stop-opacity:1;" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2080078"
-     inkscape:cx="3.7812064"
-     inkscape:cy="36.114631"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:snap-nodes="false"
-     inkscape:snap-bbox="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3053"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <path
-       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 40.069016,50.756984 35.02509,54.006417 20.65028,27.986649 25.694206,24.737217 z"
        id="path3061-2-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 40.069016,50.756984 35.02509,54.006417 20.65028,27.986649 25.694206,24.737217 z"
+       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 38,51 24.447074,26.741413"
        id="path3063-7-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       d="M 38,51 24.447074,26.741413"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 14.586134,55.453181 8.7905781,53.900267 18.405733,25.771771 24.201288,27.324685 z"
        id="path3061-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 14.586134,55.453181 8.7905781,53.900267 18.405733,25.771771 24.201288,27.324685 z"
+       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 11.060019,53.158002 20,27.549302"
        id="path3063-7"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       d="M 11.060019,53.158002 20,27.549302"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 40.800715,54.745877 35.005159,53.192963 50.405733,8.2224686 56.201288,9.775383 z"
        id="path3061"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 40.800715,54.745877 35.005159,53.192963 50.405733,8.2224686 56.201288,9.775383 z"
+       style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 37.2746,52.450698 52,10"
        id="path3063"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
+       d="M 37.2746,52.450698 52,10"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <g
-       transform="translate(40.005735,-40.005445)"
-       id="g3827-1">
+       id="g3827-1"
+       transform="translate(40.005735,-40.005445)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9">
+         id="g3797-9"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
     <g
-       transform="translate(26.005735,-9.9773715e-8)"
-       id="g3827-1-3">
+       id="g3827-1-3"
+       transform="translate(26.005735,-9.9773715e-8)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9-5">
+         id="g3797-9-5"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71-6"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3-2"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
     <g
-       transform="translate(10.005735,-26)"
-       id="g3827-1-9">
+       id="g3827-1-9"
+       transform="translate(10.005735,-26)">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9-4">
+         id="g3797-9-4"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71-8"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3-8"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1-1);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
     <g
        id="g3827-1-7">
       <g
-         transform="translate(31.322131,40.570289)"
-         id="g3797-9-1">
+         id="g3797-9-1"
+         transform="translate(31.322131,40.570289)">
         <path
-           inkscape:connector-curvature="0"
-           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
            id="path4250-71-1"
-           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         <path
-           inkscape:connector-curvature="0"
-           style="fill:url(#linearGradient3801-1-2);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
            id="path4250-7-3-5"
-           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+           style="fill:url(#linearGradient3801-1-2);fill-opacity:1;stroke:#fce94f;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       </g>
     </g>
   </g>
@@ -357,7 +278,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_Wire</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_WireToBSpline.svg b/src/Mod/Draft/Resources/icons/Draft_WireToBSpline.svg
index 4dad531f5a..4f8af757b2 100644
--- a/src/Mod/Draft/Resources/icons/Draft_WireToBSpline.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_WireToBSpline.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,517 +6,357 @@
    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="svg3612"
    version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Draft_WireToBSpline.svg">
+   id="svg3612"
+   height="64px"
+   width="64px">
   <defs
      id="defs3614">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3955">
       <stop
-         style="stop-color:#204a87;stop-opacity:1"
+         id="stop3957"
          offset="0"
-         id="stop3957" />
+         style="stop-color:#204a87;stop-opacity:1" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop3959"
          offset="1"
-         id="stop3959" />
+         style="stop-color:#729fcf;stop-opacity:1" />
     </linearGradient>
-    <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="perspective3620" />
-    <inkscape:perspective
-       id="perspective3588"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3692"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-6">
       <stop
-         id="stop3146-9"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-9" />
       <stop
-         id="stop3148-2"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-2" />
     </linearGradient>
     <linearGradient
        id="linearGradient3701">
       <stop
-         id="stop3703"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3703" />
       <stop
-         id="stop3705"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3705" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3688"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3688"
+       xlink:href="#linearGradient3144-6" />
     <linearGradient
        id="linearGradient3708">
       <stop
-         id="stop3710"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3710" />
       <stop
-         id="stop3712"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3712" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3805"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3864-0-0">
       <stop
-         id="stop3866-5-7"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5-7" />
       <stop
-         id="stop3868-7-6"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7-6" />
     </linearGradient>
     <linearGradient
        id="linearGradient3377">
       <stop
-         id="stop3379"
+         style="stop-color:#ffaa00;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffaa00;stop-opacity:1;" />
+         id="stop3379" />
       <stop
-         id="stop3381"
+         style="stop-color:#faff2b;stop-opacity:1;"
          offset="1"
-         style="stop-color:#faff2b;stop-opacity:1;" />
+         id="stop3381" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864-0">
       <stop
-         id="stop3866-5"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3866-5" />
       <stop
-         id="stop3868-7"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3868-7" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective3902"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient5048">
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5050"
          offset="0"
-         id="stop5050" />
+         style="stop-color:black;stop-opacity:0;" />
       <stop
-         id="stop5056"
+         style="stop-color:black;stop-opacity:1;"
          offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
+         id="stop5056" />
       <stop
-         style="stop-color:black;stop-opacity:0;"
+         id="stop5052"
          offset="1"
-         id="stop5052" />
+         style="stop-color:black;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3841-0-3">
       <stop
-         id="stop3843-1-3"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-1-3" />
       <stop
-         id="stop3845-0-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-0-8" />
     </linearGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="114.5684"
-       fx="20.892099"
-       r="5.256"
-       cy="114.5684"
+       id="aigrd2"
        cx="20.892099"
-       id="aigrd2">
+       cy="114.5684"
+       r="5.256"
+       fx="20.892099"
+       fy="114.5684"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15566"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15566" />
       <stop
-         id="stop15568"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15568" />
     </radialGradient>
     <radialGradient
-       gradientUnits="userSpaceOnUse"
-       fy="64.567902"
-       fx="20.892099"
-       r="5.257"
-       cy="64.567902"
+       id="aigrd3"
        cx="20.892099"
-       id="aigrd3">
+       cy="64.567902"
+       r="5.257"
+       fx="20.892099"
+       fy="64.567902"
+       gradientUnits="userSpaceOnUse">
       <stop
-         id="stop15573"
+         offset="0"
          style="stop-color:#F0F0F0"
-         offset="0" />
+         id="stop15573" />
       <stop
-         id="stop15575"
+         offset="1.0000000"
          style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
-         offset="1.0000000" />
+         id="stop15575" />
     </radialGradient>
     <linearGradient
        id="linearGradient15662">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         id="stop15664"
          offset="0.0000000"
-         id="stop15664" />
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         id="stop15666"
          offset="1.0000000"
-         id="stop15666" />
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="86.70845"
-       fy="35.736916"
-       fx="33.966679"
-       cy="35.736916"
-       cx="33.966679"
-       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4452"
        xlink:href="#linearGradient259"
-       inkscape:collect="always" />
+       id="radialGradient4452"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96049297,0,0,1.041132,-52.144249,-702.33158)"
+       cx="33.966679"
+       cy="35.736916"
+       fx="33.966679"
+       fy="35.736916"
+       r="86.70845" />
     <linearGradient
        id="linearGradient259">
       <stop
-         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         id="stop260"
          offset="0.0000000"
-         id="stop260" />
+         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         id="stop261"
          offset="1.0000000"
-         id="stop261" />
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
     </linearGradient>
     <radialGradient
-       r="37.751713"
-       fy="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4454"
        xlink:href="#linearGradient269"
-       inkscape:collect="always" />
+       id="radialGradient4454"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96827297,0,0,1.032767,-48.790699,-701.68513)"
+       cx="8.824419"
+       cy="3.7561285"
+       fx="8.824419"
+       fy="3.7561285"
+       r="37.751713" />
     <linearGradient
        id="linearGradient269">
       <stop
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         id="stop270"
          offset="0.0000000"
-         id="stop270" />
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
       <stop
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         id="stop271"
          offset="1.0000000"
-         id="stop271" />
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective4947"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient4095">
       <stop
-         style="stop-color:#005bff;stop-opacity:1;"
+         id="stop4097"
          offset="0"
-         id="stop4097" />
+         style="stop-color:#005bff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c1e3f7;stop-opacity:1;"
+         id="stop4099"
          offset="1"
-         id="stop4099" />
+         style="stop-color:#c1e3f7;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5027"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5076"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4247"
-       id="linearGradient4253"
-       x1="394.15784"
-       y1="185.1304"
-       x2="434.73947"
-       y2="140.22731"
+       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.94231826,0,0,0.94231826,23.727549,8.8262536)" />
+       y2="140.22731"
+       x2="434.73947"
+       y1="185.1304"
+       x1="394.15784"
+       id="linearGradient4253"
+       xlink:href="#linearGradient4247" />
     <linearGradient
        id="linearGradient4247">
       <stop
-         style="stop-color:#2e8207;stop-opacity:1;"
+         id="stop4249"
          offset="0"
-         id="stop4249" />
+         style="stop-color:#2e8207;stop-opacity:1;" />
       <stop
-         style="stop-color:#52ff00;stop-opacity:1;"
+         id="stop4251"
          offset="1"
-         id="stop4251" />
+         style="stop-color:#52ff00;stop-opacity:1;" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5141"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective5225"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
-         id="stop3146-96"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96" />
       <stop
-         id="stop3148-4"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5301"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-8-4"
-       id="radialGradient4339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4339"
+       xlink:href="#linearGradient3144-8-4" />
     <linearGradient
        id="linearGradient3144-8-4">
       <stop
-         id="stop3146-96-8"
+         offset="0"
          style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
+         id="stop3146-96-8" />
       <stop
-         id="stop3148-4-0"
+         offset="1"
          style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
+         id="stop3148-4-0" />
     </linearGradient>
-    <inkscape:perspective
-       id="perspective5377"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3"
-       id="linearGradient4567"
-       x1="324.44156"
-       y1="225.43279"
-       x2="355.91556"
+       gradientUnits="userSpaceOnUse"
        y2="225.43279"
-       gradientUnits="userSpaceOnUse" />
+       x2="355.91556"
+       y1="225.43279"
+       x1="324.44156"
+       id="linearGradient4567"
+       xlink:href="#linearGradient3841-3" />
     <linearGradient
        id="linearGradient3841-3">
       <stop
-         id="stop3843-15"
+         style="stop-color:#0619c0;stop-opacity:1;"
          offset="0"
-         style="stop-color:#0619c0;stop-opacity:1;" />
+         id="stop3843-15" />
       <stop
-         id="stop3845-8"
+         style="stop-color:#379cfb;stop-opacity:1;"
          offset="1"
-         style="stop-color:#379cfb;stop-opacity:1;" />
+         id="stop3845-8" />
     </linearGradient>
     <linearGradient
-       y2="225.43279"
-       x2="355.91556"
-       y1="225.43279"
-       x1="324.44156"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3841-3"
        id="linearGradient5390"
-       xlink:href="#linearGradient3841-3"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841-3"
-       id="linearGradient3931"
        gradientUnits="userSpaceOnUse"
        x1="324.44156"
        y1="225.43279"
        x2="355.91556"
        y2="225.43279" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3955"
-       id="linearGradient3961"
-       x1="353.04712"
-       y1="175.2444"
-       x2="348.04712"
+       y2="225.43279"
+       x2="355.91556"
+       y1="225.43279"
+       x1="324.44156"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3931"
+       xlink:href="#linearGradient3841-3" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
        y2="164.2444"
-       gradientUnits="userSpaceOnUse" />
+       x2="348.04712"
+       y1="175.2444"
+       x1="353.04712"
+       id="linearGradient3961"
+       xlink:href="#linearGradient3955" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.6589408"
-     inkscape:cx="-3.8759805"
-     inkscape:cy="35.796423"
-     inkscape:current-layer="g4664"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3061"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3933"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       transform="translate(-320.04711,-131.2444)"
-       id="g4664">
+       id="g4664"
+       transform="translate(-320.04711,-131.2444)">
       <path
-         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 6,58 c 0,0 6,-12 14,-12 8,0 10,12 20,12 10,0 17,-13 17,-13"
-         id="path3063"
-         inkscape:connector-curvature="0"
          transform="translate(320.04711,131.2444)"
-         sodipodi:nodetypes="czzc" />
+         id="path3063"
+         d="m 6,58 c 0,0 6,-12 14,-12 8,0 10,12 20,12 10,0 17,-13 17,-13"
+         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 326.04711,189.2444 c 0,0 6,-12 14,-12 8,0 10,12 20,12 10,0 17,-13 17,-13"
          id="path3063-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="czzc" />
+         d="m 326.04711,189.2444 c 0,0 6,-12 14,-12 8,0 10,12 20,12 10,0 17,-13 17,-13"
+         style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 325.04711,189.2444 c 0,0 6.16356,-13.19681 15,-13 8.83644,0.19681 10.59043,12 20,12 9.40957,0 16.12301,-12.55718 16.12301,-12.55718"
          id="path3063-3-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="czzc" />
+         d="m 325.04711,189.2444 c 0,0 6.16356,-13.19681 15,-13 8.83644,0.19681 10.59043,12 20,12 9.40957,0 16.12301,-12.55718 16.12301,-12.55718"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 326.04711,156.2444 15,-18 20,16 17,-17"
          id="path3893"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
          d="m 326.04711,156.2444 15,-18 20,16 17,-17"
+         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
          id="path3893-5"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         d="m 326.04711,156.2444 15,-18 20,16 17,-17"
+         style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 325.2416,155.70833 15.70114,-18.81184 20,16 16.40855,-16.33896"
          id="path3893-5-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         d="m 325.2416,155.70833 15.70114,-18.81184 20,16 16.40855,-16.33896"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:url(#linearGradient3961);stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-         d="m 337.04711,162.2444 30,0 -15,14 z"
          id="path3935"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         d="m 337.04711,162.2444 30,0 -15,14 z"
+         style="fill:url(#linearGradient3961);stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" />
       <path
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 342.04711,164.2444 20,0 -10.0492,9.29522 z"
          id="path3935-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
+         d="m 342.04711,164.2444 20,0 -10.0492,9.29522 z"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
   </g>
   <metadata
@@ -529,7 +367,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Draft_WireToBSpline</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Angle.svg b/src/Mod/Draft/Resources/icons/Snap_Angle.svg
index b069b9fed0..7174231d7b 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Angle.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Angle.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,106 +6,96 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Angle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3823">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3825"
          offset="0"
-         id="stop3825" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3827"
          offset="1"
-         id="stop3827" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2734" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient3850-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-2"
+       xlink:href="#linearGradient3144-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-7">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-4"
          offset="0"
-         id="stop3146-4" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-4"
          offset="1"
-         id="stop3148-4" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
-       id="radialGradient3850-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-7"
+       xlink:href="#linearGradient3144-5" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-5">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-6"
          offset="0"
-         id="stop3146-6" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-5"
          offset="1"
-         id="stop3148-5" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-5"
+       id="radialGradient4501"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <radialGradient
        r="34.345188"
        fy="672.79736"
@@ -116,32 +104,29 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient4501"
-       xlink:href="#linearGradient3144-5"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
        id="radialGradient3850-70"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-3" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-3">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-2"
          offset="0"
-         id="stop3146-2" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-3"
          offset="1"
-         id="stop3148-3" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-3"
+       id="radialGradient4501-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <radialGradient
        r="34.345188"
        fy="672.79736"
@@ -150,32 +135,29 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient4501-8"
-       xlink:href="#linearGradient3144-3"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
        id="radialGradient3850-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-1" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-1">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-5"
          offset="0"
-         id="stop3146-5" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-1"
          offset="1"
-         id="stop3148-1" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-1"
+       id="radialGradient4501-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <radialGradient
        r="34.345188"
        fy="672.79736"
@@ -184,116 +166,32 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient4501-1"
-       xlink:href="#linearGradient3144-1"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9"
        id="radialGradient3850-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-9" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-9">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-9"
          offset="0"
-         id="stop3146-9" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-12"
          offset="1"
-         id="stop3148-12" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4583"
        xlink:href="#linearGradient3144-9"
-       inkscape:collect="always" />
-    <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       id="radialGradient4583"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient4501-1-6"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
        xlink:href="#linearGradient3144-1-3"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-1-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-5-4" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-1-2" />
-    </linearGradient>
-    <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4501-8-0"
-       xlink:href="#linearGradient3144-3-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-3-5">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-2-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-3-4" />
-    </linearGradient>
-    <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4501-4"
-       xlink:href="#linearGradient3144-5-9"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-5-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-6-1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-5-9" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-34"
-       id="radialGradient3850-9"
+       id="radialGradient4501-1-6"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        cx="225.26402"
@@ -302,354 +200,305 @@
        fy="672.79736"
        r="34.345188" />
     <linearGradient
-       inkscape:collect="always"
+       id="linearGradient3144-1-3">
+      <stop
+         id="stop3146-5-4"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3148-1-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-3-5"
+       id="radialGradient4501-8-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       id="linearGradient3144-3-5">
+      <stop
+         id="stop3146-2-9"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3148-3-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-5-9"
+       id="radialGradient4501-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       id="linearGradient3144-5-9">
+      <stop
+         id="stop3146-6-1"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3148-5-9"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-9"
+       xlink:href="#linearGradient3144-34" />
+    <linearGradient
        id="linearGradient3144-34">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-1"
          offset="0"
-         id="stop3146-1" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-2"
          offset="1"
-         id="stop3148-2" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3823"
+       gradientUnits="userSpaceOnUse"
+       y2="657.4104"
+       x2="152.68495"
+       y1="655.12787"
+       x1="252.19032"
        id="linearGradient3829"
-       x1="252.19032"
-       y1="655.12787"
-       x2="152.68495"
-       y2="657.4104"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3823" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3823-4"
+       gradientUnits="userSpaceOnUse"
+       y2="657.4104"
+       x2="152.68495"
+       y1="655.12787"
+       x1="252.19032"
        id="linearGradient3829-7"
-       x1="252.19032"
-       y1="655.12787"
-       x2="152.68495"
-       y2="657.4104"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3823-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3823-4">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3825-0"
          offset="0"
-         id="stop3825-0" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3827-9"
          offset="1"
-         id="stop3827-9" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="657.4104"
-       x2="152.68495"
-       y1="655.12787"
-       x1="252.19032"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3847"
        xlink:href="#linearGradient3823-4"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3823-2"
-       id="linearGradient3829-8"
+       id="linearGradient3847"
+       gradientUnits="userSpaceOnUse"
        x1="252.19032"
        y1="655.12787"
        x2="152.68495"
-       y2="657.4104"
-       gradientUnits="userSpaceOnUse" />
+       y2="657.4104" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="657.4104"
+       x2="152.68495"
+       y1="655.12787"
+       x1="252.19032"
+       id="linearGradient3829-8"
+       xlink:href="#linearGradient3823-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3823-2">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3825-4"
          offset="0"
-         id="stop3825-4" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3827-5"
          offset="1"
-         id="stop3827-5" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="657.4104"
-       x2="152.68495"
-       y1="655.12787"
-       x1="252.19032"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3847-5"
        xlink:href="#linearGradient3823-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3823-5"
-       id="linearGradient3829-1"
+       id="linearGradient3847-5"
+       gradientUnits="userSpaceOnUse"
        x1="252.19032"
        y1="655.12787"
        x2="152.68495"
-       y2="657.4104"
-       gradientUnits="userSpaceOnUse" />
+       y2="657.4104" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="657.4104"
+       x2="152.68495"
+       y1="655.12787"
+       x1="252.19032"
+       id="linearGradient3829-1"
+       xlink:href="#linearGradient3823-5" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3823-5">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3825-2"
          offset="0"
-         id="stop3825-2" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3827-7"
          offset="1"
-         id="stop3827-7" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="657.4104"
-       x2="152.68495"
-       y1="655.12787"
-       x1="252.19032"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3847-6"
        xlink:href="#linearGradient3823-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3823-1"
-       id="linearGradient3829-12"
+       id="linearGradient3847-6"
+       gradientUnits="userSpaceOnUse"
        x1="252.19032"
        y1="655.12787"
        x2="152.68495"
-       y2="657.4104"
-       gradientUnits="userSpaceOnUse" />
+       y2="657.4104" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="657.4104"
+       x2="152.68495"
+       y1="655.12787"
+       x1="252.19032"
+       id="linearGradient3829-12"
+       xlink:href="#linearGradient3823-1" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3823-1">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3825-49"
          offset="0"
-         id="stop3825-49" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3827-8"
          offset="1"
-         id="stop3827-8" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="657.4104"
-       x2="152.68495"
-       y1="655.12787"
-       x1="252.19032"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3954"
        xlink:href="#linearGradient3823-1"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3823-29"
-       id="linearGradient3829-5"
+       id="linearGradient3954"
+       gradientUnits="userSpaceOnUse"
        x1="252.19032"
        y1="655.12787"
        x2="152.68495"
-       y2="657.4104"
-       gradientUnits="userSpaceOnUse" />
+       y2="657.4104" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="657.4104"
+       x2="152.68495"
+       y1="655.12787"
+       x1="252.19032"
+       id="linearGradient3829-5"
+       xlink:href="#linearGradient3823-29" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3823-29">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3825-9"
          offset="0"
-         id="stop3825-9" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3827-83"
          offset="1"
-         id="stop3827-83" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="657.4104"
-       x2="152.68495"
-       y1="655.12787"
-       x1="252.19032"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3954-8"
        xlink:href="#linearGradient3823-29"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3823-6"
-       id="linearGradient3829-86"
+       id="linearGradient3954-8"
+       gradientUnits="userSpaceOnUse"
        x1="252.19032"
        y1="655.12787"
        x2="152.68495"
-       y2="657.4104"
-       gradientUnits="userSpaceOnUse" />
+       y2="657.4104" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="657.4104"
+       x2="152.68495"
+       y1="655.12787"
+       x1="252.19032"
+       id="linearGradient3829-86"
+       xlink:href="#linearGradient3823-6" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3823-6">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3825-23"
          offset="0"
-         id="stop3825-23" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3827-82"
          offset="1"
-         id="stop3827-82" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       y2="657.4104"
-       x2="152.68495"
-       y1="655.12787"
-       x1="252.19032"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3954-6"
        xlink:href="#linearGradient3823-6"
-       inkscape:collect="always" />
+       id="linearGradient3954-6"
+       gradientUnits="userSpaceOnUse"
+       x1="252.19032"
+       y1="655.12787"
+       x2="152.68495"
+       y2="657.4104" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="14.416016"
-     inkscape:cx="25.96797"
-     inkscape:cy="34.387185"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3033"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3035"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#042a2a;stroke-width:5.5943222;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(6.6152338,0,0,6.6152339,-52.777954,394.37776)"
+         d="M 50.911688,31.858782 A 19.027601,19.027601 0 0 1 31.884087,50.886383 19.027601,19.027601 0 0 1 12.856485,31.858782 19.027601,19.027601 0 0 1 31.884087,12.831181 19.027601,19.027601 0 0 1 50.911688,31.858782 Z"
          id="path4313"
-         sodipodi:cx="31.884087"
-         sodipodi:cy="31.858782"
-         sodipodi:rx="19.027601"
-         sodipodi:ry="19.027601"
-         d="m 50.911688,31.858782 c 0,10.508654 -8.518947,19.027601 -19.027601,19.027601 -10.508654,0 -19.027602,-8.518947 -19.027602,-19.027601 0,-10.508654 8.518948,-19.027601 19.027602,-19.027601 10.508654,0 19.027601,8.518947 19.027601,19.027601 z"
-         transform="matrix(6.6152338,0,0,6.6152339,-52.777954,394.37776)" />
+         style="color:#000000;fill:none;stroke:#042a2a;stroke-width:5.5943222;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:1.86477411;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(6.6152338,0,0,6.6152339,-52.777953,394.37777)"
+         d="M 50.911688,31.858782 A 19.027601,19.027601 0 0 1 31.884087,50.886383 19.027601,19.027601 0 0 1 12.856485,31.858782 19.027601,19.027601 0 0 1 31.884087,12.831181 19.027601,19.027601 0 0 1 50.911688,31.858782 Z"
          id="path4313-3"
-         sodipodi:cx="31.884087"
-         sodipodi:cy="31.858782"
-         sodipodi:rx="19.027601"
-         sodipodi:ry="19.027601"
-         d="m 50.911688,31.858782 c 0,10.508654 -8.518947,19.027601 -19.027601,19.027601 -10.508654,0 -19.027602,-8.518947 -19.027602,-19.027601 0,-10.508654 8.518948,-19.027601 19.027602,-19.027601 10.508654,0 19.027601,8.518947 19.027601,19.027601 z"
-         transform="matrix(6.6152338,0,0,6.6152339,-52.777953,394.37777)" />
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:1.86477411;stroke-linecap:butt;stroke-linejoin:round;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 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-6-7"
+         transform="matrix(0.22223428,1.1208489,-1.1208491,0.22223424,848.73281,361.9107)"
          style="color:#000000;fill:url(#linearGradient3829);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:10.79571342;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(0.22223428,1.1208489,-1.1208491,0.22223424,848.73281,361.9107)" />
+         id="path3162-6-7"
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
       <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
+         transform="matrix(0.17284887,0.87177139,-0.87177138,0.17284885,695.26827,443.37281)"
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:13.88020325;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path3162-6-7-1"
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:13.88020325;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(0.17284887,0.87177139,-0.87177138,0.17284885,695.26827,443.37281)" />
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
       <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-6-7-2"
+         transform="matrix(0.22223426,1.1208489,-1.1208491,0.22223426,972.092,238.55153)"
          style="color:#000000;fill:url(#linearGradient3954);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:10.79571342;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(0.22223426,1.1208489,-1.1208491,0.22223426,972.092,238.55153)" />
+         id="path3162-6-7-2"
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
       <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
+         transform="matrix(0.17284889,0.87177141,-0.87177135,0.17284883,818.62742,320.01364)"
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:13.88020325;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path3162-6-7-1-4"
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:13.88020325;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(0.17284889,0.87177141,-0.87177135,0.17284883,818.62742,320.01364)" />
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
       <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-6-7-6"
+         transform="matrix(0.22223426,1.1208489,-1.1208491,0.22223426,848.73281,115.19236)"
          style="color:#000000;fill:url(#linearGradient3954-8);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:10.79571342;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(0.22223426,1.1208489,-1.1208491,0.22223426,848.73281,115.19236)" />
+         id="path3162-6-7-6"
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
       <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
+         transform="matrix(0.17284889,0.87177141,-0.87177135,0.17284883,695.26825,196.65448)"
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:13.88020325;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="path3162-6-7-1-9"
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:13.88020325;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(0.17284889,0.87177141,-0.87177135,0.17284883,695.26825,196.65448)" />
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
       <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-6-7-27"
+         transform="matrix(0.22223426,1.1208489,-1.1208491,0.22223426,725.37364,238.55153)"
          style="color:#000000;fill:url(#linearGradient3954-6);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:10.79571342;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(0.22223426,1.1208489,-1.1208491,0.22223426,725.37364,238.55153)" />
+         id="path3162-6-7-27"
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
       <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-6-7-1-5"
+         transform="matrix(0.17284889,0.87177141,-0.87177135,0.17284883,571.90908,320.01364)"
          style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:13.88020325;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(0.17284889,0.87177141,-0.87177135,0.17284883,571.90908,320.01364)" />
+         id="path3162-6-7-1-5"
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
     </g>
   </g>
   <metadata
@@ -660,7 +509,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Angle</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Center.svg b/src/Mod/Draft/Resources/icons/Snap_Center.svg
index 40258419dd..a394ec45c0 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Center.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Center.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,94 +6,44 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Center.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3827">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3829"
          offset="0"
-         id="stop3829" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3831"
          offset="1"
-         id="stop3831" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3819">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3821"
          offset="0"
-         id="stop3821" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3823"
          offset="1"
-         id="stop3823" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
-    </linearGradient>
-    <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="perspective2734" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient3850-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-4" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-4" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
        r="34.345188"
@@ -105,110 +53,85 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient4437"
+       id="radialGradient3850"
+       xlink:href="#linearGradient3144" />
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-2"
+       xlink:href="#linearGradient3144-7" />
+    <linearGradient
+       id="linearGradient3144-7">
+      <stop
+         id="stop3146-4"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3148-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
        xlink:href="#linearGradient3144-7"
-       inkscape:collect="always" />
+       id="radialGradient4437"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3819"
-       id="linearGradient3825"
-       x1="188.60719"
-       y1="615.00635"
-       x2="206.72833"
+       gradientUnits="userSpaceOnUse"
        y2="690.13739"
-       gradientUnits="userSpaceOnUse" />
+       x2="206.72833"
+       y1="615.00635"
+       x1="188.60719"
+       id="linearGradient3825"
+       xlink:href="#linearGradient3819" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3827"
-       id="linearGradient3833"
-       x1="213.65439"
-       y1="771.66589"
-       x2="102.63113"
+       gradientUnits="userSpaceOnUse"
        y2="450.93207"
-       gradientUnits="userSpaceOnUse" />
+       x2="102.63113"
+       y1="771.66589"
+       x1="213.65439"
+       id="linearGradient3833"
+       xlink:href="#linearGradient3827" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.910714"
-     inkscape:cx="16.677661"
-     inkscape:cy="32"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2995"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         style="color:#000000;fill:url(#linearGradient3833);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591689000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 158.04599,438.59616 c -92.004046,0 -166.4381056,74.62759 -166.4381056,166.63164 0,92.00406 74.4340596,166.43812 166.4381056,166.43812 92.00406,0 166.63165,-74.43406 166.63165,-166.43812 0,-92.00405 -74.62759,-166.63164 -166.63165,-166.63164 z m 0.0968,61.67958 c 60.62343,0 104.8553,44.23189 104.8553,104.8553 0,60.62344 -44.23187,104.85529 -104.8553,104.85529 -60.623416,0 -104.855291,-44.23185 -104.855291,-104.85529 0,-60.62341 44.231875,-104.8553 104.855291,-104.8553 z"
          id="path4364"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssssssssss" />
+         d="m 158.04599,438.59616 c -92.004046,0 -166.4381056,74.62759 -166.4381056,166.63164 0,92.00406 74.4340596,166.43812 166.4381056,166.43812 92.00406,0 166.63165,-74.43406 166.63165,-166.43812 0,-92.00405 -74.62759,-166.63164 -166.63165,-166.63164 z m 0.0968,61.67958 c 60.62343,0 104.8553,44.23189 104.8553,104.8553 0,60.62344 -44.23187,104.85529 -104.8553,104.85529 -60.623416,0 -104.855291,-44.23185 -104.855291,-104.85529 0,-60.62341 44.231875,-104.8553 104.855291,-104.8553 z"
+         style="color:#000000;fill:url(#linearGradient3833);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591689000000000;stroke-linecap:butt;stroke-linejoin:round;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 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162"
+         transform="matrix(-1.1208489,0.22223427,-0.22223425,-1.120849,524.72228,1295.721)"
          style="color:#000000;fill:url(#linearGradient3825);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:10.79571282000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(-1.1208489,0.22223427,-0.22223425,-1.120849,524.72228,1295.721)" />
+         id="path3162"
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
       <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-1"
+         transform="matrix(-3.1134692,0.61731735,-0.61731739,-3.1134692,1176.4192,2523.4365)"
          style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:3.88645675;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(-3.1134692,0.61731735,-0.61731739,-3.1134692,1176.4192,2523.4365)" />
+         id="path3162-1"
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
       <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-1-7"
+         transform="matrix(-2.3662365,0.46916121,-0.46916122,-2.3662368,932.03287,2063.0433)"
          style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:5.11375875;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(-2.3662365,0.46916121,-0.46916122,-2.3662368,932.03287,2063.0433)" />
+         id="path3162-1-7"
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
       <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-1-7-4"
+         transform="matrix(-0.87177137,0.17284887,-0.17284887,-0.87177148,443.26017,1142.2566)"
          style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:13.88020229;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(-0.87177137,0.17284887,-0.17284887,-0.87177148,443.26017,1142.2566)" />
+         id="path3162-1-7-4"
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
     </g>
   </g>
   <metadata
@@ -219,7 +142,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Center</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg b/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg
index d2e238a9ce..89e7429135 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,55 +6,23 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Dimensions.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2734" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <inkscape:perspective
-       id="perspective2684"
-       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
        r="34.345188"
        fy="672.79736"
@@ -65,54 +31,69 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3809"
+       id="radialGradient3850"
+       xlink:href="#linearGradient3144" />
+    <radialGradient
        xlink:href="#linearGradient3144-5"
-       inkscape:collect="always" />
+       id="radialGradient3809"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-5">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-5"
          offset="0"
-         id="stop3146-5" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-0"
          offset="1"
-         id="stop3148-0" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3144-5"
        id="radialGradient3811"
-       xlink:href="#linearGradient3144-5"
-       inkscape:collect="always" />
-    <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       xlink:href="#linearGradient3144-5"
        id="radialGradient3799"
-       xlink:href="#linearGradient3144-5"
-       inkscape:collect="always" />
-    <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       fx="225.26402"
-       cy="672.79736"
-       cx="225.26402"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       xlink:href="#linearGradient3144-5"
        id="radialGradient3819"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
        xlink:href="#linearGradient3144-5"
-       inkscape:collect="always" />
+       id="radialGradient3827"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <radialGradient
        r="34.345188"
        fy="672.79736"
@@ -121,314 +102,204 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3827"
-       xlink:href="#linearGradient3144-5"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
        id="radialGradient3823"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3843"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3847"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3849"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3851"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3873"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3877"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3879"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3881"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3902"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-5" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
-       id="radialGradient3906"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3906"
+       xlink:href="#linearGradient3144-5" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.4464321"
-     inkscape:cx="16.540586"
-     inkscape:cy="25.700936"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3011"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         d="m 102.63114,494.10779 12.33591,0 0,-49.34367 -12.33591,0 0,-12.33592 12.33591,-6.16796 18.50388,0 0,67.84755 6.16796,0 0,18.50387 -37.00775,0 0,-18.50387"
-         style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
          id="path3049"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccc" />
-      <path
-         d="m 158.14276,494.10779 18.50388,0 0,18.50387 -18.50388,0 0,-18.50387"
          style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+         d="m 102.63114,494.10779 12.33591,0 0,-49.34367 -12.33591,0 0,-12.33592 12.33591,-6.16796 18.50388,0 0,67.84755 6.16796,0 0,18.50387 -37.00775,0 0,-18.50387" />
+      <path
          id="path3051"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         d="m 229.54765,472.39043 c -4e-5,-9.66267 -0.75029,-22.62906 -2.25082,-26.56322 -1.47228,-3.96856 -3.96376,-5.95287 -7.47448,-5.95293 -3.51075,6e-5 -6.01636,1.98437 -7.51688,5.95293 -1.50059,3.93416 -2.25086,16.90055 -2.25086,26.56322 0,9.76628 0.75027,16.65098 2.25086,20.65405 1.50052,4.00321 4.00613,6.00477 7.51688,6.0047 3.4824,7e-5 5.97388,-2.00149 7.47448,-6.0047 1.50053,-4.00307 2.25078,-10.88777 2.25082,-20.65405 m 16.35034,0.15535 c -4e-5,12.80315 -2.26504,22.69019 -6.79495,29.66114 -4.53002,6.93644 -10.9569,10.40469 -19.28069,10.40469 -8.35213,0 -14.7932,-3.46825 -19.32314,-10.40469 -4.52994,-6.97095 -6.79495,-16.85799 -6.79495,-29.66114 0,-12.83758 2.26501,-28.89257 6.79495,-35.82907 4.52994,-6.97091 10.97101,-10.45639 19.32314,-10.45647 8.32379,8e-5 14.75067,3.48556 19.28069,10.45647 4.52991,6.9365 6.79491,22.99149 6.79495,35.82907"
          style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+         d="m 158.14276,494.10779 18.50388,0 0,18.50387 -18.50388,0 0,-18.50387" />
+      <path
          id="path3053"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsccscccscscccc" />
-      <path
-         d="m 297.39516,472.39043 c -3e-5,-9.66267 -0.75029,-22.62906 -2.25081,-26.56322 -1.47227,-3.96856 -3.96375,-5.95287 -7.47446,-5.95293 -3.51076,6e-5 -6.01639,1.98437 -7.51689,5.95293 -1.50061,3.93416 -2.25086,16.90055 -2.25086,26.56322 0,9.76628 0.75025,16.65098 2.25086,20.65405 1.5005,4.00321 4.00613,6.00477 7.51689,6.0047 3.48239,7e-5 5.97387,-2.00149 7.47446,-6.0047 1.50052,-4.00307 2.25078,-10.88777 2.25081,-20.65405 m 16.35036,0.15535 c -5e-5,12.80315 -2.26504,22.69019 -6.79496,29.66114 -4.52997,6.93644 -10.95689,10.40469 -19.28067,10.40469 -8.35215,0 -14.79321,-3.46825 -19.32315,-10.40469 -4.52994,-6.97095 -6.79496,-16.85799 -6.79496,-29.66114 0,-12.83758 2.26502,-28.89257 6.79496,-35.82909 4.52994,-6.97089 10.971,-10.45637 19.32315,-10.45645 8.32378,8e-5 14.7507,3.48556 19.28067,10.45645 4.52992,6.93652 6.79491,22.99151 6.79496,35.82909"
          style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+         d="m 229.54765,472.39043 c -4e-5,-9.66267 -0.75029,-22.62906 -2.25082,-26.56322 -1.47228,-3.96856 -3.96376,-5.95287 -7.47448,-5.95293 -3.51075,6e-5 -6.01636,1.98437 -7.51688,5.95293 -1.50059,3.93416 -2.25086,16.90055 -2.25086,26.56322 0,9.76628 0.75027,16.65098 2.25086,20.65405 1.50052,4.00321 4.00613,6.00477 7.51688,6.0047 3.4824,7e-5 5.97388,-2.00149 7.47448,-6.0047 1.50053,-4.00307 2.25078,-10.88777 2.25082,-20.65405 m 16.35034,0.15535 c -4e-5,12.80315 -2.26504,22.69019 -6.79495,29.66114 -4.53002,6.93644 -10.9569,10.40469 -19.28069,10.40469 -8.35213,0 -14.7932,-3.46825 -19.32314,-10.40469 -4.52994,-6.97095 -6.79495,-16.85799 -6.79495,-29.66114 0,-12.83758 2.26501,-28.89257 6.79495,-35.82907 4.52994,-6.97091 10.97101,-10.45639 19.32314,-10.45647 8.32379,8e-5 14.75067,3.48556 19.28069,10.45647 4.52991,6.9365 6.79491,22.99149 6.79495,35.82907" />
+      <path
          id="path3055"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsccscccscscccc" />
-      <path
-         d="m 47.119515,746.99408 0,-12.33591 -49.3436681,0 0,12.33591 -12.3359199,0 -6.16796,-12.33591 0,-18.50388 67.847548,0 0,-6.16796 18.50387,0 0,37.00775 -18.50387,0"
          style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+         d="m 297.39516,472.39043 c -3e-5,-9.66267 -0.75029,-22.62906 -2.25081,-26.56322 -1.47227,-3.96856 -3.96375,-5.95287 -7.47446,-5.95293 -3.51076,6e-5 -6.01639,1.98437 -7.51689,5.95293 -1.50061,3.93416 -2.25086,16.90055 -2.25086,26.56322 0,9.76628 0.75025,16.65098 2.25086,20.65405 1.5005,4.00321 4.00613,6.00477 7.51689,6.0047 3.48239,7e-5 5.97387,-2.00149 7.47446,-6.0047 1.50052,-4.00307 2.25078,-10.88777 2.25081,-20.65405 m 16.35036,0.15535 c -5e-5,12.80315 -2.26504,22.69019 -6.79496,29.66114 -4.52997,6.93644 -10.95689,10.40469 -19.28067,10.40469 -8.35215,0 -14.79321,-3.46825 -19.32315,-10.40469 -4.52994,-6.97095 -6.79496,-16.85799 -6.79496,-29.66114 0,-12.83758 2.26502,-28.89257 6.79496,-35.82909 4.52994,-6.97089 10.971,-10.45637 19.32315,-10.45645 8.32378,8e-5 14.7507,3.48556 19.28067,10.45645 4.52992,6.93652 6.79491,22.99151 6.79496,35.82909" />
+      <path
          id="path3049-35"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccc" />
-      <path
-         d="m 47.119515,691.48246 0,-18.50388 18.50387,0 0,18.50388 -18.50387,0"
          style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+         d="m 47.119515,746.99408 0,-12.33591 -49.3436681,0 0,12.33591 -12.3359199,0 -6.16796,-12.33591 0,-18.50388 67.847548,0 0,-6.16796 18.50387,0 0,37.00775 -18.50387,0" />
+      <path
          id="path3051-62"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         d="m 25.402155,620.07757 c -9.66267,4e-5 -22.6290581,0.75029 -26.5632181,2.25082 -3.96856,1.47228 -5.95287,3.96376 -5.95293,7.47448 6e-5,3.51075 1.98437,6.01636 5.95293,7.51688 3.93416,1.50059 16.9005481,2.25086 26.5632181,2.25086 9.76628,0 16.65098,-0.75027 20.65404,-2.25086 4.00322,-1.50052 6.00478,-4.00613 6.00471,-7.51688 7e-5,-3.4824 -2.00149,-5.97388 -6.00471,-7.47448 -4.00306,-1.50053 -10.88776,-2.25078 -20.65404,-2.25082 m 0.15535,-16.35034 c 12.80315,4e-5 22.69019,2.26504 29.66113,6.79495 6.93645,4.53002 10.4047,10.9569 10.4047,19.28069 0,8.35213 -3.46825,14.7932 -10.4047,19.32314 -6.97094,4.52994 -16.85798,6.79495 -29.66113,6.79495 -12.83758,0 -28.8925681,-2.26501 -35.829068,-6.79495 -6.97091,-4.52994 -10.45639,-10.97101 -10.45647,-19.32314 8e-5,-8.32379 3.48556,-14.75067 10.45647,-19.28069 6.9364999,-4.52991 22.991488,-6.79491 35.829068,-6.79495"
          style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+         d="m 47.119515,691.48246 0,-18.50388 18.50387,0 0,18.50388 -18.50387,0" />
+      <path
          id="path3053-9"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsccscccscscccc" />
-      <path
-         d="m 25.402155,552.23006 c -9.66267,3e-5 -22.6290581,0.75029 -26.5632181,2.25081 -3.96856,1.47227 -5.95287,3.96375 -5.95293,7.47446 6e-5,3.51076 1.98437,6.01639 5.95293,7.51689 3.93416,1.50061 16.9005481,2.25086 26.5632181,2.25086 9.76628,0 16.65098,-0.75025 20.65404,-2.25086 4.00322,-1.5005 6.00478,-4.00613 6.00471,-7.51689 7e-5,-3.48239 -2.00149,-5.97387 -6.00471,-7.47446 -4.00306,-1.50052 -10.88776,-2.25078 -20.65404,-2.25081 m 0.15535,-16.35036 c 12.80315,5e-5 22.69019,2.26504 29.66113,6.79496 6.93645,4.52997 10.4047,10.95689 10.4047,19.28067 0,8.35215 -3.46825,14.79321 -10.4047,19.32315 -6.97094,4.52994 -16.85798,6.79496 -29.66113,6.79496 -12.83758,0 -28.8925681,-2.26502 -35.829088,-6.79496 -6.97089,-4.52994 -10.45637,-10.971 -10.45645,-19.32315 8e-5,-8.32378 3.48556,-14.7507 10.45645,-19.28067 6.9365199,-4.52992 22.991508,-6.79491 35.829088,-6.79496"
          style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+         d="m 25.402155,620.07757 c -9.66267,4e-5 -22.6290581,0.75029 -26.5632181,2.25082 -3.96856,1.47228 -5.95287,3.96376 -5.95293,7.47448 6e-5,3.51075 1.98437,6.01636 5.95293,7.51688 3.93416,1.50059 16.9005481,2.25086 26.5632181,2.25086 9.76628,0 16.65098,-0.75027 20.65404,-2.25086 4.00322,-1.50052 6.00478,-4.00613 6.00471,-7.51688 7e-5,-3.4824 -2.00149,-5.97388 -6.00471,-7.47448 -4.00306,-1.50053 -10.88776,-2.25078 -20.65404,-2.25082 m 0.15535,-16.35034 c 12.80315,4e-5 22.69019,2.26504 29.66113,6.79495 6.93645,4.53002 10.4047,10.9569 10.4047,19.28069 0,8.35213 -3.46825,14.7932 -10.4047,19.32314 -6.97094,4.52994 -16.85798,6.79495 -29.66113,6.79495 -12.83758,0 -28.8925681,-2.26501 -35.829068,-6.79495 -6.97091,-4.52994 -10.45639,-10.97101 -10.45647,-19.32314 8e-5,-8.32379 3.48556,-14.75067 10.45647,-19.28069 6.9364999,-4.52991 22.991488,-6.79491 35.829068,-6.79495" />
+      <path
          id="path3055-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccsccscccscscccc" />
+         style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#34e0e2;fill-opacity:1;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+         d="m 25.402155,552.23006 c -9.66267,3e-5 -22.6290581,0.75029 -26.5632181,2.25081 -3.96856,1.47227 -5.95287,3.96375 -5.95293,7.47446 6e-5,3.51076 1.98437,6.01639 5.95293,7.51689 3.93416,1.50061 16.9005481,2.25086 26.5632181,2.25086 9.76628,0 16.65098,-0.75025 20.65404,-2.25086 4.00322,-1.5005 6.00478,-4.00613 6.00471,-7.51689 7e-5,-3.48239 -2.00149,-5.97387 -6.00471,-7.47446 -4.00306,-1.50052 -10.88776,-2.25078 -20.65404,-2.25081 m 0.15535,-16.35036 c 12.80315,5e-5 22.69019,2.26504 29.66113,6.79496 6.93645,4.52997 10.4047,10.95689 10.4047,19.28067 0,8.35215 -3.46825,14.79321 -10.4047,19.32315 -6.97094,4.52994 -16.85798,6.79496 -29.66113,6.79496 -12.83758,0 -28.8925681,-2.26502 -35.829088,-6.79496 -6.97089,-4.52994 -10.45637,-10.971 -10.45645,-19.32315 8e-5,-8.32378 3.48556,-14.7507 10.45645,-19.28067 6.9365199,-4.52992 22.991508,-6.79491 35.829088,-6.79496" />
       <path
-         style="fill:none;stroke:#042a2a;stroke-width:37.00775146;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 176.64663,722.32224 -61.67958,0 0,-160.36692 172.70284,0 0,61.67959"
          id="path3834"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="m 176.64663,722.32224 -61.67958,0 0,-160.36692 172.70284,0 0,61.67959"
+         style="fill:none;stroke:#042a2a;stroke-width:37.00775146;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         sodipodi:type="arc"
-         style="fill:#16d0d2;fill-opacity:1;stroke:#042a2a;stroke-width:3.11111116000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(3.965116,0,0,3.965116,7.0277833,358.85328)"
+         d="m 35,52 a 7,7 0 0 1 -7,7 7,7 0 0 1 -7,-7 7,7 0 0 1 7,-7 7,7 0 0 1 7,7 z"
          id="path3854-7"
-         sodipodi:cx="28"
-         sodipodi:cy="52"
-         sodipodi:rx="7"
-         sodipodi:ry="7"
-         d="m 35,52 c 0,3.865993 -3.134007,7 -7,7 -3.865993,0 -7,-3.134007 -7,-7 0,-3.865993 3.134007,-7 7,-7 3.865993,0 7,3.134007 7,7 z"
-         transform="matrix(3.965116,0,0,3.965116,7.0277833,358.85328)" />
+         style="fill:#16d0d2;fill-opacity:1;stroke:#042a2a;stroke-width:3.11111116000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:type="arc"
-         style="fill:#16d0d2;fill-opacity:1;stroke:#042a2a;stroke-width:3.11111116000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(3.965116,0,0,3.965116,7.0277856,513.05224)"
+         d="m 35,52 a 7,7 0 0 1 -7,7 7,7 0 0 1 -7,-7 7,7 0 0 1 7,-7 7,7 0 0 1 7,7 z"
          id="path3854-7-7"
-         sodipodi:cx="28"
-         sodipodi:cy="52"
-         sodipodi:rx="7"
-         sodipodi:ry="7"
-         d="m 35,52 c 0,3.865993 -3.134007,7 -7,7 -3.865993,0 -7,-3.134007 -7,-7 0,-3.865993 3.134007,-7 7,-7 3.865993,0 7,3.134007 7,7 z"
-         transform="matrix(3.965116,0,0,3.965116,7.0277856,513.05224)" />
+         style="fill:#16d0d2;fill-opacity:1;stroke:#042a2a;stroke-width:3.11111116000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:type="arc"
-         style="fill:#16d0d2;fill-opacity:1;stroke:#042a2a;stroke-width:3.11111116;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(3.965116,0,0,3.965116,173.56266,358.85328)"
+         d="m 35,52 a 7,7 0 0 1 -7,7 7,7 0 0 1 -7,-7 7,7 0 0 1 7,-7 7,7 0 0 1 7,7 z"
          id="path3854-7-1"
-         sodipodi:cx="28"
-         sodipodi:cy="52"
-         sodipodi:rx="7"
-         sodipodi:ry="7"
-         d="m 35,52 c 0,3.865993 -3.134007,7 -7,7 -3.865993,0 -7,-3.134007 -7,-7 0,-3.865993 3.134007,-7 7,-7 3.865993,0 7,3.134007 7,7 z"
-         transform="matrix(3.965116,0,0,3.965116,173.56266,358.85328)" />
+         style="fill:#16d0d2;fill-opacity:1;stroke:#042a2a;stroke-width:3.11111116;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#34e0e2;stroke-width:12.33591651999999961;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 176.64664,722.32225 -61.67959,0 0,-160.36692 172.70284,0 0,61.67958"
          id="path3834-2"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="m 176.64664,722.32225 -61.67959,0 0,-160.36692 172.70284,0 0,61.67958"
+         style="fill:none;stroke:#34e0e2;stroke-width:12.33591651999999961;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         sodipodi:type="arc"
-         style="fill:#16d0d2;stroke:#34e0e2;stroke-width:5.59999942999999956;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(2.2028423,0,0,2.2028423,56.371447,450.49151)"
+         d="m 35,52 a 7,7 0 0 1 -7,7 7,7 0 0 1 -7,-7 7,7 0 0 1 7,-7 7,7 0 0 1 7,7 z"
          id="path3854-7-3"
-         sodipodi:cx="28"
-         sodipodi:cy="52"
-         sodipodi:rx="7"
-         sodipodi:ry="7"
-         d="m 35,52 c 0,3.865993 -3.134007,7 -7,7 -3.865993,0 -7,-3.134007 -7,-7 0,-3.865993 3.134007,-7 7,-7 3.865993,0 7,3.134007 7,7 z"
-         transform="matrix(2.2028423,0,0,2.2028423,56.371447,450.49151)" />
+         style="fill:#16d0d2;stroke:#34e0e2;stroke-width:5.59999942999999956;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:type="arc"
-         style="fill:#16d0d2;stroke:#34e0e2;stroke-width:5.59999942999999956;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(2.2028423,0,0,2.2028423,222.90633,450.49151)"
+         d="m 35,52 a 7,7 0 0 1 -7,7 7,7 0 0 1 -7,-7 7,7 0 0 1 7,-7 7,7 0 0 1 7,7 z"
          id="path3854-7-3-1"
-         sodipodi:cx="28"
-         sodipodi:cy="52"
-         sodipodi:rx="7"
-         sodipodi:ry="7"
-         d="m 35,52 c 0,3.865993 -3.134007,7 -7,7 -3.865993,0 -7,-3.134007 -7,-7 0,-3.865993 3.134007,-7 7,-7 3.865993,0 7,3.134007 7,7 z"
-         transform="matrix(2.2028423,0,0,2.2028423,222.90633,450.49151)" />
+         style="fill:#16d0d2;stroke:#34e0e2;stroke-width:5.59999942999999956;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         sodipodi:type="arc"
-         style="fill:#16d0d2;stroke:#34e0e2;stroke-width:5.59999942999999956;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         transform="matrix(2.2028423,0,0,2.2028423,56.371447,604.69047)"
+         d="m 35,52 a 7,7 0 0 1 -7,7 7,7 0 0 1 -7,-7 7,7 0 0 1 7,-7 7,7 0 0 1 7,7 z"
          id="path3854-7-3-2"
-         sodipodi:cx="28"
-         sodipodi:cy="52"
-         sodipodi:rx="7"
-         sodipodi:ry="7"
-         d="m 35,52 c 0,3.865993 -3.134007,7 -7,7 -3.865993,0 -7,-3.134007 -7,-7 0,-3.865993 3.134007,-7 7,-7 3.865993,0 7,3.134007 7,7 z"
-         transform="matrix(2.2028423,0,0,2.2028423,56.371447,604.69047)" />
+         style="fill:#16d0d2;stroke:#34e0e2;stroke-width:5.59999942999999956;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
   </g>
   <metadata
@@ -439,7 +310,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Dimensions</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Tue Sep 17 23:07:04 2013 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg b/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg
index 01e2c4ea45..72b52f96c8 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,140 +6,86 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Endpoint.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3779">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3781"
          offset="0"
-         id="stop3781" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3783"
          offset="1"
-         id="stop3783" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4274"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4274"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient4272"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <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="perspective2734" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3011"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3011"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3779"
-       id="linearGradient3785"
-       x1="170.20491"
-       y1="728.83636"
-       x2="146.08063"
+       gradientUnits="userSpaceOnUse"
        y2="508.38715"
-       gradientUnits="userSpaceOnUse" />
+       x2="146.08063"
+       y1="728.83636"
+       x1="170.20491"
+       id="linearGradient3785"
+       xlink:href="#linearGradient3779" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="29.639458"
-     inkscape:cy="27.256266"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="true"
-     inkscape:snap-bbox="false"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2991"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         style="color:#000000;fill:url(#linearGradient3785);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591689000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 277.8342,450.93208 91.251015,618.75727 c -8.918335,-3.55647 -18.650534,-5.41282 -28.857145,-5.13952 -40.206815,1.07665 -71.8358285,34.50943 -70.759301,74.72077 1.0765272,40.21135 34.505519,72.0416 74.712334,70.96496 40.206817,-1.07665 72.033487,-34.7071 70.956957,-74.91845 -0.10549,-3.93995 -0.6803,-7.71094 -1.38356,-11.46508 L 324.67764,503.11801 277.8342,450.93208 z"
          id="rect2269"
-         inkscape:connector-curvature="0" />
+         d="M 277.8342,450.93208 91.251015,618.75727 c -8.918335,-3.55647 -18.650534,-5.41282 -28.857145,-5.13952 -40.206815,1.07665 -71.8358285,34.50943 -70.759301,74.72077 1.0765272,40.21135 34.505519,72.0416 74.712334,70.96496 40.206817,-1.07665 72.033487,-34.7071 70.956957,-74.91845 -0.10549,-3.93995 -0.6803,-7.71094 -1.38356,-11.46508 L 324.67764,503.11801 277.8342,450.93208 z"
+         style="color:#000000;fill:url(#linearGradient3785);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591689000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591689;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 276.74385,468.64297 94.08423,632.57831 c -8.91833,-3.55647 -25.263569,-7.19772 -36.016523,-5.77147 -35.913836,4.76357 -53.8623972,30.41905 -54.1239057,64.67562 -0.2495862,32.69478 36.3906717,55.11513 55.5116257,55.51162 26.648562,0.55259 62.860723,-13.7279 65.072103,-62.27432 0.24957,-5.47877 -0.90505,-11.37956 -2.99603,-15.53019 l 185.73261,-167.0305 z"
          id="rect2269-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccssssccc" />
+         d="M 276.74385,468.64297 94.08423,632.57831 c -8.91833,-3.55647 -25.263569,-7.19772 -36.016523,-5.77147 -35.913836,4.76357 -53.8623972,30.41905 -54.1239057,64.67562 -0.2495862,32.69478 36.3906717,55.11513 55.5116257,55.51162 26.648562,0.55259 62.860723,-13.7279 65.072103,-62.27432 0.24957,-5.47877 -0.90505,-11.37956 -2.99603,-15.53019 l 185.73261,-167.0305 z"
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591689;stroke-linecap:butt;stroke-linejoin:round;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>
   <metadata
@@ -152,7 +96,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Endpoint</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
@@ -182,7 +126,7 @@
           <rdf:Bag>
             <rdf:li>line</rdf:li>
             <rdf:li>endpoint</rdf:li>
-            <rdf:li></rdf:li>
+            <rdf:li />
           </rdf:Bag>
         </dc:subject>
         <dc:description>Line with bulge at one endpoint</dc:description>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Extension.svg b/src/Mod/Draft/Resources/icons/Snap_Extension.svg
index bd8e8dec1a..6c5c48484b 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Extension.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Extension.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,94 +6,85 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Extension.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2734" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient3850-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-2"
+       xlink:href="#linearGradient3144-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-7">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-4"
          offset="0"
-         id="stop3146-4" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-4"
          offset="1"
-         id="stop3148-4" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
-       id="radialGradient3850-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-7"
+       xlink:href="#linearGradient3144-5" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-5">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-6"
          offset="0"
-         id="stop3146-6" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-5"
          offset="1"
-         id="stop3148-5" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-5"
+       id="radialGradient4501"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <radialGradient
        r="34.345188"
        fy="672.79736"
@@ -104,32 +93,29 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient4501"
-       xlink:href="#linearGradient3144-5"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
        id="radialGradient3850-70"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-3" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-3">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-2"
          offset="0"
-         id="stop3146-2" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-3"
          offset="1"
-         id="stop3148-3" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-3"
+       id="radialGradient4501-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <radialGradient
        r="34.345188"
        fy="672.79736"
@@ -138,32 +124,29 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient4501-8"
-       xlink:href="#linearGradient3144-3"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
        id="radialGradient3850-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-1" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-1">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-5"
          offset="0"
-         id="stop3146-5" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-1"
          offset="1"
-         id="stop3148-1" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient3144-1"
+       id="radialGradient4501-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <radialGradient
        r="34.345188"
        fy="672.79736"
@@ -172,54 +155,18 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient4501-1"
-       xlink:href="#linearGradient3144-1"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9"
        id="radialGradient3850-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144-9" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-9">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-9"
          offset="0"
-         id="stop3146-9" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-12"
          offset="1"
-         id="stop3148-12" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-2"
-       id="radialGradient3850-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-2">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-0" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-2" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
        r="34.345188"
@@ -229,267 +176,200 @@
        cx="225.26402"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient4815"
+       id="radialGradient3850-6"
+       xlink:href="#linearGradient3144-2" />
+    <linearGradient
+       id="linearGradient3144-2">
+      <stop
+         id="stop3146-0"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3148-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <radialGradient
        xlink:href="#linearGradient3144-2"
-       inkscape:collect="always" />
+       id="radialGradient4815"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3770"
+       gradientUnits="userSpaceOnUse"
+       y2="18.702312"
+       x2="29.055662"
+       y1="34.472939"
+       x1="34.969646"
        id="linearGradient3803"
-       x1="34.969646"
-       y1="34.472939"
-       x2="29.055662"
-       y2="18.702312"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3770" />
     <linearGradient
-       id="linearGradient3770"
-       inkscape:collect="always">
+       id="linearGradient3770">
       <stop
-         id="stop3772"
+         style="stop-color:#06989a;stop-opacity:1"
          offset="0"
-         style="stop-color:#06989a;stop-opacity:1" />
+         id="stop3772" />
       <stop
-         id="stop3774"
+         style="stop-color:#34e0e2;stop-opacity:1"
          offset="1"
-         style="stop-color:#34e0e2;stop-opacity:1" />
+         id="stop3774" />
     </linearGradient>
     <linearGradient
-       y2="18.702312"
-       x2="29.055662"
-       y1="34.472939"
-       x1="34.969646"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3015"
        xlink:href="#linearGradient3770"
-       inkscape:collect="always" />
+       id="linearGradient3015"
+       gradientUnits="userSpaceOnUse"
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3770-7"
+       gradientUnits="userSpaceOnUse"
+       y2="18.702312"
+       x2="29.055662"
+       y1="34.472939"
+       x1="34.969646"
        id="linearGradient3803-1"
-       x1="34.969646"
-       y1="34.472939"
-       x2="29.055662"
-       y2="18.702312"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3770-7" />
     <linearGradient
-       id="linearGradient3770-7"
-       inkscape:collect="always">
+       id="linearGradient3770-7">
       <stop
-         id="stop3772-4"
+         style="stop-color:#06989a;stop-opacity:1"
          offset="0"
-         style="stop-color:#06989a;stop-opacity:1" />
+         id="stop3772-4" />
       <stop
-         id="stop3774-0"
+         style="stop-color:#34e0e2;stop-opacity:1"
          offset="1"
-         style="stop-color:#34e0e2;stop-opacity:1" />
+         id="stop3774-0" />
     </linearGradient>
     <linearGradient
-       y2="18.702312"
-       x2="29.055662"
-       y1="34.472939"
-       x1="34.969646"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3015-9"
        xlink:href="#linearGradient3770-7"
-       inkscape:collect="always" />
+       id="linearGradient3015-9"
+       gradientUnits="userSpaceOnUse"
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3770-2"
+       gradientUnits="userSpaceOnUse"
+       y2="18.702312"
+       x2="29.055662"
+       y1="34.472939"
+       x1="34.969646"
        id="linearGradient3803-8"
-       x1="34.969646"
-       y1="34.472939"
-       x2="29.055662"
-       y2="18.702312"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3770-2" />
     <linearGradient
-       id="linearGradient3770-2"
-       inkscape:collect="always">
+       id="linearGradient3770-2">
       <stop
-         id="stop3772-45"
+         style="stop-color:#06989a;stop-opacity:1"
          offset="0"
-         style="stop-color:#06989a;stop-opacity:1" />
+         id="stop3772-45" />
       <stop
-         id="stop3774-5"
+         style="stop-color:#34e0e2;stop-opacity:1"
          offset="1"
-         style="stop-color:#34e0e2;stop-opacity:1" />
+         id="stop3774-5" />
     </linearGradient>
     <linearGradient
-       y2="18.702312"
-       x2="29.055662"
-       y1="34.472939"
-       x1="34.969646"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3015-1"
        xlink:href="#linearGradient3770-2"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="18.702312"
-       x2="29.055662"
-       y1="34.472939"
-       x1="34.969646"
+       id="linearGradient3015-1"
        gradientUnits="userSpaceOnUse"
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312" />
+    <linearGradient
+       xlink:href="#linearGradient3770-2-5"
        id="linearGradient3015-1-1"
-       xlink:href="#linearGradient3770-2-5"
-       inkscape:collect="always" />
+       gradientUnits="userSpaceOnUse"
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312" />
     <linearGradient
-       id="linearGradient3770-2-5"
-       inkscape:collect="always">
+       id="linearGradient3770-2-5">
       <stop
-         id="stop3772-45-2"
+         style="stop-color:#06989a;stop-opacity:1"
          offset="0"
-         style="stop-color:#06989a;stop-opacity:1" />
+         id="stop3772-45-2" />
       <stop
-         id="stop3774-5-7"
+         style="stop-color:#34e0e2;stop-opacity:1"
          offset="1"
-         style="stop-color:#34e0e2;stop-opacity:1" />
+         id="stop3774-5-7" />
     </linearGradient>
     <linearGradient
-       y2="18.702312"
-       x2="29.055662"
-       y1="34.472939"
-       x1="34.969646"
-       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient3770-2-5"
        id="linearGradient3094"
-       xlink:href="#linearGradient3770-2-5"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="18.702312"
-       x2="29.055662"
-       y1="34.472939"
-       x1="34.969646"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3015-1-4"
-       xlink:href="#linearGradient3770-2-2"
-       inkscape:collect="always" />
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312" />
     <linearGradient
-       id="linearGradient3770-2-2"
-       inkscape:collect="always">
+       xlink:href="#linearGradient3770-2-2"
+       id="linearGradient3015-1-4"
+       gradientUnits="userSpaceOnUse"
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312" />
+    <linearGradient
+       id="linearGradient3770-2-2">
       <stop
-         id="stop3772-45-3"
+         style="stop-color:#06989a;stop-opacity:1"
          offset="0"
-         style="stop-color:#06989a;stop-opacity:1" />
+         id="stop3772-45-3" />
       <stop
-         id="stop3774-5-2"
+         style="stop-color:#34e0e2;stop-opacity:1"
          offset="1"
-         style="stop-color:#34e0e2;stop-opacity:1" />
+         id="stop3774-5-2" />
     </linearGradient>
     <linearGradient
-       y2="18.702312"
-       x2="29.055662"
-       y1="34.472939"
-       x1="34.969646"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3094-2"
        xlink:href="#linearGradient3770-2-2"
-       inkscape:collect="always" />
+       id="linearGradient3094-2"
+       gradientUnits="userSpaceOnUse"
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="25.371769"
-     inkscape:cx="24.75141"
-     inkscape:cy="32.000001"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3019"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3134"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient3015-1);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2.5345645;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(4.8670752,0,0,4.867076,125.00861,475.72705)"
+         d="m 40.88363,26.587624 a 8.8709764,8.8709764 0 0 1 -8.870977,8.870976 8.8709764,8.8709764 0 0 1 -8.870976,-8.870976 8.8709764,8.8709764 0 0 1 8.870976,-8.870977 8.8709764,8.8709764 0 0 1 8.870977,8.870977 z"
          id="path2998-7"
-         sodipodi:cx="32.012653"
-         sodipodi:cy="26.587624"
-         sodipodi:rx="8.8709764"
-         sodipodi:ry="8.8709764"
-         d="m 40.88363,26.587624 c 0,4.899305 -3.971672,8.870976 -8.870977,8.870976 -4.899305,0 -8.870976,-3.971671 -8.870976,-8.870976 0,-4.899305 3.971671,-8.870977 8.870976,-8.870977 4.899305,0 8.870977,3.971672 8.870977,8.870977 z"
-         transform="matrix(4.8670752,0,0,4.867076,125.00861,475.72705)" />
+         style="color:#000000;fill:url(#linearGradient3015-1);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2.5345645;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:3.5882597;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(3.4378549,0,0,3.4378554,171.1044,514.06929)"
+         d="m 40.88363,26.587624 a 8.8709764,8.8709764 0 0 1 -8.870977,8.870976 8.8709764,8.8709764 0 0 1 -8.870976,-8.870976 8.8709764,8.8709764 0 0 1 8.870976,-8.870977 8.8709764,8.8709764 0 0 1 8.870977,8.870977 z"
          id="path2998-1-1"
-         sodipodi:cx="32.012653"
-         sodipodi:cy="26.587624"
-         sodipodi:rx="8.8709764"
-         sodipodi:ry="8.8709764"
-         d="m 40.88363,26.587624 c 0,4.899305 -3.971672,8.870976 -8.870977,8.870976 -4.899305,0 -8.870976,-3.971671 -8.870976,-8.870976 0,-4.899305 3.971671,-8.870977 8.870976,-8.870977 4.899305,0 8.870977,3.971672 8.870977,8.870977 z"
-         transform="matrix(3.4378549,0,0,3.4378554,171.1044,514.06929)" />
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:3.5882597;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient3094);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2.5345645;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(4.8670752,0,0,4.867076,2.3347765,475.72705)"
+         d="m 40.88363,26.587624 a 8.8709764,8.8709764 0 0 1 -8.870977,8.870976 8.8709764,8.8709764 0 0 1 -8.870976,-8.870976 8.8709764,8.8709764 0 0 1 8.870976,-8.870977 8.8709764,8.8709764 0 0 1 8.870977,8.870977 z"
          id="path2998-7-6"
-         sodipodi:cx="32.012653"
-         sodipodi:cy="26.587624"
-         sodipodi:rx="8.8709764"
-         sodipodi:ry="8.8709764"
-         d="m 40.88363,26.587624 c 0,4.899305 -3.971672,8.870976 -8.870977,8.870976 -4.899305,0 -8.870976,-3.971671 -8.870976,-8.870976 0,-4.899305 3.971671,-8.870977 8.870976,-8.870977 4.899305,0 8.870977,3.971672 8.870977,8.870977 z"
-         transform="matrix(4.8670752,0,0,4.867076,2.3347765,475.72705)" />
+         style="color:#000000;fill:url(#linearGradient3094);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2.5345645;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:3.5882597;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(3.4378549,0,0,3.4378554,48.430568,514.06929)"
+         d="m 40.88363,26.587624 a 8.8709764,8.8709764 0 0 1 -8.870977,8.870976 8.8709764,8.8709764 0 0 1 -8.870976,-8.870976 8.8709764,8.8709764 0 0 1 8.870976,-8.870977 8.8709764,8.8709764 0 0 1 8.870977,8.870977 z"
          id="path2998-1-1-1"
-         sodipodi:cx="32.012653"
-         sodipodi:cy="26.587624"
-         sodipodi:rx="8.8709764"
-         sodipodi:ry="8.8709764"
-         d="m 40.88363,26.587624 c 0,4.899305 -3.971672,8.870976 -8.870977,8.870976 -4.899305,0 -8.870976,-3.971671 -8.870976,-8.870976 0,-4.899305 3.971671,-8.870977 8.870976,-8.870977 4.899305,0 8.870977,3.971672 8.870977,8.870977 z"
-         transform="matrix(3.4378549,0,0,3.4378554,48.430568,514.06929)" />
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:3.5882597;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient3094-2);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2.5345645;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(4.8670752,0,0,4.867076,-121.0244,475.72705)"
+         d="m 40.88363,26.587624 a 8.8709764,8.8709764 0 0 1 -8.870977,8.870976 8.8709764,8.8709764 0 0 1 -8.870976,-8.870976 8.8709764,8.8709764 0 0 1 8.870976,-8.870977 8.8709764,8.8709764 0 0 1 8.870977,8.870977 z"
          id="path2998-7-1"
-         sodipodi:cx="32.012653"
-         sodipodi:cy="26.587624"
-         sodipodi:rx="8.8709764"
-         sodipodi:ry="8.8709764"
-         d="m 40.88363,26.587624 c 0,4.899305 -3.971672,8.870976 -8.870977,8.870976 -4.899305,0 -8.870976,-3.971671 -8.870976,-8.870976 0,-4.899305 3.971671,-8.870977 8.870976,-8.870977 4.899305,0 8.870977,3.971672 8.870977,8.870977 z"
-         transform="matrix(4.8670752,0,0,4.867076,-121.0244,475.72705)" />
+         style="color:#000000;fill:url(#linearGradient3094-2);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2.5345645;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:3.5882597;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(3.4378549,0,0,3.4378554,-74.928601,514.06929)"
+         d="m 40.88363,26.587624 a 8.8709764,8.8709764 0 0 1 -8.870977,8.870976 8.8709764,8.8709764 0 0 1 -8.870976,-8.870976 8.8709764,8.8709764 0 0 1 8.870976,-8.870977 8.8709764,8.8709764 0 0 1 8.870977,8.870977 z"
          id="path2998-1-1-6"
-         sodipodi:cx="32.012653"
-         sodipodi:cy="26.587624"
-         sodipodi:rx="8.8709764"
-         sodipodi:ry="8.8709764"
-         d="m 40.88363,26.587624 c 0,4.899305 -3.971672,8.870976 -8.870977,8.870976 -4.899305,0 -8.870976,-3.971671 -8.870976,-8.870976 0,-4.899305 3.971671,-8.870977 8.870976,-8.870977 4.899305,0 8.870977,3.971672 8.870977,8.870977 z"
-         transform="matrix(3.4378549,0,0,3.4378554,-74.928601,514.06929)" />
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:3.5882597;stroke-linecap:butt;stroke-linejoin:round;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>
   <metadata
@@ -500,7 +380,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Extension</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Grid.svg b/src/Mod/Draft/Resources/icons/Snap_Grid.svg
index 8cdfeba3e8..7f440e698c 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Grid.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Grid.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,217 +6,140 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Grid.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3897">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3899"
          offset="0"
-         id="stop3899" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3901"
          offset="1"
-         id="stop3901" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2734" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
-       id="radialGradient3850-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-4"
+       xlink:href="#linearGradient3144-1" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-1">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-9"
          offset="0"
-         id="stop3146-9" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-8"
          offset="1"
-         id="stop3148-8" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3897"
-       id="linearGradient3903"
-       x1="207.48642"
-       y1="771.66589"
-       x2="108.79909"
+       gradientUnits="userSpaceOnUse"
        y2="450.93207"
-       gradientUnits="userSpaceOnUse" />
+       x2="108.79909"
+       y1="771.66589"
+       x1="207.48642"
+       id="linearGradient3903"
+       xlink:href="#linearGradient3897" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2080078"
-     inkscape:cx="20.986848"
-     inkscape:cy="30.357378"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2993"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="8px"
-       spacingy="8px"
-       empcolor="#ff0000"
-       empopacity="0.25098039"
-       color="#ff0000"
-       opacity="0.1254902" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid2995"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <g
-         id="g3861"
-         style="stroke:#042a2a">
+         style="stroke:#042a2a"
+         id="g3861">
         <path
-           inkscape:connector-curvature="0"
-           id="path2999"
+           style="fill:none;stroke:#042a2a;stroke-width:49.34366753999999800;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 10.11176,524.94758 296.062,0"
-           style="fill:none;stroke:#042a2a;stroke-width:49.34366753999999800;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+           id="path2999" />
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-1"
+           style="fill:none;stroke:#042a2a;stroke-width:49.34366753999999800;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 10.111759,685.31449 296.062001,0"
-           style="fill:none;stroke:#042a2a;stroke-width:49.34366753999999800;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+           id="path2999-1" />
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-7"
+           style="fill:none;stroke:#042a2a;stroke-width:49.34366753999999800;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 77.959303,759.32999 0,-296.062"
-           style="fill:none;stroke:#042a2a;stroke-width:49.34366753999999800;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+           id="path2999-7" />
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-4"
+           style="fill:none;stroke:#042a2a;stroke-width:49.34366753999999800;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 238.32622,759.32999 0,-296.062"
-           style="fill:none;stroke:#042a2a;stroke-width:49.34366753999999800;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+           id="path2999-4" />
       </g>
       <g
-         id="g3855"
+         style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900"
          transform="translate(4.9588412e-6,-1.9669619e-6)"
-         style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900">
+         id="g3855">
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-8"
+           style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 10.11176,524.94759 296.062,0"
-           style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+           id="path2999-8" />
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-1-2"
+           style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 10.11176,685.3145 296.062,0"
-           style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+           id="path2999-1-2" />
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-7-4"
+           style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 77.959303,759.33 0,-296.062"
-           style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+           id="path2999-7-4" />
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-4-5"
+           style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 238.32623,759.33 0,-296.062"
-           style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+           id="path2999-4-5" />
       </g>
       <g
-         id="g3855-5"
+         style="fill:none;stroke:#34e0e2;stroke-width:12.33591652"
          transform="translate(-6.1679587,-6.1679699)"
-         style="fill:none;stroke:#34e0e2;stroke-width:12.33591652">
+         id="g3855-5">
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-8-1"
+           style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 16.279718,524.94759 296.062002,0"
-           style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-           sodipodi:nodetypes="cc" />
+           id="path2999-8-1" />
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-1-2-7"
+           style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 16.279718,685.31451 296.062002,0"
-           style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-           sodipodi:nodetypes="cc" />
+           id="path2999-1-2-7" />
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-7-4-1"
+           style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
            d="m 77.959303,765.49797 0,-296.062"
-           style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-           sodipodi:nodetypes="cc" />
+           id="path2999-7-4-1" />
         <path
-           inkscape:connector-curvature="0"
-           id="path2999-4-5-1"
-           d="m 238.32622,765.49797 0,-296.062"
            style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-           sodipodi:nodetypes="cc" />
+           d="m 238.32622,765.49797 0,-296.062"
+           id="path2999-4-5-1" />
       </g>
     </g>
   </g>
@@ -230,7 +151,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Grid</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Intersection.svg b/src/Mod/Draft/Resources/icons/Snap_Intersection.svg
index d54f2716e7..ee68de1cfe 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Intersection.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Intersection.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,153 +6,98 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Intersection.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3782">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3784"
          offset="0"
-         id="stop3784" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3786"
          offset="1"
-         id="stop3786" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2734" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
-       id="radialGradient3850-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-4"
+       xlink:href="#linearGradient3144-1" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-1">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-2"
          offset="0"
-         id="stop3146-2" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-2"
          offset="1"
-         id="stop3148-2" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
-       id="radialGradient4247"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4247"
+       xlink:href="#linearGradient3144-1" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3782"
-       id="linearGradient3788"
-       x1="36"
-       y1="56"
-       x2="30"
+       gradientUnits="userSpaceOnUse"
        y2="13"
-       gradientUnits="userSpaceOnUse" />
+       x2="30"
+       y1="56"
+       x1="36"
+       id="linearGradient3788"
+       xlink:href="#linearGradient3782" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="13.326691"
-     inkscape:cy="33.042365"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       type="xygrid"
-       id="grid2994" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         style="color:#000000;fill:url(#linearGradient3788);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 15,4.9999997 5.0000001,15 22,32 5.0000001,49 15,59 32,42 49,59 59,49 42,32 59,15 49,4.9999997 32,22 z"
-         transform="matrix(6.1679584,0,0,6.1679584,-39.231908,407.75637)"
          id="rect3942-4-9"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         transform="matrix(6.1679584,0,0,6.1679584,-39.231908,407.75637)"
+         d="M 15,4.9999997 5.0000001,15 22,32 5.0000001,49 15,59 32,42 49,59 59,49 42,32 59,15 49,4.9999997 32,22 z"
+         style="color:#000000;fill:url(#linearGradient3788);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591689000000000;stroke-linecap:butt;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"
-         d="m 53.287469,457.10004 -43.175709,43.1757 104.85529,104.8553 -104.85529,104.85529 43.175709,43.17571 104.855291,-104.85529 104.8553,104.85529 43.1757,-43.17571 -104.85529,-104.85529 104.85529,-104.8553 -43.1757,-43.1757 -104.8553,104.85529 z"
          id="rect3942-4-9-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         d="m 53.287469,457.10004 -43.175709,43.1757 104.85529,104.8553 -104.85529,104.85529 43.175709,43.17571 104.855291,-104.85529 104.8553,104.85529 43.1757,-43.17571 -104.85529,-104.85529 104.85529,-104.8553 -43.1757,-43.1757 -104.8553,104.85529 z"
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591689000000000;stroke-linecap:butt;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>
   <metadata
@@ -165,7 +108,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Intersection</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Lock.svg b/src/Mod/Draft/Resources/icons/Snap_Lock.svg
index 0c13b3491f..557cfef70b 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Lock.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Lock.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,208 +6,142 @@
    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"
+   version="1.1"
    id="svg3230"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Lock.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs3232">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3838">
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3840"
          offset="0"
-         id="stop3840" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3842"
          offset="1"
-         id="stop3842" />
+         style="stop-color:#06989a;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient2409"
-       gradientUnits="userSpaceOnUse"
+       y2="671.11081"
+       x2="2900.148"
+       y1="671.11081"
+       x1="2754.6858"
        gradientTransform="matrix(-1,0,0,-1,5656.8338,1408.2216)"
-       x1="2754.6858"
-       y1="671.11081"
-       x2="2900.148"
-       y2="671.11081" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient2407"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,5656.8338,1376.2216)"
-       x1="2754.6858"
-       y1="671.11081"
+       id="linearGradient2409"
+       xlink:href="#linearGradient3293" />
+    <linearGradient
+       y2="671.11081"
        x2="2900.148"
-       y2="671.11081" />
+       y1="671.11081"
+       x1="2754.6858"
+       gradientTransform="matrix(-1,0,0,-1,5656.8338,1376.2216)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2407"
+       xlink:href="#linearGradient3293" />
     <linearGradient
        id="linearGradient3293">
       <stop
-         style="stop-color:#002a2d;stop-opacity:1;"
+         id="stop3295"
          offset="0"
-         id="stop3295" />
+         style="stop-color:#002a2d;stop-opacity:1;" />
       <stop
-         style="stop-color:#008059;stop-opacity:0;"
+         id="stop3297"
          offset="1"
-         id="stop3297" />
+         style="stop-color:#008059;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3293"
-       id="linearGradient2405"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,-1,5656.8338,1344.2216)"
-       x1="2754.6858"
-       y1="671.11081"
+       y2="671.11081"
        x2="2900.148"
-       y2="671.11081" />
-    <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="perspective3238" />
+       y1="671.11081"
+       x1="2754.6858"
+       gradientTransform="matrix(-1,0,0,-1,5656.8338,1344.2216)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2405"
+       xlink:href="#linearGradient3293" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3838"
+       gradientUnits="userSpaceOnUse"
+       y2="786.05646"
+       x2="2859.7263"
+       y1="538.36249"
+       x1="2802.9631"
        id="linearGradient3844"
-       x1="2802.9631"
-       y1="538.36249"
-       x2="2859.7263"
-       y2="786.05646"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3838" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3838-9"
+       gradientUnits="userSpaceOnUse"
+       y2="786.05646"
+       x2="2859.7263"
+       y1="538.36249"
+       x1="2802.9631"
        id="linearGradient3844-7"
-       x1="2802.9631"
-       y1="538.36249"
-       x2="2859.7263"
-       y2="786.05646"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient3838-9" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3838-9">
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3840-8"
          offset="0"
-         id="stop3840-8" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3842-1"
          offset="1"
-         id="stop3842-1" />
+         style="stop-color:#06989a;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3838"
-       id="linearGradient3880"
-       gradientUnits="userSpaceOnUse"
-       x1="2802.9631"
-       y1="626.0874"
+       y2="822.17853"
        x2="2849.4058"
-       y2="822.17853" />
+       y1="626.0874"
+       x1="2802.9631"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3880"
+       xlink:href="#linearGradient3838" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="6.6796359"
-     inkscape:cx="-20.044391"
-     inkscape:cy="23.289015"
-     inkscape:current-layer="g2383"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3007"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g2383"
        transform="matrix(0.1937875,0,0,0.1937875,-515.01651,-93.777617)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/close.png"
-       inkscape:export-xdpi="4.4961462"
-       inkscape:export-ydpi="4.4961462">
+       id="g2383">
       <g
-         inkscape:export-ydpi="6.5019679"
-         inkscape:export-xdpi="6.5019679"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/close.png"
-         transform="translate(-6,-8)"
+         style="stroke-width:10.32058310999999939;stroke-miterlimit:4;stroke-dasharray:none;stroke:#042a2a;fill:url(#linearGradient3844);stroke-linejoin:round;stroke-linecap:round;fill-opacity:1"
          id="g2385"
-         style="stroke-width:10.32058310999999939;stroke-miterlimit:4;stroke-dasharray:none;stroke:#042a2a;fill:url(#linearGradient3844);stroke-linejoin:round;stroke-linecap:round;fill-opacity:1">
+         transform="translate(-6,-8)">
         <path
-           style="fill:url(#linearGradient3844);fill-opacity:1;fill-rule:evenodd;stroke:#042a2a;stroke-width:10.32058334000000066;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 2751.3603,595.12568 0,0 0,0 -2e-4,46.44262 30.9618,0 -0.2475,-47.17448 -0.05,0 c 0.2977,-25.0696 20.9388,-45.71077 46.7403,-45.71077 25.8014,0 46.4426,20.64117 46.4421,46.44263 l 0,0 0,46.44262 30.9618,0 0,-46.44262 0,0 c 5e-4,-41.28234 -25.801,-77.40438 -77.4039,-77.40438 -51.6029,0 -77.4044,36.12204 -77.4044,77.40438 z"
            id="path2387"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cccccccscccccccc" />
+           d="m 2751.3603,595.12568 0,0 0,0 -2e-4,46.44262 30.9618,0 -0.2475,-47.17448 -0.05,0 c 0.2977,-25.0696 20.9388,-45.71077 46.7403,-45.71077 25.8014,0 46.4426,20.64117 46.4421,46.44263 l 0,0 0,46.44262 30.9618,0 0,-46.44262 0,0 c 5e-4,-41.28234 -25.801,-77.40438 -77.4039,-77.40438 -51.6029,0 -77.4044,36.12204 -77.4044,77.40438 z"
+           style="fill:url(#linearGradient3844);fill-opacity:1;fill-rule:evenodd;stroke:#042a2a;stroke-width:10.32058334000000066;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <rect
-           style="fill:url(#linearGradient3880);fill-opacity:1;fill-rule:evenodd;stroke:#042a2a;stroke-width:10.32058310999999939;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect2389"
-           width="196.09097"
-           height="154.80875"
+           y="641.5683"
            x="2730.7192"
-           y="641.5683" />
+           height="154.80875"
+           width="196.09097"
+           id="rect2389"
+           style="fill:url(#linearGradient3880);fill-opacity:1;fill-rule:evenodd;stroke:#042a2a;stroke-width:10.32058310999999939;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <rect
-           style="fill:none;stroke:#34e0e2;stroke-width:10.32058334000000066;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"
-           id="rect2389-0"
-           width="175.44977"
-           height="134.16759"
+           y="651.88885"
            x="2741.0398"
-           y="651.88885" />
+           height="134.16759"
+           width="175.44977"
+           id="rect2389-0"
+           style="fill:none;stroke:#34e0e2;stroke-width:10.32058334000000066;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>
       <path
-         style="fill:none;stroke:#06989a;stroke-width:20.64116669;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 2755.6809,669.69034 134.1676,0"
          id="path3777-7"
-         inkscape:connector-curvature="0" />
+         d="m 2755.6809,669.69034 134.1676,0"
+         style="fill:none;stroke:#06989a;stroke-width:20.64116669;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#06989a;stroke-width:20.64116669;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 2755.681,710.97267 134.1676,0"
          id="path3777-3-5"
-         inkscape:connector-curvature="0" />
+         d="m 2755.681,710.97267 134.1676,0"
+         style="fill:none;stroke:#06989a;stroke-width:20.64116669;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#06989a;stroke-width:20.64116669;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 2755.681,752.255 134.1676,0"
          id="path3777-6-3"
-         inkscape:connector-curvature="0" />
+         d="m 2755.681,752.255 134.1676,0"
+         style="fill:none;stroke:#06989a;stroke-width:20.64116669;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 19,28 0,-9 c 9e-6,-5.000001 3.999991,-11.999999 13,-12 9.000009,-1e-6 13.000009,6.999999 13,12 l 0,9"
-         id="path3828"
-         inkscape:connector-curvature="0"
          transform="matrix(5.1602916,0,0,5.1602916,2657.6353,483.91985)"
-         sodipodi:nodetypes="cczcc" />
+         id="path3828"
+         d="m 19,28 0,-9 c 9e-6,-5.000001 3.999991,-11.999999 13,-12 9.000009,-1e-6 13.000009,6.999999 13,12 l 0,9"
+         style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
   </g>
   <metadata
@@ -220,7 +152,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Lock</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg b/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg
index f3f72dee97..3156291c7e 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,151 +6,97 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Midpoint.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3782">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3784"
          offset="0"
-         id="stop3784" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3786"
          offset="1"
-         id="stop3786" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4274"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4274"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient4272"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <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="perspective2734" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient3850-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-9"
+       xlink:href="#linearGradient3144-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-7">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-0"
          offset="0"
-         id="stop3146-0" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-3"
          offset="1"
-         id="stop3148-3" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3782"
-       id="linearGradient3788"
-       x1="170.47868"
-       y1="740.82611"
-       x2="145.80684"
+       gradientUnits="userSpaceOnUse"
        y2="481.77188"
-       gradientUnits="userSpaceOnUse" />
+       x2="145.80684"
+       y1="740.82611"
+       x1="170.47868"
+       id="linearGradient3788"
+       xlink:href="#linearGradient3782" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2080078"
-     inkscape:cx="-29.849808"
-     inkscape:cy="36.314712"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2994"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         style="color:#000000;fill:url(#linearGradient3788);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591689000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 286.05557,438.59616 -97.2637,89.49573 c -9.47407,-4.02615 -19.86033,-6.45475 -30.73458,-6.70738 -46.96422,-1.09111 -85.889394,37.06283 -86.956391,85.08801 -0.206698,9.30353 1.102026,18.17235 3.560714,26.63792 l -95.389647,87.77097 44.602625,50.78451 93.515589,-86.04621 c 11.08528,5.82478 23.43483,9.4647 36.73158,9.77362 46.96421,1.09111 86.07678,-37.06283 87.14377,-85.08801 0.26056,-11.72758 -1.9207,-22.84946 -5.80958,-33.15367 l 95.38965,-87.77097 -44.79003,-50.78452 z"
          id="rect2269"
-         inkscape:connector-curvature="0" />
+         d="m 286.05557,438.59616 -97.2637,89.49573 c -9.47407,-4.02615 -19.86033,-6.45475 -30.73458,-6.70738 -46.96422,-1.09111 -85.889394,37.06283 -86.956391,85.08801 -0.206698,9.30353 1.102026,18.17235 3.560714,26.63792 l -95.389647,87.77097 44.602625,50.78451 93.515589,-86.04621 c 11.08528,5.82478 23.43483,9.4647 36.73158,9.77362 46.96421,1.09111 86.07678,-37.06283 87.14377,-85.08801 0.26056,-11.72758 -1.9207,-22.84946 -5.80958,-33.15367 l 95.38965,-87.77097 -44.79003,-50.78452 z"
+         style="color:#000000;fill:url(#linearGradient3788);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591689000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 285.31157,456.45719 -93.99584,85.85152 c -7.97816,-3.42968 -24.01391,-8.30211 -33.17116,-8.51729 -39.54881,-0.92948 -73.650032,31.3621 -74.548551,72.27243 -0.174054,7.92523 2.630113,24.25109 4.70059,31.4625 l -91.381778,84.35166 27.715843,32.27526 90.876996,-83.85376 c 9.33495,4.96187 25.8826,12.29955 37.07987,12.56271 39.54881,0.92945 75.00897,-29.60952 76.18784,-73.88419 0.26597,-9.98902 -4.7014,-26.47341 -7.97623,-35.25105 l 92.66402,-85.14125 z"
          id="rect2269-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccssccccssccc" />
+         d="m 285.31157,456.45719 -93.99584,85.85152 c -7.97816,-3.42968 -24.01391,-8.30211 -33.17116,-8.51729 -39.54881,-0.92948 -73.650032,31.3621 -74.548551,72.27243 -0.174054,7.92523 2.630113,24.25109 4.70059,31.4625 l -91.381778,84.35166 27.715843,32.27526 90.876996,-83.85376 c 9.33495,4.96187 25.8826,12.29955 37.07987,12.56271 39.54881,0.92945 75.00897,-29.60952 76.18784,-73.88419 0.26597,-9.98902 -4.7014,-26.47341 -7.97623,-35.25105 l 92.66402,-85.14125 z"
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:round;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>
   <metadata
@@ -163,7 +107,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Midpoint</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Near.svg b/src/Mod/Draft/Resources/icons/Snap_Near.svg
index 90b1819dbc..1a4bf6cece 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Near.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Near.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,159 +6,97 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Near.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
-    <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="perspective2734" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-4"
-       id="radialGradient3850-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-9"
+       xlink:href="#linearGradient3144-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-4">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-2"
          offset="0"
-         id="stop3146-2" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-0"
          offset="1"
-         id="stop3148-0" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3770"
-       id="linearGradient3768"
-       x1="-506.27731"
-       y1="-559.67511"
-       x2="-385.55225"
-       y2="-461.80075"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3770"
-       inkscape:collect="always">
-      <stop
-         id="stop3772"
-         offset="0"
-         style="stop-color:#06989a;stop-opacity:1" />
-      <stop
-         id="stop3774"
-         offset="1"
-         style="stop-color:#34e0e2;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(1.3659092,13.421127)"
-       y2="-461.80075"
-       x2="-385.55225"
-       y1="-559.67511"
-       x1="-506.27731"
        gradientUnits="userSpaceOnUse"
-       id="linearGradient3021"
-       xlink:href="#linearGradient3770"
-       inkscape:collect="always" />
+       y2="-461.80075"
+       x2="-385.55225"
+       y1="-559.67511"
+       x1="-506.27731"
+       id="linearGradient3768"
+       xlink:href="#linearGradient3770" />
+    <linearGradient
+       id="linearGradient3770">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3772" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3774" />
+    </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3770"
-       id="linearGradient3803"
-       x1="34.969646"
-       y1="34.472939"
-       x2="29.055662"
+       id="linearGradient3021"
+       gradientUnits="userSpaceOnUse"
+       x1="-506.27731"
+       y1="-559.67511"
+       x2="-385.55225"
+       y2="-461.80075"
+       gradientTransform="translate(1.3659092,13.421127)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
        y2="18.702312"
-       gradientUnits="userSpaceOnUse" />
+       x2="29.055662"
+       y1="34.472939"
+       x1="34.969646"
+       id="linearGradient3803"
+       xlink:href="#linearGradient3770" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2080078"
-     inkscape:cx="19.940635"
-     inkscape:cy="39.80739"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2990"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient3803);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:1.97132814999999990;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(6.2576679,0,0,6.2576679,19.497793,340.06718)"
+         d="m 40.88363,26.587624 a 8.8709764,8.8709764 0 0 1 -8.870977,8.870976 8.8709764,8.8709764 0 0 1 -8.870976,-8.870976 8.8709764,8.8709764 0 0 1 8.870976,-8.870977 8.8709764,8.8709764 0 0 1 8.870977,8.870977 z"
          id="path2998"
-         sodipodi:cx="32.012653"
-         sodipodi:cy="26.587624"
-         sodipodi:rx="8.8709764"
-         sodipodi:ry="8.8709764"
-         d="m 40.88363,26.587624 c 0,4.899305 -3.971672,8.870976 -8.870977,8.870976 -4.899305,0 -8.870976,-3.971671 -8.870976,-8.870976 0,-4.899305 3.971671,-8.870977 8.870976,-8.870977 4.899305,0 8.870977,3.971672 8.870977,8.870977 z"
-         transform="matrix(6.2576679,0,0,6.2576679,19.497793,340.06718)" />
+         style="color:#000000;fill:url(#linearGradient3803);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:1.97132814999999990;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <rect
-         style="color:#000000;fill:url(#linearGradient3021);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33612484;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3942-4-9-9"
-         width="285.73264"
-         height="62.080875"
-         x="-598.25177"
+         transform="matrix(-0.84132761,-0.54052553,0.53359908,-0.84573756,0,0)"
          y="-508.47748"
-         transform="matrix(-0.84132761,-0.54052553,0.53359908,-0.84573756,0,0)" />
+         x="-598.25177"
+         height="62.080875"
+         width="285.73264"
+         id="rect3942-4-9-9"
+         style="color:#000000;fill:url(#linearGradient3021);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33612484;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         style="fill:none;stroke:#34e0e2;stroke-width:12.33591689;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 28.55913,563.39166 248.26361,704.69604 228.35792,736.44701 8.5460597,595.24502 z"
          id="path3810"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="M 28.55913,563.39166 248.26361,704.69604 228.35792,736.44701 8.5460597,595.24502 z"
+         style="fill:none;stroke:#34e0e2;stroke-width:12.33591689;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:2.53456473;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(4.8670752,0,0,4.867075,64.014356,377.03975)"
+         d="m 40.88363,26.587624 a 8.8709764,8.8709764 0 0 1 -8.870977,8.870976 8.8709764,8.8709764 0 0 1 -8.870976,-8.870976 8.8709764,8.8709764 0 0 1 8.870976,-8.870977 8.8709764,8.8709764 0 0 1 8.870977,8.870977 z"
          id="path2998-1"
-         sodipodi:cx="32.012653"
-         sodipodi:cy="26.587624"
-         sodipodi:rx="8.8709764"
-         sodipodi:ry="8.8709764"
-         d="m 40.88363,26.587624 c 0,4.899305 -3.971672,8.870976 -8.870977,8.870976 -4.899305,0 -8.870976,-3.971671 -8.870976,-8.870976 0,-4.899305 3.971671,-8.870977 8.870976,-8.870977 4.899305,0 8.870977,3.971672 8.870977,8.870977 z"
-         transform="matrix(4.8670752,0,0,4.867075,64.014356,377.03975)" />
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:2.53456473;stroke-linecap:butt;stroke-linejoin:round;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>
   <metadata
@@ -171,7 +107,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Near</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Fri Mar 16 18:29:56 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Ortho.svg b/src/Mod/Draft/Resources/icons/Snap_Ortho.svg
index 9ae8b85ef4..dbf9c2ef60 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Ortho.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Ortho.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,266 +6,193 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Ortho.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3801">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3803"
          offset="0"
-         id="stop3803" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3805"
          offset="1"
-         id="stop3805" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
-    <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="perspective2734" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient3850-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-2"
+       xlink:href="#linearGradient3144-7" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-7">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-4"
          offset="0"
-         id="stop3146-4" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-4"
          offset="1"
-         id="stop3148-4" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-5"
-       id="radialGradient3850-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-7"
+       xlink:href="#linearGradient3144-5" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-5">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-6"
          offset="0"
-         id="stop3146-6" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-5"
          offset="1"
-         id="stop3148-5" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3850-70"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-70"
+       xlink:href="#linearGradient3144-3" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-3">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-2"
          offset="0"
-         id="stop3146-2" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-3"
          offset="1"
-         id="stop3148-3" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
-       id="radialGradient3850-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-5"
+       xlink:href="#linearGradient3144-1" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-1">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-5"
          offset="0"
-         id="stop3146-5" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-1"
          offset="1"
-         id="stop3148-1" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9"
-       id="radialGradient3850-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-3"
+       xlink:href="#linearGradient3144-9" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-9">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-9"
          offset="0"
-         id="stop3146-9" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-12"
          offset="1"
-         id="stop3148-12" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-2"
-       id="radialGradient3850-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-6"
+       xlink:href="#linearGradient3144-2" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-2">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-0"
          offset="0"
-         id="stop3146-0" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-2"
          offset="1"
-         id="stop3148-2" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-4"
-       id="radialGradient3850-63"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-63"
+       xlink:href="#linearGradient3144-4" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-4">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-7"
          offset="0"
-         id="stop3146-7" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-13"
          offset="1"
-         id="stop3148-13" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3801"
-       id="linearGradient3807"
-       x1="182.81459"
-       y1="716.1543"
-       x2="145.80684"
-       y2="481.77188"
+       gradientTransform="translate(0,12.335917)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(0,12.335917)" />
+       y2="481.77188"
+       x2="145.80684"
+       y1="716.1543"
+       x1="182.81459"
+       id="linearGradient3807"
+       xlink:href="#linearGradient3801" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="20.613132"
-     inkscape:cy="40.173265"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3013"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid3019"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="16px"
-       spacingy="16px"
-       empcolor="#ff0000"
-       empopacity="0.25098039" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         style="color:#000000;fill:url(#linearGradient3807);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 127.30297,475.60391 0,98.68734 -98.687335,0 0,61.67958 98.687335,0 0,98.68734 61.67958,0 0,-98.68734 98.68734,0 0,-61.67958 -98.68734,0 0,-98.68734 z"
          id="rect6083"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         d="m 127.30297,475.60391 0,98.68734 -98.687335,0 0,61.67958 98.687335,0 0,98.68734 61.67958,0 0,-98.68734 98.68734,0 0,-61.67958 -98.68734,0 0,-98.68734 z"
+         style="color:#000000;fill:url(#linearGradient3807);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 139.63889,487.93983 0,98.68734 -98.687338,0 0,37.00775 98.687338,0 0,98.68733 37.00775,0 0,-98.68733 98.68733,0 0,-37.00776 -98.68733,0 0,-98.68733 z"
          id="rect6083-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccc" />
+         d="m 139.63889,487.93983 0,98.68734 -98.687338,0 0,37.00775 98.687338,0 0,98.68733 37.00775,0 0,-98.68733 98.68733,0 0,-37.00776 -98.68733,0 0,-98.68733 z"
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:round;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>
   <metadata
@@ -278,7 +203,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Ortho</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Parallel.svg b/src/Mod/Draft/Resources/icons/Snap_Parallel.svg
index 2b6d0cd513..115852cfc8 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Parallel.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Parallel.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,176 +6,121 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Parallel.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       id="linearGradient3770"
-       inkscape:collect="always">
-      <stop
-         id="stop3772"
-         offset="0"
-         style="stop-color:#06989a;stop-opacity:1" />
-      <stop
-         id="stop3774"
-         offset="1"
-         style="stop-color:#34e0e2;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3760">
+       id="linearGradient3770">
       <stop
          style="stop-color:#06989a;stop-opacity:1"
          offset="0"
-         id="stop3762" />
+         id="stop3772" />
       <stop
          style="stop-color:#34e0e2;stop-opacity:1"
          offset="1"
-         id="stop3764" />
-    </linearGradient>
-    <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="perspective2734" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-4"
-       id="radialGradient3850-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-4">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-2" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-0" />
+         id="stop3774" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3760"
-       id="linearGradient3766"
-       x1="-556.02374"
-       y1="-418.48642"
-       x2="-411.70007"
-       y2="-306.52237"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3770"
-       id="linearGradient3768"
-       x1="-506.27731"
-       y1="-559.67511"
-       x2="-385.55225"
-       y2="-461.80075"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3770-7"
-       id="linearGradient3768-1"
-       x1="-506.27731"
-       y1="-559.67511"
-       x2="-385.55225"
-       y2="-461.80075"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3770-7"
-       inkscape:collect="always">
+       id="linearGradient3760">
       <stop
-         id="stop3772-4"
+         id="stop3762"
          offset="0"
          style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         id="stop3774-0"
+         id="stop3764"
          offset="1"
          style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
+    <radialGradient
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-9"
+       xlink:href="#linearGradient3144-4" />
+    <linearGradient
+       id="linearGradient3144-4">
+      <stop
+         id="stop3146-2"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop3148-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-306.52237"
+       x2="-411.70007"
+       y1="-418.48642"
+       x1="-556.02374"
+       id="linearGradient3766"
+       xlink:href="#linearGradient3760" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-461.80075"
+       x2="-385.55225"
+       y1="-559.67511"
+       x1="-506.27731"
+       id="linearGradient3768"
+       xlink:href="#linearGradient3770" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-461.80075"
+       x2="-385.55225"
+       y1="-559.67511"
+       x1="-506.27731"
+       id="linearGradient3768-1"
+       xlink:href="#linearGradient3770-7" />
+    <linearGradient
+       id="linearGradient3770-7">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3772-4" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3774-0" />
+    </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="1.1137472"
-     inkscape:cy="34.109279"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2990"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <rect
-         style="color:#000000;fill:url(#linearGradient3766);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33612482999999900;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3942-4-9"
-         width="285.04855"
-         height="60.013901"
-         x="-599.68225"
+         transform="matrix(-0.84132762,-0.54052551,0.53359904,-0.84573759,0,0)"
          y="-383.2905"
-         transform="matrix(-0.84132762,-0.54052551,0.53359904,-0.84573759,0,0)" />
+         x="-599.68225"
+         height="60.013901"
+         width="285.04855"
+         id="rect3942-4-9"
+         style="color:#000000;fill:url(#linearGradient3766);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33612482999999900;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <rect
-         style="color:#000000;fill:url(#linearGradient3768);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33612480000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3942-4-9-9"
-         width="285.73264"
-         height="62.080875"
-         x="-599.61768"
+         transform="matrix(-0.84132761,-0.54052553,0.53359906,-0.84573758,0,0)"
          y="-521.89862"
-         transform="matrix(-0.84132761,-0.54052553,0.53359906,-0.84573758,0,0)" />
+         x="-599.61768"
+         height="62.080875"
+         width="285.73264"
+         id="rect3942-4-9-9"
+         style="color:#000000;fill:url(#linearGradient3768);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33612480000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 10.016071,27.192847 45.636364,50.102273 42.409091,55.25 6.7713892,32.357176 z"
-         id="path3810"
-         inkscape:connector-curvature="0"
          transform="matrix(6.1679584,0,0,6.1679584,-39.231908,407.75637)"
-         sodipodi:nodetypes="ccccc" />
+         id="path3810"
+         d="M 10.016071,27.192847 45.636364,50.102273 42.409091,55.25 6.7713892,32.357176 z"
+         style="fill:none;stroke:#34e0e2;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="M 96.368171,458.10747 316.07266,599.41185 296.16698,631.16282 76.355111,489.96083 z"
          id="path3810-4"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="M 96.368171,458.10747 316.07266,599.41185 296.16698,631.16282 76.355111,489.96083 z"
+         style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
   </g>
   <metadata
@@ -188,7 +131,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Parallel</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg b/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg
index 065aae864c..cb96b0e358 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,116 +6,66 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Perpendicular.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3759">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3761"
          offset="0"
-         id="stop3761" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3763"
          offset="1"
-         id="stop3763" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2734" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3759"
-       id="linearGradient3765"
-       x1="182.81459"
-       y1="728.49023"
-       x2="127.30297"
+       gradientUnits="userSpaceOnUse"
        y2="598.96307"
-       gradientUnits="userSpaceOnUse" />
+       x2="127.30297"
+       y1="728.49023"
+       x1="182.81459"
+       id="linearGradient3765"
+       xlink:href="#linearGradient3759" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2080078"
-     inkscape:cx="25.192271"
-     inkscape:cy="29.223411"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2989"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         style="color:#000000;fill:url(#linearGradient3765);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591652000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 114.96705,475.60391 0,185.03875 -135.695083,0 0,74.01551 357.741593,0 0,-74.01551 -148.03101,0 0,-185.03875 z"
          id="rect3942"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
+         d="m 114.96705,475.60391 0,185.03875 -135.695083,0 0,74.01551 357.741593,0 0,-74.01551 -148.03101,0 0,-185.03875 z"
+         style="color:#000000;fill:url(#linearGradient3765);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591652000000000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 127.30297,487.93983 0,185.03875 -135.6950856,0 0,49.34367 333.0697556,0 0,-49.34367 -148.031,0 0,-185.03875 z"
          id="rect3942-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccc" />
+         d="m 127.30297,487.93983 0,185.03875 -135.6950856,0 0,49.34367 333.0697556,0 0,-49.34367 -148.031,0 0,-185.03875 z"
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:round;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>
   <metadata
@@ -128,7 +76,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Perpendicular</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Mar 12 17:20:03 2012 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Special.svg b/src/Mod/Draft/Resources/icons/Snap_Special.svg
index 5d851f6b84..9aeb411fe7 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Special.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Special.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,199 +6,131 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_Special.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3791">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3793"
          offset="0"
-         id="stop3793" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3795"
          offset="1"
-         id="stop3795" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3783">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3785"
          offset="0"
-         id="stop3785" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3787"
          offset="1"
-         id="stop3787" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4274"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4274"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient4272"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <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="perspective2734" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3011"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3011"
+       xlink:href="#linearGradient3144" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3783"
-       id="linearGradient3789"
-       x1="93.347816"
-       y1="767.216"
-       x2="46.826157"
+       gradientUnits="userSpaceOnUse"
        y2="639.28143"
-       gradientUnits="userSpaceOnUse" />
+       x2="46.826157"
+       y1="767.216"
+       x1="93.347816"
+       id="linearGradient3789"
+       xlink:href="#linearGradient3783" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3791"
-       id="linearGradient3797"
-       x1="182.81459"
-       y1="691.48248"
-       x2="121.13501"
+       gradientUnits="userSpaceOnUse"
        y2="531.11554"
-       gradientUnits="userSpaceOnUse" />
+       x2="121.13501"
+       y1="691.48248"
+       x1="182.81459"
+       id="linearGradient3797"
+       xlink:href="#linearGradient3791" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="10.193662"
-     inkscape:cx="25.411812"
-     inkscape:cy="29.242819"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2994"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <path
-         style="fill:#06989a;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-         d="m 324.67764,438.59616 -74.01551,74.0155 0,197.37467 74.01551,-74.0155 z"
          id="path2996"
-         inkscape:connector-curvature="0" />
+         d="m 324.67764,438.59616 -74.01551,74.0155 0,197.37467 74.01551,-74.0155 z"
+         style="fill:#06989a;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         style="fill:url(#linearGradient3797);stroke:#042a2a;stroke-width:12.33591652000000000;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-         d="m 77.959291,512.61166 0,197.37467 172.702829,0 0,-197.37467 z"
          id="path3766"
-         inkscape:connector-curvature="0" />
+         d="m 77.959291,512.61166 0,197.37467 172.702829,0 0,-197.37467 z"
+         style="fill:url(#linearGradient3797);stroke:#042a2a;stroke-width:12.33591652000000000;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" />
       <path
-         style="fill:#34e0e2;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 77.959291,512.61166 74.015499,-74.0155 172.70284,0 -74.01551,74.0155 z"
          id="path3768"
-         inkscape:connector-curvature="0" />
+         d="m 77.959291,512.61166 74.015499,-74.0155 172.70284,0 -74.01551,74.0155 z"
+         style="fill:#34e0e2;stroke:#042a2a;stroke-width:12.33591652;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
-         style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 90.295211,524.94757 0,172.70284 148.030999,0 0,-172.70284 z"
          id="path3766-3"
-         inkscape:connector-curvature="0" />
+         d="m 90.295211,524.94757 0,172.70284 148.030999,0 0,-172.70284 z"
+         style="fill:none;stroke:#34e0e2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <path
-         style="fill:none;stroke:#16d0d2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 312.34171,468.20236 -49.34367,49.34366 0,162.83411 49.34367,-49.34367 z"
          id="path2996-6"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         d="m 312.34171,468.20236 -49.34367,49.34366 0,162.83411 49.34367,-49.34367 z"
+         style="fill:none;stroke:#16d0d2;stroke-width:12.33591652;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
       <circle
-         style="color:#000000;fill:url(#linearGradient3789);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:11.63041401000000100;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         transform="matrix(1.0606601,0,0,1.0606601,-8.7150832,-42.089462)"
+         r="69.782486"
+         cy="697.43347"
+         cx="70.086983"
          id="path4161"
-         cx="70.086983"
-         cy="697.43347"
-         r="69.782486"
-         d="m 139.86947,697.43347 c 0,38.5398 -31.24268,69.78249 -69.782487,69.78249 -38.539803,0 -69.78248623,-31.24269 -69.78248623,-69.78249 0,-38.5398 31.24268323,-69.78248 69.78248623,-69.78248 38.539807,0 69.782487,31.24268 69.782487,69.78248 z"
-         sodipodi:cx="70.086983"
-         sodipodi:cy="697.43347"
-         sodipodi:rx="69.782486"
-         sodipodi:ry="69.782486"
-         transform="matrix(1.0606601,0,0,1.0606601,-8.7150832,-42.089462)" />
+         style="color:#000000;fill:url(#linearGradient3789);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:11.63041401000000100;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <circle
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:13.95649616;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path4161-1"
-         cx="70.086983"
-         cy="697.43347"
+         transform="matrix(0.88388345,0,0,0.88388358,3.6746616,81.200412)"
          r="69.782486"
-         d="m 139.86947,697.43347 c 0,38.5398 -31.24268,69.78249 -69.782487,69.78249 -38.539803,0 -69.78248623,-31.24269 -69.78248623,-69.78249 0,-38.5398 31.24268323,-69.78248 69.78248623,-69.78248 38.539807,0 69.782487,31.24268 69.782487,69.78248 z"
-         sodipodi:cx="70.086983"
-         sodipodi:cy="697.43347"
-         sodipodi:rx="69.782486"
-         sodipodi:ry="69.782486"
-         transform="matrix(0.88388345,0,0,0.88388358,3.6746616,81.200412)" />
+         cy="697.43347"
+         cx="70.086983"
+         id="path4161-1"
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:13.95649616;stroke-linecap:butt;stroke-linejoin:round;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>
   <metadata
@@ -211,7 +141,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_Special</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Aug 22 13:49:54 2016 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg b/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg
index 9c8f72c8d4..db2d87b251 100644
--- a/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -8,186 +6,124 @@
    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"
+   version="1.1"
    id="svg2726"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Snap_WorkingPlane.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
+   height="64px"
+   width="64px">
   <defs
      id="defs2728">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3773">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3775"
          offset="0"
-         id="stop3775" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3777"
          offset="1"
-         id="stop3777" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3765">
       <stop
-         style="stop-color:#06989a;stop-opacity:1"
+         id="stop3767"
          offset="0"
-         id="stop3767" />
+         style="stop-color:#06989a;stop-opacity:1" />
       <stop
-         style="stop-color:#34e0e2;stop-opacity:1"
+         id="stop3769"
          offset="1"
-         id="stop3769" />
+         style="stop-color:#34e0e2;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146"
          offset="0"
-         id="stop3146" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148"
          offset="1"
-         id="stop3148" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
-    <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="perspective2734" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       r="34.345188"
+       fy="672.79736"
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
        id="radialGradient3850"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       xlink:href="#linearGradient3144" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
-       id="radialGradient3850-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
+       r="34.345188"
        fy="672.79736"
-       r="34.345188" />
+       fx="225.26402"
+       cy="672.79736"
+       cx="225.26402"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3850-4"
+       xlink:href="#linearGradient3144-1" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144-1">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3146-9"
          offset="0"
-         id="stop3146-9" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         id="stop3148-8"
          offset="1"
-         id="stop3148-8" />
+         style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3765"
-       id="linearGradient3771"
-       x1="207.48643"
-       y1="802.50574"
-       x2="133.47093"
+       gradientUnits="userSpaceOnUse"
        y2="457.10004"
-       gradientUnits="userSpaceOnUse" />
+       x2="133.47093"
+       y1="802.50574"
+       x1="207.48643"
+       id="linearGradient3771"
+       xlink:href="#linearGradient3765" />
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3773"
-       id="linearGradient3779"
-       x1="25.81818"
-       y1="49.272728"
-       x2="22.545454"
+       gradientUnits="userSpaceOnUse"
        y2="35.090908"
-       gradientUnits="userSpaceOnUse" />
+       x2="22.545454"
+       y1="49.272728"
+       x1="25.81818"
+       id="linearGradient3779"
+       xlink:href="#linearGradient3773" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.2080078"
-     inkscape:cx="12.200967"
-     inkscape:cy="23.597877"
-     inkscape:current-layer="g4289"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2994"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)"
+       id="g4289">
       <rect
-         style="color:#000000;fill:url(#linearGradient3771);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591556999999900;stroke-linecap:butt;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"
-         id="rect3857"
-         width="357.74158"
-         height="357.74158"
-         x="-20.728033"
+         ry="26.556475"
          y="426.26025"
-         ry="26.556475" />
+         x="-20.728033"
+         height="357.74158"
+         width="357.74158"
+         id="rect3857"
+         style="color:#000000;fill:url(#linearGradient3771);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:12.33591556999999900;stroke-linecap:butt;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
-         sodipodi:type="arc"
-         style="color:#000000;fill:#34e0e2;fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:1.69696950999999996;stroke-linecap:butt;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"
+         transform="matrix(7.2693797,0,0,7.2693798,-83.288751,351.80416)"
+         d="M 32.363636,41.636364 A 7.6363635,7.6363635 0 0 1 24.727272,49.272727 7.6363635,7.6363635 0 0 1 17.090909,41.636364 7.6363635,7.6363635 0 0 1 24.727272,34 a 7.6363635,7.6363635 0 0 1 7.636364,7.636364 z"
          id="path4644"
-         sodipodi:cx="24.727272"
-         sodipodi:cy="41.636364"
-         sodipodi:rx="7.6363635"
-         sodipodi:ry="7.6363635"
-         d="m 32.363636,41.636364 c 0,4.217447 -3.418917,7.636363 -7.636364,7.636363 -4.217447,0 -7.636363,-3.418916 -7.636363,-7.636363 0,-4.217447 3.418916,-7.636364 7.636363,-7.636364 4.217447,0 7.636364,3.418917 7.636364,7.636364 z"
-         transform="matrix(7.2693797,0,0,7.2693798,-83.288751,351.80416)" />
+         style="color:#000000;fill:#34e0e2;fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:1.69696950999999996;stroke-linecap:butt;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" />
       <rect
-         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591557;stroke-linecap:butt;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"
-         id="rect3857-3"
-         width="333.06973"
-         height="333.06973"
-         x="-8.3920927"
+         ry="12.809631"
          y="438.59619"
-         ry="12.809631" />
+         x="-8.3920927"
+         height="333.06973"
+         width="333.06973"
+         id="rect3857-3"
+         style="color:#000000;fill:none;stroke:#34e0e2;stroke-width:12.33591557;stroke-linecap:butt;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
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient3779);stroke:#34e0e2;stroke-width:2.18181801000000020;stroke-linecap:butt;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;fill-opacity:1"
+         transform="matrix(5.653962,0,0,5.653962,-43.343878,419.06429)"
+         d="M 32.363636,41.636364 A 7.6363635,7.6363635 0 0 1 24.727272,49.272727 7.6363635,7.6363635 0 0 1 17.090909,41.636364 7.6363635,7.6363635 0 0 1 24.727272,34 a 7.6363635,7.6363635 0 0 1 7.636364,7.636364 z"
          id="path4644-6"
-         sodipodi:cx="24.727272"
-         sodipodi:cy="41.636364"
-         sodipodi:rx="7.6363635"
-         sodipodi:ry="7.6363635"
-         d="m 32.363636,41.636364 c 0,4.217447 -3.418917,7.636363 -7.636364,7.636363 -4.217447,0 -7.636363,-3.418916 -7.636363,-7.636363 0,-4.217447 3.418916,-7.636364 7.636363,-7.636364 4.217447,0 7.636364,3.418917 7.636364,7.636364 z"
-         transform="matrix(5.653962,0,0,5.653962,-43.343878,419.06429)" />
+         style="color:#000000;fill:url(#linearGradient3779);stroke:#34e0e2;stroke-width:2.18181801000000020;stroke-linecap:butt;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;fill-opacity:1" />
     </g>
   </g>
   <metadata
@@ -198,7 +134,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Snap_WorkingPlane</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
         <dc:date>Fri Mar 7 15:58:51 2014 -0300</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/preferences-draft.svg b/src/Mod/Draft/Resources/icons/preferences-draft.svg
index c4aec2650b..34c9fe0f6b 100644
--- a/src/Mod/Draft/Resources/icons/preferences-draft.svg
+++ b/src/Mod/Draft/Resources/icons/preferences-draft.svg
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
 <svg
    xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -9,312 +7,237 @@
    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="svg2980"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="preferences-draft.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/yorik/Draft_Workbench_Idea16.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   id="svg2980"
+   height="64px"
+   width="64px">
   <defs
      id="defs2982">
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3890">
       <stop
-         style="stop-color:#c4a000;stop-opacity:1"
+         id="stop3892"
          offset="0"
-         id="stop3892" />
+         style="stop-color:#c4a000;stop-opacity:1" />
       <stop
-         style="stop-color:#fce94f;stop-opacity:1"
+         id="stop3894"
          offset="1"
-         id="stop3894" />
+         style="stop-color:#fce94f;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3829">
       <stop
-         style="stop-color:#8f5902;stop-opacity:1"
+         id="stop3831"
          offset="0"
-         id="stop3831" />
+         style="stop-color:#8f5902;stop-opacity:1" />
       <stop
-         style="stop-color:#e9b96e;stop-opacity:1"
+         id="stop3833"
          offset="1"
-         id="stop3833" />
+         style="stop-color:#e9b96e;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3803">
       <stop
-         style="stop-color:#d3d7cf;stop-opacity:1"
+         id="stop3805"
          offset="0"
-         id="stop3805" />
+         style="stop-color:#d3d7cf;stop-opacity:1" />
       <stop
-         style="stop-color:#eeeeec;stop-opacity:1"
+         id="stop3807"
          offset="1"
-         id="stop3807" />
+         style="stop-color:#eeeeec;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        id="linearGradient3855">
       <stop
-         style="stop-color:#e9b96e;stop-opacity:1"
+         id="stop3857"
          offset="0"
-         id="stop3857" />
+         style="stop-color:#e9b96e;stop-opacity:1" />
       <stop
-         style="stop-color:#8f5902;stop-opacity:1"
+         id="stop3859"
          offset="1"
-         id="stop3859" />
+         style="stop-color:#8f5902;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       id="linearGradient3786"
-       osb:paint="solid">
+       osb:paint="solid"
+       id="linearGradient3786">
       <stop
-         style="stop-color:#a0eb07;stop-opacity:1;"
+         id="stop3788"
          offset="0"
-         id="stop3788" />
+         style="stop-color:#a0eb07;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3864">
       <stop
-         id="stop3866"
+         style="stop-color:#71b2f8;stop-opacity:1;"
          offset="0"
-         style="stop-color:#71b2f8;stop-opacity:1;" />
+         id="stop3866" />
       <stop
-         id="stop3868"
+         style="stop-color:#002795;stop-opacity:1;"
          offset="1"
-         style="stop-color:#002795;stop-opacity:1;" />
+         id="stop3868" />
     </linearGradient>
-    <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="perspective2988" />
     <linearGradient
        id="linearGradient3377">
       <stop
-         style="stop-color:#ffaa00;stop-opacity:1;"
+         id="stop3379"
          offset="0"
-         id="stop3379" />
+         style="stop-color:#ffaa00;stop-opacity:1;" />
       <stop
-         style="stop-color:#faff2b;stop-opacity:1;"
+         id="stop3381"
          offset="1"
-         id="stop3381" />
+         style="stop-color:#faff2b;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3855"
-       id="linearGradient3863"
-       x1="5.1754909"
-       y1="28.663757"
-       x2="9.3772163"
-       y2="63.578461"
+       gradientTransform="matrix(0.95198975,0,0,0.91651928,0.07298588,1.7291139)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95198975,0,0,0.91651928,0.07298588,1.7291139)" />
+       y2="63.578461"
+       x2="9.3772163"
+       y1="28.663757"
+       x1="5.1754909"
+       id="linearGradient3863"
+       xlink:href="#linearGradient3855" />
     <linearGradient
-       gradientTransform="translate(63.406413,58.258077)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3855-2"
-       id="linearGradient3861-4"
-       x1="3.9825215"
-       y1="31.552309"
-       x2="60.769054"
+       gradientUnits="userSpaceOnUse"
        y2="51.094166"
-       gradientUnits="userSpaceOnUse" />
+       x2="60.769054"
+       y1="31.552309"
+       x1="3.9825215"
+       id="linearGradient3861-4"
+       xlink:href="#linearGradient3855-2"
+       gradientTransform="translate(63.406413,58.258077)" />
     <linearGradient
        id="linearGradient3855-2">
       <stop
-         style="stop-color:#d07200;stop-opacity:1;"
+         id="stop3857-1"
          offset="0"
-         id="stop3857-1" />
+         style="stop-color:#d07200;stop-opacity:1;" />
       <stop
-         style="stop-color:#fcb200;stop-opacity:1;"
+         id="stop3859-6"
          offset="1"
-         id="stop3859-6" />
+         style="stop-color:#fcb200;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3855-2"
-       id="linearGradient3863-2"
-       x1="3.9825215"
-       y1="31.552309"
-       x2="23.852976"
+       gradientUnits="userSpaceOnUse"
        y2="45.686504"
-       gradientUnits="userSpaceOnUse" />
+       x2="23.852976"
+       y1="31.552309"
+       x1="3.9825215"
+       id="linearGradient3863-2"
+       xlink:href="#linearGradient3855-2" />
     <linearGradient
        id="linearGradient3880">
       <stop
-         style="stop-color:#d07200;stop-opacity:1;"
+         id="stop3882"
          offset="0"
-         id="stop3882" />
+         style="stop-color:#d07200;stop-opacity:1;" />
       <stop
-         style="stop-color:#fcb200;stop-opacity:1;"
+         id="stop3884"
          offset="1"
-         id="stop3884" />
+         style="stop-color:#fcb200;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
-       gradientTransform="translate(63.406413,58.258077)"
+       xlink:href="#linearGradient3855-2"
+       id="linearGradient3889"
+       gradientUnits="userSpaceOnUse"
+       x1="3.9825215"
+       y1="31.552309"
+       x2="23.852976"
+       y2="45.686504"
+       gradientTransform="translate(63.406413,58.258077)" />
+    <linearGradient
        y2="45.686504"
        x2="23.852976"
        y1="31.552309"
        x1="3.9825215"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3889"
-       xlink:href="#linearGradient3855-2"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3855-2"
-       id="linearGradient3921"
-       gradientUnits="userSpaceOnUse"
        gradientTransform="translate(63.406413,58.258077)"
-       x1="3.9825215"
-       y1="31.552309"
-       x2="23.852976"
-       y2="45.686504" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3803"
-       id="linearGradient3809"
-       x1="40"
-       y1="59"
-       x2="26"
-       y2="5"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3829"
-       id="linearGradient3835"
-       x1="21"
-       y1="52"
-       x2="19"
-       y2="41"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3855-5"
-       id="linearGradient3863-7"
-       x1="5.1754909"
-       y1="28.663757"
-       x2="9.3772163"
-       y2="63.578461"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95198975,0,0,0.91651928,0.07298588,1.7291139)" />
+       id="linearGradient3921"
+       xlink:href="#linearGradient3855-2" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="5"
+       x2="26"
+       y1="59"
+       x1="40"
+       id="linearGradient3809"
+       xlink:href="#linearGradient3803" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="41"
+       x2="19"
+       y1="52"
+       x1="21"
+       id="linearGradient3835"
+       xlink:href="#linearGradient3829" />
+    <linearGradient
+       gradientTransform="matrix(0.95198975,0,0,0.91651928,0.07298588,1.7291139)"
+       gradientUnits="userSpaceOnUse"
+       y2="63.578461"
+       x2="9.3772163"
+       y1="28.663757"
+       x1="5.1754909"
+       id="linearGradient3863-7"
+       xlink:href="#linearGradient3855-5" />
     <linearGradient
        id="linearGradient3855-5">
       <stop
-         style="stop-color:#e9b96e;stop-opacity:1"
+         id="stop3857-3"
          offset="0"
-         id="stop3857-3" />
+         style="stop-color:#e9b96e;stop-opacity:1" />
       <stop
-         style="stop-color:#8f5902;stop-opacity:1"
+         id="stop3859-5"
          offset="1"
-         id="stop3859-5" />
+         style="stop-color:#8f5902;stop-opacity:1" />
     </linearGradient>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3890"
-       id="linearGradient3896"
-       x1="37"
-       y1="38"
-       x2="32"
+       gradientUnits="userSpaceOnUse"
        y2="14"
-       gradientUnits="userSpaceOnUse" />
+       x2="32"
+       y1="38"
+       x1="37"
+       id="linearGradient3896"
+       xlink:href="#linearGradient3890" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.4464324"
-     inkscape:cx="5.2728449"
-     inkscape:cy="31.89271"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="true"
-     inkscape:object-paths="true"
-     inkscape:object-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3013"
-       units="px"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px" />
-  </sodipodi:namedview>
   <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <rect
-       style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3783"
-       width="48"
-       height="58"
+       y="3"
        x="13"
-       y="3" />
+       height="58"
+       width="48"
+       id="rect3783"
+       style="fill:url(#linearGradient3809);fill-opacity:1;stroke:#2e3436;stroke-width:1.99999988000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:url(#linearGradient3863);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 7,27 -4,4 0,24 4,4 4,0 0,-32 z"
        id="path3010"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       d="m 7,27 -4,4 0,24 4,4 4,0 0,-32 z"
+       style="fill:url(#linearGradient3863);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <rect
-       style="fill:none;stroke:#ffffff;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3783-3"
-       width="44"
-       height="54"
+       y="5"
        x="15"
-       y="5" />
+       height="54"
+       width="44"
+       id="rect3783-3"
+       style="fill:none;stroke:#ffffff;stroke-width:1.99999975999999990;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:url(#linearGradient3896);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 27,5 0,32 24,0 z m 6,18 6,8 -6,0 z"
        id="path3782"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       d="m 27,5 0,32 24,0 z m 6,18 6,8 -6,0 z"
+       style="fill:url(#linearGradient3896);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 8,29 5,31.85285 5,54.171675 7.8160622,57 9,57 9,29 z"
        id="path3010-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc" />
+       d="M 8,29 5,31.85285 5,54.171675 7.8160622,57 9,57 9,29 z"
+       style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:url(#linearGradient3835);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 57,39 55,45 5,50 5,39 z"
        id="path3012"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 57,39 55,45 5,50 5,39 z"
+       style="fill:url(#linearGradient3835);fill-opacity:1;stroke:#271903;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 54.220725,41 53.465976,43.178411 6.9877375,47.816062 7,41 z"
        id="path3012-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
+       d="M 54.220725,41 53.465976,43.178411 6.9877375,47.816062 7,41 z"
+       style="fill:none;stroke:#e9b96e;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <path
-       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 29,11 0,24 18,0 z"
        id="path3782-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
+       d="m 29,11 0,24 18,0 z"
+       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
   </g>
   <metadata
      id="metadata6104">
@@ -324,7 +247,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>preferences-draft</dc:title>
+        <dc:title></dc:title>
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>