diff --git a/src/Mod/Draft/Resources/icons/DraftWorkbench.svg b/src/Mod/Draft/Resources/icons/DraftWorkbench.svg
index 7757564109..fec61efa9e 100644
--- a/src/Mod/Draft/Resources/icons/DraftWorkbench.svg
+++ b/src/Mod/Draft/Resources/icons/DraftWorkbench.svg
@@ -15,8 +15,8 @@
    height="64px"
    id="svg2980"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Draft_Workbench_Idea2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="DraftWorkbench.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/yorik/Draft_Workbench_Idea16.png"
@@ -24,14 +24,50 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs2982">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3890">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3892" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3894" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3829">
+      <stop
+         style="stop-color:#8f5902;stop-opacity:1"
+         offset="0"
+         id="stop3831" />
+      <stop
+         style="stop-color:#e9b96e;stop-opacity:1"
+         offset="1"
+         id="stop3833" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3855">
       <stop
-         style="stop-color:#d07200;stop-opacity:1;"
+         style="stop-color:#e9b96e;stop-opacity:1"
          offset="0"
          id="stop3857" />
       <stop
-         style="stop-color:#fcb200;stop-opacity:1;"
+         style="stop-color:#8f5902;stop-opacity:1"
          offset="1"
          id="stop3859" />
     </linearGradient>
@@ -72,24 +108,14 @@
          offset="1"
          id="stop3381" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3855"
-       id="linearGradient3861"
-       x1="3.9825215"
-       y1="31.552309"
-       x2="60.769054"
-       y2="51.094166"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95198975,0,0,0.91651928,0.07298588,1.7291139)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3855"
        id="linearGradient3863"
-       x1="3.9825215"
-       y1="31.552309"
-       x2="23.852976"
-       y2="45.686504"
+       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
@@ -153,6 +179,54 @@
        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)" />
+    <linearGradient
+       id="linearGradient3855-5">
+      <stop
+         style="stop-color:#e9b96e;stop-opacity:1"
+         offset="0"
+         id="stop3857-3" />
+      <stop
+         style="stop-color:#8f5902;stop-opacity:1"
+         offset="1"
+         id="stop3859-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3890"
+       id="linearGradient3896"
+       x1="37"
+       y1="38"
+       x2="32"
+       y2="14"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -161,21 +235,32 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="40.657951"
-     inkscape:cy="30.318818"
+     inkscape:zoom="14.416016"
+     inkscape:cx="30.182323"
+     inkscape:cy="39.646866"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1057"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
+     inkscape:snap-nodes="true"
      inkscape:object-paths="true"
-     inkscape:object-nodes="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>
   <metadata
      id="metadata2985">
     <rdf:RDF>
@@ -184,7 +269,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -193,43 +278,54 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none"
-       id="rect3924"
-       width="50.65456"
-       height="62.482525"
-       x="12.856487"
-       y="0.48895457" />
+       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"
+       x="13"
+       y="3" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 12.856487,0.48895457 0,62.48252643"
-       id="path3926"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.63876654;fill:#000000;fill-opacity:1;stroke:none"
-       d="m 30.471844,5.6253174 0.535494,33.0519766 22.609757,0 L 30.471844,5.6253174 z M 34.964045,20.375549 44.75169,33.69372 35.321041,33.92285 34.964045,20.375549 z m -24.573235,9.451605 -4.8491983,3.207818 0.2974968,23.829501 4.5517015,4.095696 6.098684,-0.200488 0.08925,-9.566171 44.59477,-2.921405 1.636233,-7.246231 -46.141754,-0.343694 0.118999,-10.855026 -6.396181,0 z"
-       id="path3010-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient3863);fill-opacity:1;stroke:#000000;stroke-width:1.16431034;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 6.7484353,28.04146 1.8898368,31.242417 2.1934992,55.07178 6.7484353,59.161894 12.821683,58.984063 13.125346,28.04146 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"
+       d="m 7,27 -4,4 0,24 4,4 4,0 0,-32 z"
        id="path3010"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccc" />
+    <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"
+       x="15"
+       y="5" />
     <path
-       style="fill:url(#linearGradient3861);fill-opacity:1;stroke:#000000;stroke-width:1.16431034;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 59.162002,39.234097 -1.641628,7.255521 -54.2816054,3.546854 0,-11.205391 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"
+       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" />
+    <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" />
+    <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" />
     <path
-       style="fill:#ffe400;fill-opacity:1;stroke:#000000;stroke-width:1.16431034;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 26.808896,3.8396874 0.555024,33.0451956 22.60454,0 L 26.808896,3.8396874 z m 4.490635,14.7446996 9.788573,13.322381 -9.435378,0.237054 -0.353195,-13.559435 z"
-       id="path3782"
-       inkscape:connector-curvature="0" />
+       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" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 12.856487,62.971481 50.65456,0"
-       id="path3928"
-       inkscape:connector-curvature="0" />
+       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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_2DShapeView.svg b/src/Mod/Draft/Resources/icons/Draft_2DShapeView.svg
index e4db28526b..5680c42944 100644
--- a/src/Mod/Draft/Resources/icons/Draft_2DShapeView.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_2DShapeView.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2766"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_2DShapeView.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -111,16 +111,6 @@
          offset="1"
          style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.50621,-0.84060003,0,0.942977,-950.29462,487.41335)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4018"
-       xlink:href="#linearGradient3864-0-2"
-       inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3864-0-9"
@@ -142,26 +132,6 @@
          offset="1"
          style="stop-color:#379cfb;stop-opacity:1;" />
     </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"
-       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"
@@ -295,20 +265,46 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11"
-     inkscape:cx="22.350392"
-     inkscape:cy="24.250573"
+     inkscape:zoom="5.3671877"
+     inkscape:cx="33.122014"
+     inkscape:cy="46.539806"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:snap-global="true"
-     inkscape:snap-nodes="false" />
+     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>
   <metadata
      id="metadata2771">
     <rdf:RDF>
@@ -326,33 +322,40 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.5375;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.54887104;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 31.000746,4.7643156 5.7923067,18.958657 l -0.030593,0 0,0.03053 0,20.696267 15.4799403,4.853545 -14.3480077,8.089249 28.6042367,8.974488 25.269626,-14.224868 -15.326977,-4.792499 14.133859,-8.028198 0,-20.757318 -25.024884,14.224868 0,11.141796 -0.152963,-0.06105 0,-11.172321 25.239032,-14.224868 -28.63483,-8.9439614 z m 3.395798,36.9968664 0.152963,0.06105 0,6.929282 7.892934,-4.487244 11.900587,3.724107 -19.242851,10.836541 -21.78205,-6.807179 11.349917,-6.410349 9.7285,3.052547 0,-6.898755 z"
-       id="rect3200-5-3-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.54887104;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 29.52506,35.447597 c 0,0 -14.897059,8.191241 -25.2307764,14.233059 13.0299194,4.132727 28.6007924,8.958281 28.6007924,8.958281 0,0 14.577666,-8.086755 25.275119,-14.233059 C 48.958557,41.168665 29.52506,35.447597 29.52506,35.447597 z m 0.39908,2.769995 c 0,0 14.75602,4.630815 21.816419,6.807115 -5.757783,3.1763 -19.244564,10.844235 -19.244564,10.844235 0,0 -8.176448,-2.545115 -11.805127,-3.679634 C 17.062189,51.054789 15.109965,50.539067 10.723919,49.061827 19.519691,44.493678 29.92414,38.217592 29.92414,38.217592 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"
+       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="cccccccczcc" />
+       sodipodi:nodetypes="cccccccccc" />
     <path
-       style="color:#000000;fill:url(#linearGradient4073);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.54887104;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 3.1769624,15.991113 c 0,0 22.7878346,7.339948 28.6370706,8.957252 0.121963,5.253667 0.09091,7.139507 0.09091,10.59709 0,3.457582 -0.09091,10.148404 -0.09091,10.148404 L 3.1769624,36.736609 c 0,0 -10e-8,-7.279027 -10e-8,-10.73661 0,-3.457582 10e-8,-10.008886 10e-8,-10.008886 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"
+       d="M 5,15 33,23 33,45 5,37 z"
        id="rect3200"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczcczc" />
+       sodipodi:nodetypes="ccccc" />
     <path
-       style="color:#000000;fill:url(#linearGradient4018);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.54887104;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 31.965164,25.047414 c 8.153345,-4.586281 25.025187,-14.198428 25.025187,-14.198428 0,0 0,7.87525 0,11.332832 0,3.457583 0.02098,5.458573 0,9.412663 -7.475526,4.044999 -25.025187,14.198427 -25.025187,14.198427 0,0 -0.06244,-11.795577 0,-20.745494 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"
+       d="M 33,23 59,11 59,31 33,45 z"
        id="rect3200-8"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczccc" />
+       sodipodi:nodetypes="ccccc" />
     <path
-       style="color:#000000;fill:url(#linearGradient4054);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.54887104;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 28.406709,1.7962416 C 47.462088,7.8720049 57.043782,10.753493 57.043782,10.753493 L 31.791902,24.983874 3.1548291,16.026623 c 0,0 10.2066939,-5.388219 14.4153409,-7.7599487 4.208646,-2.3717302 5.326614,-3.1825596 10.836539,-6.4704327 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"
+       d="M 32,3 59,11 33,23 5,15 z"
        id="rect3200-5"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccczc" />
+       sodipodi:nodetypes="ccccc" />
+    <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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_AddPoint.svg b/src/Mod/Draft/Resources/icons/Draft_AddPoint.svg
index d6f4aa685b..58d3238efd 100644
--- a/src/Mod/Draft/Resources/icons/Draft_AddPoint.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_AddPoint.svg
@@ -14,10 +14,21 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Draft_AddToGroup.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_AddPoint.svg">
   <defs
      id="defs3614">
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -312,17 +323,6 @@
        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"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
@@ -334,6 +334,25 @@
          style="stop-color:#ffffff;stop-opacity:0"
          offset="1" />
     </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"
+       x2="54.509644"
+       y2="485.54004" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -342,18 +361,44 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="10.43673"
+     inkscape:cx="33.703508"
+     inkscape:cy="14.311257"
+     inkscape:current-layer="g3906"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -362,7 +407,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -374,38 +419,64 @@
        transform="translate(-127.44439,-128.22016)"
        id="g5199">
       <path
-         id="rect4341"
-         d="m 160.64794,173.18772 a 7.2818681,7.2818681 0 0 0 -5.09375,2.53125 7.2818681,7.2818681 0 0 0 -1.53125,2.9375 l -20.8125,-0.0312 -0.0312,4.5 21.1875,0.0625 a 7.2818681,7.2818681 0 0 0 12.25,2 7.2818681,7.2818681 0 0 0 1.21875,-2 l 21.15625,0.0625 0,-4.5 -20.84375,-0.0312 a 7.2818681,7.2818681 0 0 0 -7.5,-5.53125 z"
-         style="opacity:0.45;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86954105;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="color:#000000;fill:#0048ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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 155.46875,138.09375 0,8.21875 -8.1875,0 0,7.0625 8.1875,0 0,8.21875 7.09375,0 0,-8.21875 8.21875,0 0,-7.0625 -8.21875,0 0,-8.21875 -7.09375,0 z"
-         id="rect3558" />
-      <rect
-         width="4.4976301"
-         height="55.796196"
-         x="173.75768"
-         y="-187.33788"
-         transform="matrix(-0.00297684,0.99999557,-0.99999726,-0.00234044,0,0)"
-         id="rect4246"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.50000012;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" />
+         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" />
       <g
-         transform="matrix(0.99988228,0.01534357,-0.01534357,0.99988228,23.720711,-51.580163)"
-         id="g4312">
+         id="g3912"
+         transform="translate(0,-21)">
         <g
-           id="g4248"
-           transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)">
+           transform="translate(0,31)"
+           id="g3856">
+          <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"
+             y="37"
+             transform="translate(127.44439,128.22016)" />
           <path
-             style="fill:#0048ff;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path4250"
-             d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-          <path
-             style="fill:url(#radialGradient4317);fill-opacity:1;stroke:none"
-             id="path4252"
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             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" />
+             style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 59,41 5,41"
+             id="path3854"
+             inkscape:connector-curvature="0"
+             transform="translate(127.44439,128.22016)" />
+        </g>
+        <g
+           style="stroke:#3465a4;stroke-width:0.8096711"
+           id="g4312"
+           transform="matrix(1.2349522,0.01894995,-0.0189508,1.2348959,-7.1881028,-111.34439)">
+          <g
+             style="stroke:#3465a4;stroke-width:0.8096711"
+             transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
+             id="g4248">
+            <g
+               transform="translate(-3.7314339,-3.2817175)"
+               id="g3906"
+               style="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-opacity:1;stroke-dasharray:none"
+                 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" />
+              <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"
+                 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" />
+            </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"
+         id="path3826"
+         inkscape:connector-curvature="0"
+         transform="translate(127.44439,128.22016)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_AddToGroup.svg b/src/Mod/Draft/Resources/icons/Draft_AddToGroup.svg
index 7954224e94..84ef97728a 100644
--- a/src/Mod/Draft/Resources/icons/Draft_AddToGroup.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_AddToGroup.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Draft_Macro.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_AddToGroup.svg">
   <defs
      id="defs3614">
     <inkscape:perspective
@@ -323,18 +323,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="9.9023037"
+     inkscape:cx="40.332248"
+     inkscape:cy="34.440545"
+     inkscape:current-layer="g4670"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -343,7 +354,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -353,58 +364,97 @@
      inkscape:groupmode="layer">
     <g
        transform="translate(-259.85207,-132.78349)"
-       id="g4670">
+       id="g4670"
+       style="fill:none;stroke:#2e3436">
       <path
-         id="rect4258-7"
-         d="m 269.68304,141.37054 0,9.625 32.125,0 0,-9.625 -32.125,0 z m 14,14 0,9.625 32.125,0 0,-9.625 -32.125,0 z m -4,14 0,9.625 32.125,0 0,-9.625 -32.125,0 z m 4,14 0,9.625 32.125,0 0,-9.625 -32.125,0 z"
-         style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         ry="0"
-         rx="0"
-         y="179.57144"
-         x="280.71429"
-         height="9.6428576"
-         width="32.142857"
-         id="rect4258"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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.57144"
-         x="280.71429"
-         height="9.6428576"
-         width="32.142857"
-         id="rect4258-1-7"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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="165.57144"
-         x="276.71429"
-         height="9.6428576"
-         width="32.142857"
-         id="rect4258-1"
-         style="color:#000000;fill:#0042ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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="137.57144"
-         x="266.71429"
-         height="9.6428576"
-         width="32.142857"
-         id="rect4258-1-7-4"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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" />
+         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" />
+      <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 271.07143,207.42857 0,37.14286 9.28571,0"
-         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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
-         transform="translate(0,-60)"
          id="path5100"
-         d="m 280.89286,216.71429 -9.64286,0"
-         style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         d="m 282.85207,155.78349 -12,0"
+         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" />
+      <rect
+         ry="0"
+         rx="0"
+         y="135.78349"
+         x="262.85208"
+         height="10"
+         width="37.999989"
+         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"
+         width="37.999989"
+         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:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3852"
+         width="34"
+         height="6"
+         x="278.85208"
+         y="169.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"
+         width="34"
+         height="6"
+         x="284.85208"
+         y="153.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-3"
+         width="34"
+         height="6"
+         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"
+         x="284.85208"
+         y="185.78349" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Apply.svg b/src/Mod/Draft/Resources/icons/Draft_Apply.svg
index 50f0714d5e..4c8b070340 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Apply.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Apply.svg
@@ -14,12 +14,23 @@
    height="64px"
    id="svg3188"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Apply.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs3190">
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3354">
       <stop
@@ -50,14 +61,34 @@
        id="perspective3196" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3354"
-       id="linearGradient2996"
+       xlink:href="#linearGradient3354-6"
+       id="linearGradient2996-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.15768287,0,0,0.15089213,-359.6514,-139.05703)"
-       x1="2392.2313"
+       gradientTransform="matrix(0.15768287,0,0,0.15089213,-357.22613,-145.08225)"
+       x1="2392.2312"
        y1="1162.2943"
        x2="2638.95"
        y2="1162.2943" />
+    <linearGradient
+       id="linearGradient3354-6">
+      <stop
+         style="stop-color:#2157c7;stop-opacity:1;"
+         offset="0"
+         id="stop3356-0" />
+      <stop
+         style="stop-color:#6daaff;stop-opacity:1;"
+         offset="1"
+         id="stop3358-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895"
+       id="linearGradient3909"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -66,18 +97,30 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.4909881"
-     inkscape:cx="27.73103"
-     inkscape:cy="10.858425"
+     inkscape:zoom="8.7607439"
+     inkscape:cx="19.860669"
+     inkscape:cy="35.997749"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="777"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata3193">
     <rdf:RDF>
@@ -93,69 +136,113 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#000000;fill-opacity:0.56310676;fill-rule:evenodd;stroke:none;stroke-width:13.11065483;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 7.3791994,8.0102698 0,52.7612572 19.8791076,0 0,-11.221985 12.883976,0 0,8.265171 11.981041,-13.11714 -11.981041,-13.112171 0,8.354487 -12.883976,0 0,-31.9296192 -19.8791076,0 z"
-       id="rect2392" />
     <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.08138323;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"
+       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="19.876713"
-       height="52.761696"
-       x="11.379407"
-       y="3.9055312"
+       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" />
     <rect
-       style="fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:12.60000038;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3335"
-       width="15.19513"
-       height="10.886064"
-       x="13.606785"
-       y="6.3597236"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <rect
-       style="fill:#ffff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:12.60000038;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3337"
-       width="15.19513"
-       height="10.886064"
-       x="13.606785"
-       y="18.425112"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <rect
-       style="fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:12.60000038;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3339"
-       width="15.19513"
-       height="10.886064"
-       x="13.606785"
-       y="30.80801"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-       inkscape:export-xdpi="4.1683898"
-       inkscape:export-ydpi="4.1683898" />
-    <rect
-       style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:12.60000038;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       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="15.19513"
-       height="10.886064"
-       x="13.606785"
-       y="43.190907"
+       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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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"
+       x="9"
+       y="9"
        inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
        inkscape:export-xdpi="4.1683898"
        inkscape:export-ydpi="4.1683898" />
     <path
        inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient2996);fill-opacity:1;fill-rule:evenodd;stroke:#000842;stroke-width:2.78860092;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 43.654661,18.832553 0,8.192669 -25.079926,0 0,18.79758 25.079926,0 0,7.992728 16.992596,-17.491499 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"
+       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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Arc.svg b/src/Mod/Draft/Resources/icons/Draft_Arc.svg
index e82a17d19c..28cd01a1cd 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Arc.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Arc.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,9 +14,10 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="arc.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Arc.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2871">
     <radialGradient
@@ -52,17 +54,6 @@
          offset="1"
          id="stop3148" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       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"
@@ -70,6 +61,66 @@
        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;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3801-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -78,17 +129,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.75"
-     inkscape:cx="-17.719022"
-     inkscape:cy="42.724203"
+     inkscape:zoom="7.3798828"
+     inkscape:cx="-3.6759641"
+     inkscape:cy="46.086666"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="722"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="25" />
+     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>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -109,95 +174,76 @@
        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)">
-      <path
-         id="path3354"
-         d="M -364.50944,453.1287 C -388.94448,453.8134 -408.85422,473.59105 -409.41567,498.30258 C -409.99521,523.81124 -389.75044,544.97867 -364.24179,545.55822 C -346.64282,545.95805 -331.09624,536.46434 -322.96374,522.15344 C -223.83656,538.85517 -145.15711,611.99129 -125.07893,705.34708 C -138.31267,713.78829 -146.91186,728.76112 -146.46143,745.58426 C -145.77851,771.09035 -124.53347,791.23286 -99.02736,790.54997 C -73.52127,789.86705 -53.378727,768.59224 -54.061654,743.08616 C -54.686016,719.76694 -72.49928,700.95504 -95.04231,698.41784 C -117.29957,592.82585 -205.97228,510.13099 -317.58094,491.84917 C -321.10618,470.32745 -339.54117,453.64191 -362.1303,453.1287 C -362.92745,453.11059 -363.72121,453.10661 -364.50944,453.1287 z M -369.3272,698.12045 C -394.83329,698.80337 -414.97585,720.07816 -414.29291,745.58426 C -413.60999,771.09035 -392.36492,791.23286 -366.85884,790.54997 C -341.35275,789.86705 -321.21022,768.59224 -321.89313,743.08616 C -322.57605,717.58007 -343.82109,697.43754 -369.3272,698.12045 z"
-         style="opacity:1;fill:#000000;fill-opacity:0.5098038;fill-rule:evenodd;stroke:none;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       transform="matrix(0.146567,0,0,0.146567,96.1836,-71.115448)">
       <g
          id="g3389">
         <path
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M -412,442.9375 L -412,474.96875 C -270.19202,475.99572 -155.4375,585.65879 -155.4375,720.65625 C -155.4375,720.81122 -155.43724,720.94582 -155.4375,721.09375 L -123.4375,721.40625 C -123.42736,720.43743 -123.4375,719.62509 -123.4375,718.65625 C -123.4375,566.46198 -252.7086,442.93751 -412,442.9375 z"
-           id="path2380" />
-        <g
-           id="g2331"
-           transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,-201.41759,1361.9423)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2333"
-             style="fill:#ffa900;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2335"
-             style="fill:url(#radialGradient2370);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g2337"
-           transform="matrix(-0.999742,-2.2713514e-2,2.2713514e-2,-0.999742,-228.67433,1114.3337)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2339"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2341"
-             style="fill:url(#radialGradient2368);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g2372"
-           transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,80.010973,1361.9423)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2374"
-             style="fill:#ffa900;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2376"
-             style="fill:url(#radialGradient2378);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
+           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" />
+        <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" />
+      </g>
+    </g>
+    <g
+       id="g3827"
+       transform="translate(2,-2)">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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" />
+        <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"
+           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" />
+      </g>
+    </g>
+    <g
+       transform="translate(40,-2)"
+       id="g3827-0">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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" />
+        <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"
+           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" />
+      </g>
+    </g>
+    <g
+       transform="translate(2.005735,-40)"
+       id="g3827-1">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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
+           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"
+           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>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Array.svg b/src/Mod/Draft/Resources/icons/Draft_Array.svg
index 40f2b87e16..e406d1deb7 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Array.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Array.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Draft_Array_Ortho.svg"
+   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"
@@ -23,6 +23,18 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs5823">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient6349">
@@ -74,6 +86,192 @@
        r="194.40614"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791"
+       id="linearGradient3797"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791-6"
+       id="linearGradient3797-3"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791-6">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793-7" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795-5" />
+    </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" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791-6-7"
+       id="linearGradient3797-3-2"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791-6-7">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793-7-0" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795-5-9" />
+    </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"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791-0">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793-6" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795-2" />
+    </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" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791-6-9"
+       id="linearGradient3797-3-28"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791-6-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793-7-7" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795-5-3" />
+    </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"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791-2">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793-9" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795-3" />
+    </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"
+       xlink:href="#linearGradient3791-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -82,19 +280,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.640625"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="5.5570959"
+     inkscape:cx="64.548324"
+     inkscape:cy="28.471943"
      inkscape:current-layer="g3360"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     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>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -103,7 +313,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -118,112 +328,189 @@
        inkscape:export-ydpi="3.2478156"
        transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
       <g
-         id="g3812"
-         transform="translate(20.242162,38.749281)">
-        <rect
-           style="opacity:0.47300002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:12.42814541;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="rect3810"
-           width="58.413097"
-           height="119.7056"
-           x="922.5777"
-           y="1026.4845" />
-        <rect
-           y="1007.9772"
-           x="901.7572"
-           height="119.7056"
-           width="58.413097"
-           id="rect3808"
-           style="fill:#2e76ff;fill-opacity:1;fill-rule:nonzero;stroke:#000343;stroke-width:12.70681;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         id="g3799">
+        <g
+           id="g3956">
+          <g
+             id="g3812"
+             transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+          <g
+             id="g3812-0"
+             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">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+        </g>
       </g>
       <g
-         id="g3834"
-         transform="translate(304.21078,245.79768)">
-        <rect
-           style="opacity:0.47300002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:12.42814541;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="rect3836"
-           width="58.413097"
-           height="119.7056"
-           x="922.5777"
-           y="1026.4845" />
-        <rect
-           y="1007.9772"
-           x="901.7572"
-           height="119.7056"
-           width="58.413097"
-           id="rect3838"
-           style="fill:#2e76ff;fill-opacity:1;fill-rule:nonzero;stroke:#000343;stroke-width:12.70681;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         transform="translate(-2.5969387e-5,219.32018)"
+         id="g3799-3">
+        <g
+           id="g3956-5">
+          <g
+             id="g3812-6"
+             transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+          <g
+             id="g3812-0-9"
+             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">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+        </g>
       </g>
       <g
-         id="g3840"
-         transform="translate(156.73217,245.79767)">
-        <rect
-           y="1026.4845"
-           x="922.5777"
-           height="119.7056"
-           width="58.413097"
-           id="rect3842"
-           style="opacity:0.47300002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:12.42814541;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <rect
-           style="fill:#2e76ff;fill-opacity:1;fill-rule:nonzero;stroke:#000343;stroke-width:12.70681;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           id="rect3844"
-           width="58.413097"
-           height="119.7056"
-           x="901.7572"
-           y="1007.9772" />
+         transform="translate(146.21345,-3.0142166e-5)"
+         id="g3799-6">
+        <g
+           id="g3956-1">
+          <g
+             id="g3812-8"
+             transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+          <g
+             id="g3812-0-92"
+             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">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+        </g>
       </g>
       <g
-         id="g3852"
-         transform="translate(303.05409,43.376061)">
-        <rect
-           y="1026.4845"
-           x="922.5777"
-           height="119.7056"
-           width="58.413097"
-           id="rect3854"
-           style="opacity:0.47300002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:12.42814541;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <rect
-           style="fill:#2e76ff;fill-opacity:1;fill-rule:nonzero;stroke:#000343;stroke-width:12.70681;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           id="rect3856"
-           width="58.413097"
-           height="119.7056"
-           x="901.7572"
-           y="1007.9772" />
+         transform="translate(146.21345,219.32019)"
+         id="g3799-3-2">
+        <g
+           id="g3956-5-3">
+          <g
+             id="g3812-6-7"
+             transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+          <g
+             id="g3812-0-9-9"
+             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">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+        </g>
       </g>
       <g
-         id="g3858"
-         transform="translate(156.73217,37.592586)">
-        <rect
-           style="opacity:0.47300002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:12.42814541;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="rect3860"
-           width="58.413097"
-           height="119.7056"
-           x="922.5777"
-           y="1026.4845" />
-        <rect
-           y="1007.9772"
-           x="901.7572"
-           height="119.7056"
-           width="58.413097"
-           id="rect3862"
-           style="fill:#2e76ff;fill-opacity:1;fill-rule:nonzero;stroke:#000343;stroke-width:12.70681;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         transform="translate(292.42692,-3.1029367e-7)"
+         id="g3799-4">
+        <g
+           id="g3956-7">
+          <g
+             id="g3812-84"
+             transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+          <g
+             id="g3812-0-0"
+             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">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+        </g>
       </g>
       <g
-         id="g3864"
-         transform="translate(19.663814,244.06265)">
-        <rect
-           y="1026.4845"
-           x="922.5777"
-           height="119.7056"
-           width="58.413097"
-           id="rect3866"
-           style="opacity:0.47300002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:12.42814541;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        <rect
-           style="fill:#2e76ff;fill-opacity:1;fill-rule:nonzero;stroke:#000343;stroke-width:12.70681;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-           id="rect3868"
-           width="58.413097"
-           height="119.7056"
-           x="901.7572"
-           y="1007.9772" />
+         transform="translate(292.42692,219.32021)"
+         id="g3799-3-6">
+        <g
+           id="g3956-5-1">
+          <g
+             id="g3812-6-0"
+             transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:9.12373734;stroke-opacity:1">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+          <g
+             id="g3812-0-9-3"
+             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">
+            <rect
+               y="983.79187"
+               x="887.41589"
+               height="119.7056"
+               width="58.413097"
+               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" />
+          </g>
+        </g>
       </g>
     </g>
   </g>
diff --git a/src/Mod/Draft/Resources/icons/Draft_BSpline.svg b/src/Mod/Draft/Resources/icons/Draft_BSpline.svg
index 5169b569ff..03b866b905 100644
--- a/src/Mod/Draft/Resources/icons/Draft_BSpline.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_BSpline.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Draft_Polygon.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_BSpline.svg">
   <defs
      id="defs3614">
     <inkscape:perspective
@@ -150,6 +150,66 @@
        id="radialGradient3723"
        xlink:href="#linearGradient3144-6"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-0"
+       id="linearGradient3801-1-4"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-9" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-5"
+       id="linearGradient3801-1-5"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-5">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-1" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-7" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -158,18 +218,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="11"
+     inkscape:cx="6.8925751"
+     inkscape:cy="32.220353"
+     inkscape:current-layer="Draft_bspline"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
-     inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -178,7 +248,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -189,44 +259,94 @@
     <g
        id="Draft_bspline"
        transform="matrix(0.89711225,0.52065392,-0.5123597,0.91163494,32.103176,-164.6499)">
-      <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;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.125;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans"
-         id="path3714-5"
-         d="m 87.995536,143.14286 c -3.657847,0.22312 -6.630477,3.19696 -6.78125,6.9375 -0.02561,0.63543 0.0571,1.25045 0.1875,1.84375 -3.043863,3.42456 -4.639005,7.46636 -4.90625,11.78125 -0.262293,4.23493 0.652077,8.69681 2.25,13.25 -1.184839,1.25215 -1.953995,2.92222 -2,4.78125 -0.09879,3.99193 3.070571,7.30746 7.0625,7.40625 3.991929,0.0988 7.307462,-3.07057 7.40625,-7.0625 0.09879,-3.99193 -3.070571,-7.30746 -7.0625,-7.40625 -0.523009,-0.0129 -1.037156,0.0629 -1.53125,0.15625 -1.297649,-3.91649 -1.950976,-7.59882 -1.75,-10.84375 0.188407,-3.04199 1.06266,-5.72351 2.875,-8.125 1.191634,1.02277 2.715333,1.65059 4.40625,1.71875 3.989912,0.16082 7.370426,-2.91634 7.53125,-6.90625 0.02404,-0.59642 -0.04233,-1.19013 -0.15625,-1.75 2.71926,-0.21194 5.219744,0.63367 7.875004,2.3125 3.27009,2.06758 6.58423,5.60936 9.9375,10 -1.05608,1.09401 -1.77326,2.53014 -1.96875,4.15625 -0.47662,3.96461 2.34789,7.55463 6.3125,8.03125 3.96461,0.47662 7.55463,-2.34789 8.03125,-6.3125 0.47662,-3.96461 -2.34789,-7.55463 -6.3125,-8.03125 -0.72218,-0.0868 -1.44368,-0.0569 -2.125,0.0625 -3.63798,-4.87823 -7.37911,-8.96849 -11.53125,-11.59375 -2.8122,-1.77806 -5.883914,-2.83189 -9.093754,-2.90625 -1.133859,-0.0263 -2.275265,0.0909 -3.4375,0.3125 -1.200429,-1.05453 -2.747844,-1.74313 -4.46875,-1.8125 -0.249369,-0.0101 -0.506144,-0.0149 -0.75,0 z" />
-      <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;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.44031096;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 92.34375,143.78125 c -3.209842,-0.0744 -6.557574,0.81178 -9.90625,2.84375 -6.629838,4.02297 -9.8555,9.84923 -10.25,16.21875 -0.3945,6.36952 1.763491,13.22001 5.125,20.1875 L 81.25,181.125 c -3.18611,-6.60394 -5.007286,-12.83679 -4.6875,-18 0.319786,-5.16321 2.524184,-9.33248 8.15625,-12.75 5.564553,-3.37656 9.761295,-2.9171 14.375,0 4.6137,2.9171 9.33431,8.67148 14.09375,15.78125 l 3.625,-2.4375 c -4.88342,-7.29499 -9.75061,-13.47513 -15.375,-17.03125 -2.812195,-1.77806 -5.883908,-2.83189 -9.09375,-2.90625 z" />
-      <path
-         style="fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.56920195;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="path2182-6"
-         transform="matrix(-0.14881232,-0.00368264,0.00368264,-0.14881232,106.58095,279.27452)"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
       <path
          style="fill:url(#radialGradient3684);fill-opacity:1;stroke:none"
          id="path2184-8"
          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" />
-      <path
-         style="fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.56920195;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="path2188-2"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,109.52765,248.13491)"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
       <path
          style="fill:url(#radialGradient3686);fill-opacity:1;stroke:none"
          id="path2190-1"
          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" />
-      <path
-         style="fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.56920195;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="path2198-5"
-         transform="matrix(-0.14779373,-0.0177675,0.0177675,-0.14779373,131.71039,265.71589)"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
       <path
          style="fill:url(#radialGradient3723);fill-opacity:1;stroke:none"
          id="path2200-1"
          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" />
+      <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" />
+      <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" />
+      <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" />
+      <g
+         transform="matrix(0.84052566,-0.48004191,0.47239466,0.82713577,49.655706,110.56669)"
+         id="g3827-1-8">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-8">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             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
+             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"
+             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" />
+        </g>
+      </g>
+      <g
+         transform="matrix(0.84052566,-0.48004191,0.47239466,0.82713577,80.846586,130.04856)"
+         id="g3827-1-1">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-1">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             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" />
+          <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"
+             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" />
+        </g>
+      </g>
+    </g>
+    <g
+       transform="translate(-2.6307677e-7,-10.005445)"
+       id="g3827-1">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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
+           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"
+           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>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_BezCurve.svg b/src/Mod/Draft/Resources/icons/Draft_BezCurve.svg
index cc7f1f57c4..01546160b6 100644
--- a/src/Mod/Draft/Resources/icons/Draft_BezCurve.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_BezCurve.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_BezCurve.svg">
   <defs
      id="defs3614">
@@ -150,17 +150,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient3963"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.15321571,-0.01345818,0.00925118,-0.10875824,48.809063,132.88917)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144-6-1"
@@ -183,28 +172,6 @@
          style="stop-color:#ffffff;stop-opacity:0"
          offset="1" />
     </linearGradient>
-    <radialGradient
-       r="34.345188"
-       fy="672.79736"
-       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="radialGradient4001"
-       xlink:href="#linearGradient3144-6-1"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-6"
-       id="radialGradient4026"
-       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"
-       fy="672.79736"
-       r="34.345188" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144-6-4"
@@ -238,6 +205,46 @@
        fx="286.94281"
        fy="835.12842"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -246,19 +253,32 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="-2"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="10.43673"
+     inkscape:cx="20.245635"
+     inkscape:cy="22.952369"
+     inkscape:current-layer="g4117"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="694"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="25"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-page="true" />
+     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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -267,7 +287,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -275,89 +295,126 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       inkscape:connector-curvature="0"
-       d="M 15.257021,56.223041 A 5.2825044,3.7487827 5.1800622 1 1 25.781466,57.147489 5.2825044,3.7487827 5.1800622 0 1 15.257021,56.223041 z"
-       id="path2200-1"
-       style="fill:url(#radialGradient3963);fill-opacity:1;stroke:none" />
     <g
        id="g4117">
       <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;opacity:0.5;color:#000000;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.5;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-9"
-         d="m 44.148624,18.721424 c -2.841469,-1.739043 -6.298803,-2.67418 -10.344041,-2.565266 -8.008916,0.215628 -13.887838,3.847597 -17.505234,9.448876 -3.617397,5.601279 -5.191351,12.969992 -5.745562,21.071982 l 4.509066,0.312271 c 0.525294,-7.679244 2.084956,-14.30953 5.017261,-18.849995 2.932304,-4.540464 7.046063,-7.193588 13.849658,-7.376762 6.722041,-0.180983 10.251581,2.422927 12.895988,7.4844 2.644402,5.061472 3.931007,12.76517 4.557999,21.724706 l 4.500909,-0.33474 C 55.241351,40.443956 54.04139,32.275803 50.817693,26.105559 49.205845,23.020437 46.990114,20.46043 44.148624,18.721424 z"
-         inkscape:connector-curvature="0" />
+         inkscape:connector-curvature="0"
+         id="path4034-3"
+         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" />
       <path
          inkscape:connector-curvature="0"
-         d="M 7.7504786,43.744356 A 7.4696566,7.5905773 0 1 1 20.53589,51.597088 7.4696566,7.5905773 0 1 1 7.7504786,43.744356 z"
-         id="path2182-6-9-2"
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.86337566;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"
-         d="M 47.425861,43.527533 A 7.4696569,7.5905776 0 0 1 60.211272,51.380265 7.4696569,7.5905776 0 1 1 47.425861,43.527533 z"
-         id="path2182-6-9-2-8"
-         style="opacity:0.5;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.86337566;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="4.999999"
-         x="12.90909"
-         height="7.818182"
-         width="8.363636"
-         id="rect3190"
-         style="color:#000000;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.86299998;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="4.999999"
-         x="44"
-         height="7.818182"
-         width="8.363636"
-         id="rect3190-2"
-         style="color:#000000;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.86299998;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
-         id="g3166-4"
-         transform="translate(41.740915,4.3123332)">
-        <g
-           id="g4040">
-          <path
-             inkscape:connector-curvature="0"
-             d="M 43.096349,17.414338 C 40.25488,15.675295 36.797546,14.740158 32.752308,14.849072 24.743392,15.0647 18.86447,18.696669 15.247074,24.297948 11.629677,29.899227 10.055723,37.26794 9.5015123,45.36993 l 4.5090657,0.312271 c 0.525294,-7.679244 2.084956,-14.30953 5.017261,-18.849995 2.932304,-4.540464 7.046063,-7.193588 13.849658,-7.376762 6.722041,-0.180983 10.251581,2.422927 12.895988,7.4844 2.644402,5.061472 3.931007,12.76517 4.557999,21.724706 l 4.500909,-0.33474 C 54.189076,39.13687 52.989115,30.968717 49.765418,24.798473 48.15357,21.713351 45.937839,19.153344 43.096349,17.414338 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:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.50000000000000000;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)" />
-          <g
-             id="g3166"
-             transform="translate(-40.650006,0)">
-            <path
-               style="fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.86337566;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="path2182-6"
-               d="M 4.411834,37.943119 A 7.4696566,7.5905773 0 1 1 17.197245,45.795851 7.4696566,7.5905773 0 1 1 4.411834,37.943119 z"
-               inkscape:connector-curvature="0" />
-            <path
-               style="fill:url(#radialGradient4026);fill-opacity:1;stroke:none"
-               id="path2184-8"
-               d="M 5.4246987,39.383758 A 3.7492461,5.2818517 89.478542 1 1 15.987991,39.290607 3.7492461,5.2818517 89.478542 0 1 5.4246987,39.383758 z"
-               inkscape:connector-curvature="0" />
-          </g>
-          <path
-             style="fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.86337566;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="path2182-6-9"
-             d="M 4.411834,37.943119 A 7.4696566,7.5905773 0 1 1 17.197245,45.795851 7.4696566,7.5905773 0 1 1 4.411834,37.943119 z"
-             inkscape:connector-curvature="0" />
-        </g>
-        <path
-           inkscape:connector-curvature="0"
-           d="M 5.4246987,39.383758 A 3.7492461,5.2818517 89.478542 1 1 15.987991,39.290607 3.7492461,5.2818517 89.478542 0 1 5.4246987,39.383758 z"
-           id="path2184-8-4"
-           style="fill:url(#radialGradient4001);fill-opacity:1;stroke:none" />
-      </g>
+         id="path4030-9"
+         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" />
       <path
          inkscape:connector-curvature="0"
          id="path4030"
-         d="M 12,38.181818 C 17.090909,12.545455 17.090909,12.545455 17.090909,12.545455"
-         style="fill:none;stroke:#000000;stroke-width:1px;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" />
+      <rect
+         y="5"
+         x="7"
+         height="10"
+         width="10"
+         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 51.454545,38.363636 C 48.181818,12.909091 48.181818,12.909091 48.181818,12.909091 l 0,0"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         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" />
+      <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"
+         id="path3915"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
+    <g
+       id="g3057"
+       transform="translate(33.327866,-1.429711)">
+      <g
+         id="g3827-1"
+         transform="translate(-33.322131,1.429711)">
+        <g
+           id="g3797-9"
+           transform="translate(31.322131,40.570289)">
+          <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" />
+          <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" />
+        </g>
+      </g>
+    </g>
+    <g
+       transform="translate(73.327866,-1.429711)"
+       id="g3057-3">
+      <g
+         id="g3827-1-5"
+         transform="translate(-33.322131,1.429711)">
+        <g
+           id="g3797-9-6"
+           transform="translate(31.322131,40.570289)">
+          <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" />
+          <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" />
+        </g>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_BezSharpNode.svg b/src/Mod/Draft/Resources/icons/Draft_BezSharpNode.svg
index c61d1ee2f9..fe181475f7 100644
--- a/src/Mod/Draft/Resources/icons/Draft_BezSharpNode.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_BezSharpNode.svg
@@ -8,10 +8,47 @@
    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">
+   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="9.895752"
+     inkscape:cx="27.577515"
+     inkscape:cy="34.873449"
+     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>
   <defs
      id="defs3614">
     <linearGradient
@@ -255,6 +292,109 @@
          style="stop-color:#ffffff;stop-opacity:0"
          offset="1" />
     </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"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </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
+       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"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
+       id="linearGradient3836-6">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838-0" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840-6" />
+    </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="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" />
   </defs>
   <metadata
      id="metadata3617">
@@ -264,41 +404,91 @@
         <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">
     <path
-       d="M 7.090909,5.8181818 C 15.272728,20 -3.7471829,48.338335 31.636364,48.363637 61.272846,26.482175 48.000001,19.757576 56.181819,5.4545454 l 0,0"
+       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" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7,51 24,0"
+       id="path3994"
+       inkscape:connector-curvature="0" />
+    <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" />
+    <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:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       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" />
+  </g>
+  <g
+     id="g3900"
+     transform="translate(52.020267,18.050833)">
     <path
-       d="M 6,48 31.560197,48.181818 61.382433,24.261076"
-       id="path3082"
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       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" />
+    <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" />
+  </g>
+  <g
+     id="g3900-2"
+     transform="matrix(0.45224439,0,0,0.45224439,39.150796,0.35891479)">
     <g
-       transform="matrix(-0.11387155,-0.09751677,0.09751677,-0.11387155,-9.9749576,141.51281)"
-       id="g4248">
+       id="g3946"
+       transform="translate(-53.068536,84.0255)">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         id="path4250"
-         style="fill:#0048ff;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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"
+         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" />
       <path
-         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.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         id="path4252"
-         style="fill:url(#radialGradient4317);fill-opacity:1;stroke:none" />
+         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"
+         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" />
+    </g>
+    <g
+       transform="translate(57.491155,48.646399)"
+       id="g3946-0">
+      <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"
+         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" />
+      <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"
+         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" />
     </g>
-    <path
-       d="m -28.545455,43.545456 a 1.727273,1.727273 0 1 1 -3.454546,0 1.727273,1.727273 0 1 1 3.454546,0 z"
-       transform="translate(36.727273,4.3636364)"
-       id="path3084"
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;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
-       d="m 62.574703,24.99591 a 1.727273,1.727273 0 0 1 -3.454546,0 1.727273,1.727273 0 1 1 3.454546,0 z"
-       id="path3084-5"
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;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>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_BezSymNode.svg b/src/Mod/Draft/Resources/icons/Draft_BezSymNode.svg
index bc114d239b..c090fe7282 100644
--- a/src/Mod/Draft/Resources/icons/Draft_BezSymNode.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_BezSymNode.svg
@@ -8,10 +8,47 @@
    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">
+   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="9.895752"
+     inkscape:cx="35.318888"
+     inkscape:cy="27.300347"
+     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>
   <defs
      id="defs3614">
     <linearGradient
@@ -255,6 +292,99 @@
          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" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </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" />
+    <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
+       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="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)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3967-6"
+       xlink:href="#linearGradient3836-6-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-6-7-2">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838-0-9-9" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840-6-2-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" />
   </defs>
   <metadata
      id="metadata3617">
@@ -264,42 +394,83 @@
         <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">
     <path
-       d="M 7.090909,5.8181818 C 15.272728,20 15.211538,48.485302 31.636364,48.363637 48.06119,48.241972 48.000001,19.757576 56.181819,5.4545454 l 0,0"
+       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:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       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" />
     <path
-       d="m 6,48 49.272727,0.363636"
+       d="m 7,51 48,0"
        id="path3082"
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <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" />
+    <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" />
+    <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" />
     <g
-       transform="matrix(-0.11387155,-0.09751677,0.09751677,-0.11387155,-9.9749576,141.51281)"
-       id="g4248">
+       id="g3900"
+       transform="translate(49.026002,22.050833)">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         id="path4250"
-         style="fill:#0048ff;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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" />
       <path
-         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.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         id="path4252"
-         style="fill:url(#radialGradient4317);fill-opacity:1;stroke:none" />
+         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" />
+    </g>
+    <g
+       transform="matrix(0.45224439,0,0,0.45224439,63.150848,38.358769)"
+       id="g3946-0">
+      <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"
+         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" />
+      <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"
+         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" />
+    </g>
+    <g
+       transform="matrix(0.45224439,0,0,0.45224439,15.150848,38.358769)"
+       id="g3946-0-7">
+      <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"
+         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" />
+      <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"
+         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" />
     </g>
-    <path
-       d="m -28.545455,43.545456 a 1.7272727,1.7272727 0 1 1 -3.454546,0 1.7272727,1.7272727 0 1 1 3.454546,0 z"
-       transform="translate(36.727273,4.3636364)"
-       id="path3084"
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;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
-       d="m -28.545455,43.545456 a 1.7272727,1.7272727 0 1 1 -3.454546,0 1.7272727,1.7272727 0 1 1 3.454546,0 z"
-       transform="translate(85.909091,4.8181804)"
-       id="path3084-5"
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;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>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_BezTanNode.svg b/src/Mod/Draft/Resources/icons/Draft_BezTanNode.svg
index 28004ccffe..b7c6b81544 100644
--- a/src/Mod/Draft/Resources/icons/Draft_BezTanNode.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_BezTanNode.svg
@@ -14,8 +14,8 @@
    width="64"
    height="64"
    id="svg3612"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Draft_BezSymNode.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_BezTanNode.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -25,17 +25,30 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="640"
-     inkscape:window-height="480"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      id="namedview67"
-     showgrid="false"
-     inkscape:zoom="3.6875"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:window-x="459"
-     inkscape:window-y="186"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3612" />
+     showgrid="true"
+     inkscape:zoom="9.895752"
+     inkscape:cx="29.546148"
+     inkscape:cy="34.587634"
+     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>
   <defs
      id="defs3614">
     <linearGradient
@@ -279,6 +292,69 @@
          style="stop-color:#ffffff;stop-opacity:0"
          offset="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" />
+    <linearGradient
+       id="linearGradient3836-6-7-2">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838-0-9-9" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840-6-2-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
+       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="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" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata3617">
@@ -288,44 +364,83 @@
         <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">
     <path
-       d="M 7.090909,5.8181818 C 15.272728,20 15.211538,48.485302 31.636364,48.363637 48.06119,48.241972 48.000001,19.757576 56.181819,5.4545454 l 0,0"
+       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:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="m 6,48 39.510015,0.363636"
-       id="path3082"
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       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="cc" />
-    <g
-       transform="matrix(-0.11387155,-0.09751677,0.09751677,-0.11387155,-9.9749576,141.51281)"
-       id="g4248">
-      <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         id="path4250"
-         style="fill:#0048ff;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         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.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         id="path4252"
-         style="fill:url(#radialGradient4317);fill-opacity:1;stroke:none" />
-    </g>
+       sodipodi:nodetypes="csc" />
     <path
-       d="m -28.545455,43.545456 a 1.7272727,1.7272727 0 1 1 -3.454546,0 1.7272727,1.7272727 0 1 1 3.454546,0 z"
-       transform="translate(36.727273,4.3636364)"
-       id="path3084"
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;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 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" />
     <path
-       d="m 47.363636,48.363636 a 1.727273,1.727273 0 0 1 -3.454546,0 1.727273,1.727273 0 1 1 3.454546,0 z"
-       id="path3084-5"
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5;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 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" />
+  </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" />
+  <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" />
+  <g
+     id="g3900"
+     transform="translate(49.020267,20.045388)">
+    <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" />
+    <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" />
   </g>
+  <g
+     transform="matrix(0.45224439,0,0,0.45224439,55.150848,36.358976)"
+     id="g3946-0">
+    <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"
+       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" />
+    <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"
+       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" />
+  </g>
+  <g
+     transform="matrix(0.45224439,0,0,0.45224439,15.145113,36.353324)"
+     id="g3946-0-7">
+    <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"
+       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" />
+    <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"
+       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" />
+  </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Circle.svg b/src/Mod/Draft/Resources/icons/Draft_Circle.svg
old mode 100755
new mode 100644
index 2099d41035..249f030d13
--- a/src/Mod/Draft/Resources/icons/Draft_Circle.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Circle.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,45 +14,36 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="circle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Circle.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <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"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144">
+       id="linearGradient3892">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop3146" />
+         id="stop3894" />
       <stop
          style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop3148" />
+         id="stop3896" />
     </linearGradient>
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       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" />
+       id="linearGradient3850">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3852" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3854" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -59,6 +51,85 @@
        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"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7"
+       id="linearGradient3801-1-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3850"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3850-5"
+       id="linearGradient3856-5"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3850-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3852-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3854-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3892"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -67,17 +138,41 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.9445436"
-     inkscape:cx="10.984022"
-     inkscape:cy="-31.562193"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="11"
+     inkscape:cx="26.904776"
+     inkscape:cy="36.640853"
+     inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="722"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -99,67 +194,83 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         id="path4439"
-         d="M 1721.8125,442.99554 C 1622.0272,442.99554 1541.0312,523.99156 1541.0312,623.77679 C 1541.0312,723.56204 1622.0272,804.55804 1721.8125,804.55804 C 1802.506,804.55804 1870.9028,751.59593 1894.125,678.55804 C 1916.9058,674.06315 1933.8217,653.70619 1933.2188,629.71429 C 1932.6743,608.05112 1918.0084,590.03072 1898.25,584.27679 C 1880.2263,503.14655 1808.0056,442.99554 1721.8125,442.99554 z M 1720.375,478.71429 C 1788.2519,478.71428 1845.3515,525.20371 1861.125,588.46429 C 1845.8363,596.96884 1835.6553,613.46065 1836.125,632.15179 C 1836.5349,648.46005 1844.9346,662.68654 1857.5,671.18304 C 1837.8457,728.00851 1783.854,768.83929 1720.375,768.83929 C 1640.3041,768.8393 1575.3125,703.84775 1575.3125,623.77679 C 1575.3125,543.70584 1640.3041,478.71429 1720.375,478.71429 z M 1716.9688,577.77679 C 1716.1403,577.76727 1715.3372,577.80645 1714.5,577.83929 C 1687.7092,578.89022 1666.7929,601.48597 1667.8438,628.27679 C 1668.8947,655.06761 1691.4904,675.95272 1718.2812,674.90179 C 1745.0721,673.85086 1765.9884,651.25514 1764.9375,624.46429 C 1763.9194,598.51068 1742.652,578.07198 1716.9688,577.77679 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
          id="g4428">
         <path
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 1705.7188,410.15625 C 1605.9335,410.15625 1524.9375,491.15227 1524.9375,590.9375 C 1524.9375,690.72275 1605.9335,771.71875 1705.7188,771.71875 C 1805.504,771.71875 1886.4999,690.72276 1886.5,590.9375 L 1886.4062,585.96875 C 1883.7139,487.96518 1803.7592,410.15625 1705.7188,410.15625 z M 1704.2812,445.875 C 1782.9522,445.87499 1847.1208,508.29622 1849.2812,586.9375 L 1849.3438,590.9375 C 1849.3438,671.00848 1784.3522,736 1704.2812,736 C 1624.2103,736.00001 1559.2188,671.00846 1559.2188,590.9375 C 1559.2188,510.86655 1624.2103,445.875 1704.2812,445.875 z"
-           id="path4425" />
+           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"
+           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(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <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"
+           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(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <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"
+           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(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+        <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"
+           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 a 24.813021,24.813021 0 1 1 -49.6260411,0 24.813021,24.813021 0 1 1 49.6260411,0 z"
+           transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
         <g
-           id="g3177"
-           transform="matrix(-0.9996843,2.5125272e-2,-2.5125272e-2,-0.9996843,2082.1146,1248.1357)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-           inkscape:export-xdpi="7.2934141"
-           inkscape:export-ydpi="7.2934141">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3179"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3181"
-             style="fill:url(#radialGradient3183);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+           transform="matrix(6.8476923,0,0,6.8476923,1781.1444,248.54544)"
+           id="g3827-1-9">
+          <g
+             transform="translate(31.322131,40.570289)"
+             id="g3797-9-4">
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               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" />
+            <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"
+               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" />
+          </g>
         </g>
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1630.4952,248.54544)"
+         id="g3827-1">
         <g
-           id="g3185"
-           transform="matrix(-0.9992315,3.9197078e-2,-3.9197078e-2,-0.9992315,1922.9598,1240.4934)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-           inkscape:export-xdpi="7.2934141"
-           inkscape:export-ydpi="7.2934141">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9">
           <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3187"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             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
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3189"
-             style="fill:url(#radialGradient3191);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+             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"
+             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>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Clone.svg b/src/Mod/Draft/Resources/icons/Draft_Clone.svg
index 2084513660..a71f963d05 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Clone.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Clone.svg
@@ -2,6 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -14,10 +15,33 @@
    height="64px"
    id="svg2985"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Clone.svg">
   <defs
      id="defs2987">
+    <linearGradient
+       id="linearGradient3797">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3799" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3801" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3789"
+       osb:paint="gradient">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3791" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3793" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3860">
       <stop
@@ -29,16 +53,6 @@
          offset="1"
          id="stop3864" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3860"
-       id="linearGradient3866"
-       x1="31.125395"
-       y1="61.410763"
-       x2="30.113636"
-       y2="12.160761"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.96889279,-1.5,1.0452469)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3860-6"
@@ -59,6 +73,15 @@
          offset="1"
          id="stop3864-4" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3797"
+       id="linearGradient3823"
+       x1="42"
+       y1="56"
+       x2="26"
+       y2="9"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -67,18 +90,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="25.44072"
-     inkscape:cy="-19.592108"
+     inkscape:zoom="11.111342"
+     inkscape:cx="40.300131"
+     inkscape:cy="35.601111"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="755"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3001"
+       units="px"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2990">
     <rdf:RDF>
@@ -95,75 +131,76 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       id="path3004-1-3"
-       style="opacity:0.51666667;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1.968647;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 31.33503,59.177196 c 0,0 2,-0.176162 -4,2.466272 -6,2.642435 -10.318182,-1.321216 -12.5,-2.994759 C 12.718215,57.025026 11.198666,53.275758 11.153212,50.36908 8.971394,50.016755 6.425939,44.731885 7.5168481,42.08945 8.607757,39.447016 12.062303,38.213879 13.698667,32.929011 15.33503,27.64414 14.971394,18.659862 15.33503,17.250564 15.698667,15.841265 17.516849,5.4476874 34.75,5.4476874 c 17.233152,10e-7 19.051334,10.3935786 19.414971,11.8028776 0.363636,1.409298 0,10.393576 1.636363,15.678447 1.636364,5.284868 5.090909,6.518005 6.181818,9.160439 1.09091,2.642435 -1.454545,7.927305 -3.636363,8.27963 -0.04545,2.906678 -1.565003,6.655946 -3.681818,8.279629 -2.181818,1.673543 -6.5,5.637194 -12.5,2.994759 -6,-2.642434 -4,-2.466272 -4,-2.466272 z"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csscssscssscsscc" />
     <path
        id="path3004-1"
-       style="fill:url(#linearGradient3866);fill-opacity:1;stroke:#000000;stroke-width:1.968647;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 27.954545,56.184055 c 0,0 2,-0.176162 -4,2.466272 -6,2.642435 -10.318182,-1.321216 -12.5,-2.99476 C 9.33773,54.031884 7.8181813,50.282617 7.7727273,47.375939 5.5909091,47.023613 3.0454545,41.738744 4.1363636,39.096309 5.2272727,36.453875 8.681818,35.220738 10.318182,29.935868 c 1.636363,-5.28487 1.272727,-14.269148 1.636363,-15.678446 0.363637,-1.4093 2.181819,-11.8028765 19.41497,-11.8028762 17.233152,2e-7 19.051334,10.3935772 19.414971,11.8028772 0.363636,1.409298 0,10.393576 1.636363,15.678446 1.636364,5.28487 5.090909,6.518007 6.181818,9.160441 1.09091,2.642435 -1.454545,7.927304 -3.636363,8.27963 -0.04545,2.906678 -1.565003,6.655945 -3.681818,8.279628 -2.181818,1.673544 -6.5,5.637195 -12.5,2.99476 -6,-2.642434 -4,-2.466272 -4,-2.466272 z"
+       style="fill:url(#linearGradient3823);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 28.418868,57.607176 c 0,0 2.109204,-0.179091 -4.218407,2.507272 C 17.872849,62.800812 13.318886,58.771267 11.017936,57.069902 8.7855386,55.419226 7.1830196,51.607628 7.1350838,48.652628 4.834134,48.294445 2.1496927,42.921718 3.3001675,40.235353 4.4506424,37.54899 8.0938125,36.295352 9.8195255,30.922624 11.545237,25.549895 11.161746,16.416258 11.545237,14.983531 11.928728,13.550802 13.846187,2.984437 32.020301,2.9844373 c 18.174117,2e-7 20.091575,10.5663657 20.475068,11.9990947 0.38349,1.432727 0,10.566364 1.725711,15.939093 1.725713,5.372728 5.368882,6.626366 6.519357,9.312729 1.150476,2.686365 -1.533965,8.059092 -3.834915,8.417275 -0.04794,2.955 -1.650455,6.766598 -3.882853,8.417274 -2.300949,1.701365 -6.854913,5.73091 -13.182524,3.044546 -6.327612,-2.686363 -4.218408,-2.507272 -4.218408,-2.507272 z"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="csscssscssscsscc" />
     <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.9843235px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="M 14.570609,23.068836 27.55566,22.570573 c 0,0 -0.514259,2.740444 -3.728381,4.608927 -3.214121,1.868484 -6.299678,1.743918 -6.299678,1.743918 0,0 -0.77139,-0.249131 -1.928473,-2.615877 -1.157084,-2.366746 -1.028519,-3.238705 -1.028519,-3.238705 z"
-       id="path3794"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.9843235px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="M 47.55141,23.068836 34.566359,22.570573 c 0,0 0.514259,2.740444 3.728381,4.608927 3.214121,1.868484 6.299678,1.743918 6.299678,1.743918 0,0 0.77139,-0.249131 1.928473,-2.615877 1.157084,-2.366746 1.028519,-3.238705 1.028519,-3.238705 z"
-       id="path3794-0"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.9843235px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="m 17.141906,44.244984 c 0,0 3.406969,-1.121091 5.978266,-3.363271 2.571298,-2.24218 3.406969,-4.982623 7.778175,-4.982623 4.371205,0 5.27116,3.051856 8.356716,5.543168 2.985945,2.410884 5.656855,2.802726 5.656855,2.802726 0,0 -4.178359,0.622828 -7.135351,-1.121091 -2.956991,-1.743917 -2.571297,-4.048381 -6.813937,-3.923816 -4.242641,0.124566 -4.949747,2.67816 -8.035304,3.923816 -3.085557,1.245657 -5.78542,1.121091 -5.78542,1.121091 z"
+       style="fill:#0b1521;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 17.015838,45.469623 c 0,0 3.592996,-1.139729 6.304691,-3.419184 2.711695,-2.279455 3.592996,-5.065457 8.202879,-5.065457 4.609881,0 5.558975,3.102591 8.813008,5.635321 3.148983,2.450964 5.965731,2.84932 5.965731,2.84932 0,0 -4.406506,0.633183 -7.524955,-1.139729 -3.118449,-1.772909 -2.711695,-4.115683 -7.185992,-3.989047 -4.474297,0.126636 -5.220013,2.722682 -8.474047,3.989047 -3.254035,1.266365 -6.101315,1.139729 -6.101315,1.139729 z"
        id="path3814"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cssscsssc" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.9843235px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="m 12.899265,29.670811 3.14619,3.832344 -2.409091,3.170922 c 0,0 -0.590909,-1.101014 -0.681819,-2.818597 -0.09091,-1.717583 -0.05528,-4.184669 -0.05528,-4.184669 z"
-       id="path3816"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.9843235px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="m 49.402211,29.670811 -3.14619,3.832344 2.409091,3.170922 c 0,0 0.590909,-1.101014 0.681819,-2.818597 0.09091,-1.717583 0.05528,-4.184669 0.05528,-4.184669 z"
-       id="path3816-2"
-       inkscape:connector-curvature="0"
-       inkscape:transform-center-x="-1.5454545" />
     <path
        sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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"
+       style="color:#000000;fill:#0b1521;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.96230984;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="path3836"
        sodipodi:cx="20.227272"
        sodipodi:cy="55.409092"
        sodipodi:rx="2.0454545"
        sodipodi:ry="2.0454545"
        d="m 22.272727,55.409092 a 2.0454545,2.0454545 0 1 1 -4.090909,0 2.0454545,2.0454545 0 1 1 4.090909,0 z"
-       transform="matrix(1,0,0,0.96889279,0.1363636,-0.54021403)" />
+       transform="matrix(1.0546019,0,0,0.98500011,-0.91824031,-0.06010908)" />
     <path
        sodipodi:type="arc"
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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"
+       style="color:#000000;fill:#0b1521;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.96230984;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="path3836-8"
        sodipodi:cx="20.227272"
        sodipodi:cy="55.409092"
        sodipodi:rx="2.0454545"
        sodipodi:ry="2.0454545"
        d="m 22.272727,55.409092 a 2.0454545,2.0454545 0 1 1 -4.090909,0 2.0454545,2.0454545 0 1 1 4.090909,0 z"
-       transform="matrix(1,0,0,0.96889279,21.636364,-0.93658032)" />
+       transform="matrix(1.0546019,0,0,0.98500011,21.755703,-0.46306479)" />
     <path
-       style="fill:#565656;fill-opacity:1;stroke:#000000;stroke-width:1.968647;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 28.136364,56.184055 c 0,0 -2.272728,0 -2.272728,-2.202029 0,-2.20203 1.911635,-6.469935 4.722705,-6.429925 3.130346,0.04456 4.786987,4.139814 4.877896,6.429925 0.09091,2.29011 -1.873328,2.378191 -1.873328,2.378191 z"
+       id="path3004-1-3"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 29.208507,55.305864 c 0,0 0.496984,0.310242 -5.28607,2.8101 C 18.139382,60.615822 14.454235,57.056795 12.351307,55.47355 10.31103,53.937476 9.0371843,50.056675 8.9933738,47.306831 6.6519944,47.116586 4.2132119,42.193286 5.2500422,40.856952 6.9271851,38.695342 10.298804,36.332072 11.876002,31.332356 13.453197,26.332638 13.10271,16.307041 13.453197,14.973783 13.803686,13.640525 15.842266,4.999999 32.452307,5 c 16.610046,0 17.837897,9.260496 18.188387,10.593754 0.350486,1.333258 0,10.834265 1.577196,15.833982 1.577196,4.999717 4.906832,6.738599 6.387507,8.904627 1.530469,2.23887 -1.449641,6.736534 -3.552571,7.069849 -0.04382,2.749844 -1.126896,6.582955 -3.167173,8.119029 -2.102928,1.583245 -5.406556,5.428412 -11.18961,2.928554 -5.783055,-2.499858 -4.90455,-3.14393 -4.90455,-3.14393 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csscssscssscsscc" />
+    <path
+       style="fill:#0b1521;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 14.304143,23.941431 13.69406,-0.506546 c 0,0 -0.542339,2.786002 -3.931958,4.685547 -3.389619,1.899548 -6.643653,1.772911 -6.643653,1.772911 0,0 -0.813509,-0.253273 -2.03377,-2.659366 -1.220263,-2.406091 -1.084679,-3.292546 -1.084679,-3.292546 z"
+       id="path3794"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#0b1521;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 49.085761,23.941431 -13.69406,-0.506546 c 0,0 0.542338,2.786002 3.931957,4.685547 3.389619,1.899548 6.643653,1.772911 6.643653,1.772911 0,0 0.813509,-0.253273 2.033771,-2.659366 1.220262,-2.406091 1.084679,-3.292546 1.084679,-3.292546 z"
+       id="path3794-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#0b1521;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 12.54154,30.65316 3.317979,3.896055 -2.540632,3.223638 c 0,0 -0.623174,-1.119317 -0.719048,-2.865455 -0.09587,-1.746137 -0.0583,-4.254238 -0.0583,-4.254238 z"
+       id="path3816"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#0b1521;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 51.037618,30.65316 -3.317978,3.896055 2.540632,3.223638 c 0,0 0.623175,-1.119317 0.719048,-2.865455 0.09587,-1.746137 0.0583,-4.254238 0.0583,-4.254238 z"
+       id="path3816-2"
+       inkscape:connector-curvature="0"
+       inkscape:transform-center-x="-1.6298376" />
+    <path
+       style="fill:#204a87;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 29,57 c 0,0 -2,0 -2,-2 0,-3 0.5,-7 4.6,-7 4.1,0 4.4,4 4.4,7 0,2 -2,2 -2,2 z"
        id="path3856"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssscc" />
+       sodipodi:nodetypes="cszscc" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:3.93729401;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 8.929825,20.406247 c 0,0 13.081475,-1.712777 22.804193,-1.370221 9.722719,0.342555 21.389981,1.541499 21.389981,1.541499"
+       style="fill:none;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 11,21 c 0,0 10.741889,-1.169366 21,-1 9.595293,0.158423 21,1 21,1"
        id="path3858"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Construction.svg b/src/Mod/Draft/Resources/icons/Draft_Construction.svg
index 923d5088b1..125d134c82 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Construction.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Construction.svg
@@ -14,10 +14,34 @@
    height="64px"
    id="svg3611"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Construction.svg">
   <defs
      id="defs3613">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3825">
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1;"
+         offset="0"
+         id="stop3827" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:0;"
+         offset="1"
+         id="stop3829" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3817">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1;"
+         offset="0"
+         id="stop3819" />
+      <stop
+         style="stop-color:#06989a;stop-opacity:0;"
+         offset="1"
+         id="stop3821" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -83,16 +107,6 @@
        id="linearGradient3609"
        xlink:href="#linearGradient4300"
        inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4292"
-       id="linearGradient3001"
-       gradientUnits="userSpaceOnUse"
-       x1="657.42859"
-       y1="92.117249"
-       x2="696.53217"
-       y2="92.117249"
-       gradientTransform="matrix(0.90492818,0.46143357,-0.43649386,0.95663257,-533.80417,-377.42664)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4292-4"
@@ -124,6 +138,24 @@
        id="linearGradient3807"
        xlink:href="#linearGradient4292-4"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3817"
+       id="linearGradient3823"
+       x1="17"
+       y1="37"
+       x2="15"
+       y2="32"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3825"
+       id="linearGradient3831"
+       x1="40"
+       y1="21"
+       x2="47"
+       y2="38"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -132,18 +164,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="35.417697"
-     inkscape:cy="40.071519"
+     inkscape:zoom="10.16208"
+     inkscape:cx="25.853365"
+     inkscape:cy="21.719341"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="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>
   <metadata
      id="metadata3616">
     <rdf:RDF>
@@ -160,29 +205,36 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="opacity:0.52166664;fill:#000000;fill-opacity:1;stroke:none"
-       d="m 53.941638,17.166729 c -11.749305,0.425528 -32.628767,8.510945 -32.628767,8.510945 l 2.726638,3.592071 c -6.678937,1.647956 -13.430919,4.149432 -16.9051551,7.378309 -2.6875313,2.68458 -4.8548987,9.101934 0.090888,10.549688 5.9662671,2.183171 10.0502161,0.09195 14.5723651,-3.656794 1.494645,-1.298828 4.950786,-3.686788 8.301098,-6.375118 l 9.664416,12.653153 c 0,0 28.496547,-22.191422 21.23748,-30.840037 -1.194313,-1.422931 -3.769157,-1.931364 -7.058963,-1.812217 z"
-       id="path3498-3"
-       inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
-       style="fill:url(#linearGradient3001);fill-opacity:1;stroke:#003b2d;stroke-width:3.09901094;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 59.662253,13.123968 C 54.202538,6.6191446 19.951889,19.828464 19.951889,19.828464 l 18.459793,24.152939 c 0,0 28.509638,-22.208819 21.250571,-30.857435 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"
+       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="cccs" />
-    <rect
-       style="color:#000000;fill:#00beb5;fill-opacity:1;fill-rule:nonzero;stroke:#003b2d;stroke-width:3.09901094;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="2.2914774"
-       height="11.10865"
-       x="34.728481"
-       y="21.25304" />
+       sodipodi:nodetypes="sccs" />
     <path
        inkscape:connector-curvature="0"
-       style="fill:#00beb5;fill-opacity:1;stroke:#003b2d;stroke-width:3.09901094;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 36.848002,21.139332 c -7.945366,0.430644 -24.815998,3.84428 -31.0676284,9.654406 -2.6875309,2.68458 -4.85165092,9.118283 0.094138,10.566036 5.9662664,2.183171 10.0604134,0.08856 14.5825624,-3.660176 3.398096,-2.952905 16.886634,-11.482407 16.390928,-16.560266 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"
+       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" />
+    <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"
+       x="30"
+       y="25" />
+    <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="ccccc" />
+       sodipodi:nodetypes="czzzc" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Cursor.svg b/src/Mod/Draft/Resources/icons/Draft_Cursor.svg
index a7d988c594..fdefbe4ec9 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Cursor.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Cursor.svg
@@ -13,8 +13,8 @@
    height="16px"
    id="svg2985"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="New document 2">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Cursor.svg">
   <defs
      id="defs2987" />
   <sodipodi:namedview
@@ -24,18 +24,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5494505"
-     inkscape:cx="-9.4216745"
-     inkscape:cy="-16.03801"
+     inkscape:zoom="44.395604"
+     inkscape:cx="8.8573979"
+     inkscape:cy="6.9173251"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata2990">
     <rdf:RDF>
@@ -44,7 +54,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -53,8 +63,10 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.20000005000000010;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.5625 0.875 L 6.5625 6.53125 L 0.90625 6.53125 L 0.90625 9.5 L 6.5625 9.5 L 6.5625 15.1875 L 9.5625 15.1875 L 9.5625 9.5 L 15.21875 9.5 L 15.21875 6.53125 L 9.5625 6.53125 L 9.5625 0.875 L 6.5625 0.875 z "
-       id="rect2993" />
+       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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_DelPoint.svg b/src/Mod/Draft/Resources/icons/Draft_DelPoint.svg
index e3d7046ddf..b6ee18b24d 100644
--- a/src/Mod/Draft/Resources/icons/Draft_DelPoint.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_DelPoint.svg
@@ -14,10 +14,21 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_AddPoint.svg">
   <defs
      id="defs3614">
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -312,17 +323,6 @@
        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"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
        id="linearGradient3144-8">
       <stop
@@ -334,35 +334,25 @@
          style="stop-color:#ffffff;stop-opacity:0"
          offset="1" />
     </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"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
-       id="linearGradient3144-8-4">
-      <stop
-         id="stop3146-96-8"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3148-4-0"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </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"
+       x2="54.509644"
+       y2="485.54004" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -371,18 +361,44 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="4.9511517"
+     inkscape:cx="20.114666"
+     inkscape:cy="12.246792"
+     inkscape:current-layer="g5199"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -400,45 +416,68 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       transform="translate(-192.14629,-132.87336)"
-       id="g5208">
+       transform="translate(-127.44439,-128.22016)"
+       id="g5199">
       <path
-         style="opacity:0.45;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86954105;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 225.87188,173.18926 a 7.1046771,7.2837954 0 0 0 -4.9698,2.53192 7.1046771,7.2837954 0 0 0 -1.49399,2.93827 l -20.30607,-0.0312 -0.0304,4.50119 20.67194,0.0625 a 7.1046771,7.2837954 0 0 0 11.95192,2.00053 7.1046771,7.2837954 0 0 0 1.18909,-2.00053 l 20.64145,0.0625 0,-4.50119 -20.33655,-0.0312 a 7.1046771,7.2837954 0 0 0 -7.3175,-5.53271 z"
-         id="path4353" />
-      <rect
-         style="color:#000000;fill:#0048ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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="rect3558-8-3"
-         width="7.0708513"
-         height="23.499424"
-         x="-153.37473"
-         y="212.98244"
-         transform="matrix(0,-1,1,0,0,0)" />
-      <rect
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.50000012;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="rect4329"
-         transform="matrix(-0.00290364,0.99999578,-0.99999712,-0.00239945,0,0)"
-         y="-251.20003"
-         x="173.59514"
-         height="54.438503"
-         width="4.4988194" />
+         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" />
       <g
-         id="g4331"
-         transform="matrix(0.97555196,0.01534763,-0.01497021,1.0001469,91.564602,-51.638116)">
+         id="g3912"
+         transform="translate(0,-21)">
         <g
-           transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
-           id="g4333">
+           transform="translate(0,31)"
+           id="g3856">
+          <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"
+             y="37"
+             transform="translate(127.44439,128.22016)" />
           <path
-             d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-             id="path4335"
-             style="fill:#0048ff;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-          <path
-             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.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             id="path4337"
-             style="fill:url(#radialGradient4339);fill-opacity:1;stroke:none" />
+             style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 59,41 5,41"
+             id="path3854"
+             inkscape:connector-curvature="0"
+             transform="translate(127.44439,128.22016)" />
+        </g>
+        <g
+           style="stroke:#3465a4;stroke-width:0.8096711"
+           id="g4312"
+           transform="matrix(1.2349522,0.01894995,-0.0189508,1.2348959,-7.1881028,-111.34439)">
+          <g
+             style="stroke:#3465a4;stroke-width:0.8096711"
+             transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
+             id="g4248">
+            <g
+               transform="translate(-3.7314339,-3.2817175)"
+               id="g3906"
+               style="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-opacity:1;stroke-dasharray:none"
+                 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" />
+              <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"
+                 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" />
+            </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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Dimension.svg b/src/Mod/Draft/Resources/icons/Draft_Dimension.svg
index 8f7d952e72..352e8fbdbe 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Dimension.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Dimension.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,78 +14,23 @@
    height="64px"
    id="svg2676"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Dimension.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2678">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       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
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       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
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3799"
-       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"
-       id="radialGradient3811"
-       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"
-       inkscape:collect="always">
+       id="linearGradient4077">
       <stop
-         id="stop3146"
+         style="stop-color:#888a85;stop-opacity:1;"
          offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
+         id="stop4079" />
       <stop
-         id="stop3148"
+         style="stop-color:#2e3436;stop-opacity:1;"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
+         id="stop4081" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       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" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -92,6 +38,227 @@
        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;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3105"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <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"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-5" />
+    </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"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-2">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-70" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-9" />
+    </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"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-1">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-8" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-7" />
+    </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"
+       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"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.83309445,0,0,0.83309445,-2.4108426,2.7318647)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3286"
+       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"
+       gradientUnits="userSpaceOnUse"
+       x1="458.2142"
+       y1="34.613808"
+       x2="459.69397"
+       y2="30.174515" />
+    <linearGradient
+       id="linearGradient4077-9">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4079-6" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         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" />
+    </linearGradient>
+    <linearGradient
+       y2="30.174515"
+       x2="459.69397"
+       y1="34.613808"
+       x1="458.2142"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4145"
+       xlink:href="#linearGradient4077-0"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4077-0"
+       id="linearGradient3819"
+       x1="230.03166"
+       y1="675.04034"
+       x2="155.01889"
+       y2="643.28284"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4077-0-2"
+       id="linearGradient3819-1"
+       x1="230.03166"
+       y1="675.04034"
+       x2="155.01889"
+       y2="643.28284"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4077-0-2">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4079-9-7" />
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="1"
+         id="stop4081-4-7" />
+    </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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -100,17 +267,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="18.892864"
+     inkscape:cx="31.041063"
+     inkscape:cy="50.266356"
+     inkscape:current-layer="text3735"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="640"
-     inkscape:window-height="684"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="93" />
+     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>
   <metadata
      id="metadata2681">
     <rdf:RDF>
@@ -129,152 +310,136 @@
     <g
        id="g3966"
        transform="matrix(0.9463094,0,0,0.9463094,-423.94991,-0.8705343)">
-      <path
-         id="path3830"
-         d="M 466.29884,7.4738263 C 465.91102,8.5161445 465.3912,9.3888673 464.70509,10.098826 C 464.01895,10.808814 463.03986,11.436544 461.79884,11.942576 L 461.79884,15.723826 C 462.64009,15.39906 463.33769,15.047572 463.89259,14.692576 C 464.45342,14.337599 465.04593,13.860359 465.64259,13.286326 L 465.64259,24.380076 L 469.33009,24.380076 L 469.33009,7.4738263 L 466.29884,7.4738263 z M 484.89259,7.4738263 C 483.05494,7.4738433 481.66852,8.1187557 480.76759,9.3800763 C 479.87263,10.641427 479.42382,12.847969 479.42384,16.005076 C 479.42384,17.289079 479.50082,18.47137 479.67384,19.536326 C 479.85283,20.593738 480.10764,21.424544 480.42384,22.036326 C 480.85938,22.89736 481.43117,23.528203 482.11134,23.973826 C 482.7915,24.419448 483.66381,24.661325 484.76759,24.661326 C 486.73648,24.661326 488.14962,23.964865 488.95509,22.567576 C 489.76054,21.17029 490.14257,18.956194 490.14259,15.942576 C 490.14258,14.598166 490.0122,13.306265 489.76759,12.067576 C 489.64228,11.418038 489.47639,10.863476 489.26759,10.380076 C 489.06472,9.8891513 488.81304,9.4119105 488.45509,8.9738263 C 488.0971,8.5282202 487.61564,8.1832473 487.04884,7.9113263 C 486.48202,7.6318851 485.77561,7.4738434 484.89259,7.4738263 z M 497.11134,7.4738263 C 495.27369,7.4738433 493.91853,8.1187557 493.01759,9.3800763 C 492.12263,10.641427 491.67383,12.847969 491.67384,16.005076 C 491.67384,17.289079 491.75083,18.47137 491.92384,19.536326 C 492.10283,20.593738 492.35765,21.424544 492.67384,22.036326 C 493.10939,22.89736 493.68117,23.528203 494.36134,23.973826 C 495.0415,24.419448 495.91382,24.661325 497.01759,24.661326 C 498.98648,24.661326 500.36837,23.964865 501.17384,22.567576 C 501.97929,21.17029 502.39258,18.956194 502.39259,15.942576 C 502.39258,14.598166 502.26222,13.306265 502.01759,12.067576 C 501.89228,11.418038 501.7264,10.863476 501.51759,10.380076 C 501.31472,9.8891513 501.0318,9.4119105 500.67384,8.9738263 C 500.31585,8.5282202 499.86565,8.1832473 499.29884,7.9113263 C 498.73202,7.6318851 497.99437,7.4738434 497.11134,7.4738263 z M 484.76759,10.536326 C 485.35826,10.53634 485.78769,10.929745 486.08009,11.692576 C 486.37839,12.44788 486.51758,13.924634 486.51759,16.130076 C 486.51758,17.633113 486.46134,18.732609 486.33009,19.442576 C 486.20479,20.152555 486.01078,20.672751 485.73634,21.005076 C 485.46785,21.329853 485.13747,21.505079 484.76759,21.505076 C 484.20675,21.505078 483.78465,21.119227 483.48634,20.348826 C 483.19398,19.57088 483.04884,18.119899 483.04884,16.005076 C 483.04883,13.912929 483.18662,12.494236 483.45509,11.723826 C 483.72357,10.94589 484.165,10.53634 484.76759,10.536326 z M 496.98634,10.536326 C 497.57701,10.53634 498.0377,10.929745 498.33009,11.692576 C 498.62839,12.44788 498.76759,13.924634 498.76759,16.130076 C 498.76758,17.633113 498.71135,18.732609 498.58009,19.442576 C 498.45479,20.152555 498.26079,20.672751 497.98634,21.005076 C 497.71785,21.329853 497.38748,21.505079 497.01759,21.505076 C 496.45675,21.505078 496.03466,21.119227 495.73634,20.348826 C 495.44398,19.57088 495.29884,18.119899 495.29884,16.005076 C 495.29883,13.912929 495.40538,12.494236 495.67384,11.723826 C 495.94232,10.94589 496.38376,10.53634 496.98634,10.536326 z M 473.67384,19.755076 L 473.67384,24.380076 L 477.54884,24.380076 L 477.54884,19.755076 L 473.67384,19.755076 z M 482.51759,26.880076 C 479.69197,26.990917 477.36367,28.895555 476.54884,31.442576 L 465.04884,31.411326 C 464.8233,31.071413 464.56189,30.751767 464.23634,30.473826 C 462.35184,28.864934 459.53273,29.089323 457.92384,30.973826 C 456.31495,32.858328 456.53936,35.708683 458.42384,37.317576 C 458.74925,37.595398 459.08419,37.773157 459.45509,37.942576 L 459.42384,52.786326 C 456.58273,53.591342 454.55302,56.268831 454.67384,59.348826 C 454.81545,62.958714 457.84518,65.771681 461.45509,65.630076 C 465.06498,65.48847 467.90922,62.458712 467.76759,58.848826 C 467.65586,56.000536 465.7206,53.645476 463.14259,52.848826 L 463.17384,37.973826 C 463.75443,37.710377 464.29525,37.334235 464.73634,36.817576 C 465.18273,36.294719 465.47467,35.690306 465.64259,35.067576 L 476.45509,35.098826 C 477.2168,38.004444 479.92435,40.096391 483.04884,39.973826 C 485.99272,39.858346 488.39718,37.807735 489.11134,35.098826 L 499.73634,35.130076 C 499.98504,35.896276 500.39062,36.632495 501.01759,37.223826 C 501.61538,37.787636 502.34052,38.137702 503.08009,38.348826 L 503.04884,53.286326 C 500.58116,54.301821 498.87571,56.778601 498.98634,59.598826 C 499.12795,63.208714 502.18894,66.021682 505.79884,65.880076 C 509.40873,65.73847 512.22172,62.708714 512.08009,59.098826 C 511.95879,56.006532 509.71112,53.478203 506.79884,52.911326 L 506.83009,37.942576 C 507.27419,37.69908 507.68274,37.393253 508.04884,37.005076 C 509.92951,35.01105 509.82411,31.885745 507.83009,30.005076 C 505.83606,28.124408 502.71078,28.198549 500.83009,30.192576 C 500.46895,30.575479 500.2025,31.023163 499.98634,31.473826 L 489.01759,31.442576 C 488.1503,28.700236 485.52928,26.761936 482.51759,26.880076 z"
-         style="opacity:0.52360517;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16900003;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
          id="g3946">
-        <path
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.16900003;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 458.9375,29.1875 L 458.9375,32.75 L 456.34375,32.75 L 456.28125,58.3125 L 460.03125,58.3125 L 460.0625,32.84375 L 499.15625,32.90625 L 499.15625,29.25 L 458.9375,29.1875 z M 499.96875,31.90625 L 499.9375,57.46875 L 503.65625,57.46875 L 503.71875,31.90625 L 499.96875,31.90625 z"
-           id="rect3730" />
+        <g
+           id="g3801"
+           transform="matrix(0.8389287,0,0,0.8389287,70.961422,17.159235)" />
+        <g
+           transform="scale(0.89528422,1.1169637)"
+           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">
+          <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'"
+             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'"
+             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'"
+             id="path3055"
+             inkscape:connector-curvature="0" />
+        </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"
+           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" />
+        <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"
+           x="456.45734"
+           y="31.565294" />
+        <g
+           id="g3095"
+           transform="translate(-0.54837935,1.7985813)">
+          <g
+             id="g3827-1"
+             transform="matrix(0.63422399,0,0,0.63422399,419.26594,-6.6998585)">
+            <g
+               id="g3797-9"
+               transform="translate(31.322131,40.570289)">
+              <g
+                 id="g3101"
+                 transform="matrix(1.0929417,0,0,1.0929417,50.053814,46.859677)">
+                <path
+                   inkscape:connector-curvature="0"
+                   style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04899836;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                   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" />
+                <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"
+                   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" />
+              </g>
+              <g
+                 id="g3101-9"
+                 transform="matrix(1.0944996,0,0,1.0944996,126.74426,46.82392)">
+                <path
+                   inkscape:connector-curvature="0"
+                   style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04465842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                   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" />
+                <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"
+                   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" />
+              </g>
+              <g
+                 id="g3101-2"
+                 transform="matrix(1.0929417,0,0,1.0929417,88.374078,6.8354789)">
+                <path
+                   inkscape:connector-curvature="0"
+                   style="fill:#fce94f;stroke:#2e2900;stroke-width:3.04899836;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                   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" />
+                <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"
+                   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" />
+              </g>
+            </g>
+          </g>
+        </g>
         <g
            id="g3805"
-           transform="matrix(0.7583974,0,0,0.7583974,110.70573,7.6477542)">
+           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">
           <path
-             transform="matrix(-9.2678674e-2,-7.9124338e-2,7.9124338e-2,-9.2678674e-2,424.64135,107.97793)"
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
+             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:#000000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             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" />
           <path
-             transform="matrix(-0.1204122,-1.8732511e-2,1.8732511e-2,-0.1204122,472.97923,114.92595)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2903"
-             style="fill:url(#radialGradient3809);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g3801"
-           transform="matrix(0.8389287,0,0,0.8389287,80.749682,5.0529745)">
-          <path
-             transform="matrix(-8.8651455e-2,-8.361171e-2,8.361171e-2,-8.8651455e-2,464.02184,105.94064)"
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
+             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="path2907"
-             style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(-0.1193382,-2.4665603e-2,2.4665603e-2,-0.1193382,511.95688,115.27113)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2909"
-             style="fill:url(#radialGradient3811);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <text
-           xml:space="preserve"
-           style="font-size:20.62213326px;font-style:normal;font-weight:normal;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-           x="514.4115"
-           y="19.669491"
-           id="text3735"
-           transform="scale(0.8887871,1.1251288)"><tspan
-             sodipodi:role="line"
-             id="tspan3737"
-             x="514.4115"
-             y="19.669491"
-             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'">1.00</tspan></text>
-        <g
-           id="g3755"
-           transform="matrix(-0.1346399,5.2815515e-3,-5.2815515e-3,-0.1346399,509.67656,118.36672)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-           inkscape:export-xdpi="7.2934141"
-           inkscape:export-ydpi="7.2934141">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3757"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3759"
-             style="fill:url(#radialGradient3799);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g3813"
-           transform="matrix(-0.1346399,5.2815515e-3,-5.2815515e-3,-0.1346399,488.10805,144.02892)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-           inkscape:export-xdpi="7.2934141"
-           inkscape:export-ydpi="7.2934141">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3815"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3817"
-             style="fill:url(#radialGradient3819);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g3821"
-           transform="matrix(-0.1346399,5.2815515e-3,-5.2815515e-3,-0.1346399,532.42849,144.28147)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-           inkscape:export-xdpi="7.2934141"
-           inkscape:export-ydpi="7.2934141">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3823"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3825"
-             style="fill:url(#radialGradient3827);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             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" />
         </g>
       </g>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Dot.svg b/src/Mod/Draft/Resources/icons/Draft_Dot.svg
index a9c22354ec..971e484aa4 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Dot.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Dot.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="Draft_Point.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Dot.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
@@ -149,6 +149,27 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3922"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1733561,0.02175327,0.02175328,1.1801291,55.592501,-17.013229)"
+       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" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -157,18 +178,41 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.75"
-     inkscape:cx="44.280978"
-     inkscape:cy="20.906021"
+     inkscape:zoom="7.2080078"
+     inkscape:cx="6.1336888"
+     inkscape:cy="29.507559"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -177,7 +221,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -185,25 +229,30 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:#001aff;fill-opacity:1;stroke:#000000;stroke-width:5.80000019000000044;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path2333"
-       sodipodi:cx="197.14285"
-       sodipodi:cy="655.2193"
-       sodipodi:rx="48.57143"
-       sodipodi:ry="48.57143"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       transform="matrix(-0.26657259,0.00713741,-0.00713741,-0.26657259,87.746907,205.06229)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3205);fill-opacity:1;stroke:none"
-       id="path2335"
-       sodipodi:cx="225.26402"
-       sodipodi:cy="672.79736"
-       sodipodi:rx="34.345188"
-       sodipodi:ry="23.991123"
-       d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-       transform="matrix(-0.22318904,0.14594017,-0.14594017,-0.22318904,176.50544,145.54681)" />
+    <g
+       style="stroke:#3465a4;stroke-width:0.97375208"
+       id="g4312"
+       transform="matrix(2.0537159,0.03151362,-0.03151503,2.0536223,-245.35223,-484.91119)">
+      <g
+         style="stroke:#3465a4;stroke-width:6.49510956"
+         transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
+         id="g4248">
+        <g
+           transform="translate(-3.7314339,-3.2817175)"
+           id="g3906"
+           style="stroke-width:6.49510956">
+          <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"
+             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" />
+          <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"
+             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" />
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Downgrade.svg b/src/Mod/Draft/Resources/icons/Draft_Downgrade.svg
index 15427ae797..363a204708 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Downgrade.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Downgrade.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,9 +14,10 @@
    height="64px"
    id="svg3074"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="downgrade.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Downgrade.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs3076">
     <linearGradient
@@ -45,6 +47,36 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective3082" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895"
+       id="linearGradient3909"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -53,17 +85,43 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.97227183"
-     inkscape:cx="11.061105"
-     inkscape:cy="-0.80341017"
+     inkscape:zoom="10.193662"
+     inkscape:cx="-8.5922089"
+     inkscape:cy="29.78347"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="722"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="25" />
+     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>
   <metadata
      id="metadata3079">
     <rdf:RDF>
@@ -79,20 +137,23 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <g
-       id="g3857"
-       transform="matrix(-0.1732574,0,0,-0.1732574,697.30616,229.38757)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/downgrade.png"
-       inkscape:export-xdpi="8.71"
-       inkscape:export-ydpi="8.71">
-      <path
-         id="path3859"
-         d="M 3819.9311,974.0961 L 3670.4311,1129.6586 L 3755.2748,1129.6586 L 3755.2748,1269.0649 L 3882.5561,1269.0649 L 3882.5561,1129.6586 L 3959.3374,1129.6586 L 3819.9311,974.0961 z"
-         style="opacity:0.60792954;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         id="path3861"
-         d="M 3848.6875,999.84375 L 3699.1875,1155.4062 L 3784.0312,1155.4062 L 3784.0312,1294.8125 L 3911.3125,1294.8125 L 3911.3125,1155.4062 L 3988.0938,1155.4062 L 3848.6875,999.84375 z"
-         style="opacity:1;fill:url(#linearGradient3863);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
+    <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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Draft.svg b/src/Mod/Draft/Resources/icons/Draft_Draft.svg
index cffd7ee6fb..e070991dc1 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Draft.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Draft.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="Sketcher_Sketch.svg"
+   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"
@@ -82,18 +82,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="9.526303"
-     inkscape:cy="25.770566"
+     inkscape:zoom="5.2183652"
+     inkscape:cx="-29.556674"
+     inkscape:cy="41.413259"
      inkscape:current-layer="g3360"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="756"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -102,7 +115,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -117,22 +130,39 @@
        inkscape:export-ydpi="3.2478156"
        transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
       <rect
-         style="color:#000000;fill:none;stroke:#0000ff;stroke-width:29.94246100999999882;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"
+         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="279.46939"
-         height="242.47264"
-         x="908.45099"
-         y="1168.7698" />
+         width="277.8056"
+         height="248.56288"
+         x="907.65808"
+         y="1168.7546" />
       <path
          sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#0000ff;stroke-width:4;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"
+         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 a 18.181818,18.181818 0 1 1 -36.363636,0 18.181818,18.181818 0 1 1 36.363636,0 z"
-         transform="matrix(7.6471726,0,0,7.3274701,940.43005,910.31002)" />
+         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" />
+      <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"
+         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 a 18.181818,18.181818 0 1 1 -36.363636,0 18.181818,18.181818 0 1 1 36.363636,0 z"
+         transform="matrix(7.6471723,0,0,7.2375671,932.86278,913.31967)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Draft2Sketch.svg b/src/Mod/Draft/Resources/icons/Draft_Draft2Sketch.svg
index e13c10fa84..d0208e9773 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Draft2Sketch.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Draft2Sketch.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="Draft_Draft.svg"
+   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"
@@ -74,6 +74,88 @@
        r="194.40614"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895"
+       id="linearGradient3909"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </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"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3023-8"
+       xlink:href="#linearGradient3895-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3895-2">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897-4" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899-5" />
+    </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" />
+    <linearGradient
+       id="linearGradient3895-1">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897-1" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899-52" />
+    </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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -82,18 +164,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.34375"
-     inkscape:cx="791.43265"
-     inkscape:cy="-325.43181"
+     inkscape:zoom="11"
+     inkscape:cx="18.762219"
+     inkscape:cy="32.261707"
      inkscape:current-layer="g3360"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -102,7 +195,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -116,47 +209,106 @@
        inkscape:export-xdpi="3.2478156"
        inkscape:export-ydpi="3.2478156"
        transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <rect
-         style="color:#000000;fill:none;stroke:#ff1100;stroke-width:27.72818756;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-8"
-         width="183.5303"
-         height="159.80293"
-         x="1892.9396"
-         y="784.45233"
-         transform="matrix(0.89616322,0.44372456,-0.84895177,0.52847032,0,0)" />
+      <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" />
       <path
          sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#ff1100;stroke-width:5.6874156;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-6"
-         sodipodi:cx="30.181818"
-         sodipodi:cy="33.272728"
-         sodipodi:rx="18.181818"
-         sodipodi:ry="18.181818"
-         d="m 48.363636,33.272728 a 18.181818,18.181818 0 1 1 -36.363636,0 18.181818,18.181818 0 1 1 36.363636,0 z"
-         transform="matrix(4.2934274,2.1258395,-4.2119097,2.621903,1208.2191,1172.3488)" />
-      <rect
-         style="color:#000000;fill:none;stroke:#0000ff;stroke-width:27.95254517;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="184.75951"
-         height="161.31898"
-         x="1630.131"
-         y="500.28162"
-         transform="matrix(0.89020103,0.45556792,-0.84097347,0.54107635,0,0)" />
+         style="fill:none;stroke:#a40000;stroke-width:6.73300314000000011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         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)" />
       <path
          sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#0000ff;stroke-width:5.6874156;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 a 18.181818,18.181818 0 1 1 -36.363636,0 18.181818,18.181818 0 1 1 36.363636,0 z"
-         transform="matrix(4.2934274,2.1971978,-4.2119097,2.7099128,1208.2191,928.41344)" />
+         style="fill:none;stroke:#ef2929;stroke-width:2.24433446000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         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)" />
       <path
-         style="color:#000000;fill:#2e76ff;fill-opacity:1;fill-rule:evenodd;stroke:#000343;stroke-width:12.09651470000000018;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 1011.6804,1128.089 -80.75454,84.5297 47.97763,0 0,87.2711 62.70361,0 0,-87.2711 50.8277,0 -80.7544,-84.5297 z m 152.4834,0 0,87.2712 -50.8278,0 80.7543,84.5296 80.7546,-84.5296 -47.5027,0 0,-87.2712 -63.1784,0 z"
-         id="rect3783"
-         inkscape:connector-curvature="0" />
+         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" />
+      <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" />
+      <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"
+         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)" />
+      <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"
+         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)" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Drawing.svg b/src/Mod/Draft/Resources/icons/Draft_Drawing.svg
index df71d66e3c..22472f8285 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Drawing.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Drawing.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Draft_SelectPlane.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Drawing.svg">
   <defs
      id="defs3614">
     <inkscape:perspective
@@ -159,16 +159,6 @@
        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
@@ -184,17 +174,6 @@
          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">
@@ -207,26 +186,6 @@
          offset="1"
          id="stop5064" />
     </linearGradient>
-    <radialGradient
-       r="117.14286"
-       fy="486.64789"
-       fx="605.71429"
-       cy="486.64789"
-       cx="605.71429"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       gradientUnits="userSpaceOnUse"
-       id="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
@@ -300,7 +259,7 @@
        fx="8.1435566"
        cy="7.2678967"
        cx="8.1435566"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
+       gradientTransform="matrix(0.93578701,0,0,0.95695492,14.882422,-58.630722)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient15668"
        xlink:href="#linearGradient15662"
@@ -362,26 +321,88 @@
     </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)"
+       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="3.7561285"
-       fx="8.824419"
-       cy="3.7561285"
-       cx="8.824419"
-       gradientTransform="matrix(0.96827297,0,0,1.032767,12.040542,-61.067271)"
+       fy="43.445751"
+       fx="0.28083447"
+       cy="43.445751"
+       cx="0.28083447"
+       gradientTransform="matrix(0.99195094,0,0,1.009791,13.727702,-59.866123)"
        gradientUnits="userSpaceOnUse"
        id="radialGradient3974"
        xlink:href="#linearGradient269"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895"
+       id="linearGradient3909"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-27,-6)"
+       y2="44"
+       x2="48"
+       y1="22"
+       x1="43"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3023"
+       xlink:href="#linearGradient3895"
+       inkscape:collect="always" />
+    <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"
+       x2="302.85715"
+       y2="609.50507" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5060"
+       id="radialGradient3094"
+       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" />
+    <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"
+       fy="486.64789"
+       r="117.14286" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -390,18 +411,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="-0.037139933"
+     inkscape:cy="29.195248"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -410,7 +440,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -419,32 +449,32 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       ry="1.1490486"
-       y="-58.066765"
-       x="15.290542"
-       height="40.920494"
-       width="34.875"
+       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"
-       rx="1.1490486"
-       transform="matrix(3.7443727e-4,0.99999993,-0.99999993,3.7443727e-4,0,0)" />
+       rx="1.1771472"
+       transform="matrix(3.5736813e-4,0.99999994,-0.99999992,3.9232174e-4,0,0)" />
     <rect
-       rx="0.14904857"
-       ry="0.14904857"
-       y="-57.129265"
-       x="16.353043"
-       height="38.946384"
-       width="32.775887"
+       rx="0.14404793"
+       ry="0.13810737"
+       y="-54.981792"
+       x="19.050236"
+       height="36.087452"
+       width="31.676243"
        id="rect15660"
-       style="color:#000000;fill:none;stroke:url(#radialGradient15668);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block;overflow:visible"
-       transform="matrix(3.7443727e-4,0.99999993,-0.99999993,3.7443727e-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)" />
     <g
-       style="display:inline"
+       style="stroke-width:2.02001595;display:inline"
        id="g2270"
-       transform="matrix(3.7443726e-4,0.9999999,-0.9999999,3.7443726e-4,61.755167,9.3103206)">
+       transform="matrix(3.6610713e-4,1.0244539,-0.97775283,3.8359374e-4,60.539218,10.930654)">
       <g
          transform="matrix(0.229703,0,0,0.229703,4.967081,4.244972)"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-miterlimit:4"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8.69966507;stroke-miterlimit:4"
          id="g1440">
         <radialGradient
            gradientUnits="userSpaceOnUse"
@@ -466,7 +496,8 @@
         <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" />
+           style="stroke:none"
+           inkscape:connector-curvature="0" />
         <radialGradient
            gradientUnits="userSpaceOnUse"
            fy="64.567902"
@@ -487,58 +518,40 @@
         <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" />
+           style="stroke:none"
+           inkscape:connector-curvature="0" />
       </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" />
+         style="fill:url(#radialGradient2283);fill-rule:nonzero;stroke:none"
+         inkscape:connector-curvature="0" />
       <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" />
+         style="fill:url(#radialGradient2285);fill-rule:nonzero;stroke:none"
+         inkscape:connector-curvature="0" />
     </g>
     <path
        sodipodi:nodetypes="cc"
        id="path15672"
-       d="m 56.226967,20.171667 -37.906589,0.01419"
-       style="fill:none;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.01754384;display:inline" />
+       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" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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" />
     <path
        sodipodi:nodetypes="cc"
        id="path15674"
-       d="m 56.701107,21.165767 -38.017709,0.01423"
-       style="fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.20467828;display:inline" />
-    <g
-       inkscape:label="Layer 1"
-       id="Draft_upgrade-1-3"
-       transform="matrix(0,0.6154111,-0.6154111,0,41.174257,7.399315)"
-       style="stroke:#000000;stroke-width:3.24986005;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-      <g
-         transform="matrix(0.1731146,0,0,0.1731146,-635.22048,-168.53671)"
-         inkscape:export-ydpi="8.71"
-         inkscape:export-xdpi="8.71"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/upgrade.png"
-         id="g3853-3-7"
-         style="stroke:#000000;stroke-width:18.77288246;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-        <path
-           style="opacity:0.60792954;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:18.77288246;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 3875.9311,1028.0961 -149.5,155.5625 84.8437,0 0,139.4063 127.2813,0 0,-139.4063 76.7813,0 -139.4063,-155.5625 z"
-           id="path3849-7-9" />
-        <path
-           style="fill:url(#linearGradient3847-7-5);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:18.77288246;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 3848.6875,999.84375 c 0,0 -45.4643,47.30795 -70.381,73.23505 -24.9167,25.9271 -79.119,82.3274 -79.119,82.3274 l 84.8437,0 0,139.4063 c 0,0 41.0718,0 62.2854,0 21.2135,0 64.9959,0 64.9959,0 l 0,-139.4063 76.7813,0 -139.4063,-155.56245 z"
-           id="rect3066-7-3"
-           sodipodi:nodetypes="czccczcccc" />
-      </g>
-    </g>
+       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" />
     <path
        sodipodi:type="arc"
-       style="color:#000000;fill:none;stroke:#000bff;stroke-width:1.46689308;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"
+       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"
@@ -547,26 +560,46 @@
        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)" />
     <g
-       style="display:inline"
+       style="stroke-width:112.62601471;display:inline"
        id="g5022"
-       transform="matrix(0.02165152,0,0,0.01485743,56.519737,52.827926)">
+       transform="matrix(0.02116984,0,0,0.01522076,55.649294,54.012912)">
       <rect
          y="-150.69685"
          x="-1559.2523"
          height="478.35718"
          width="1339.6335"
          id="rect4173"
-         style="opacity:0.40206185;color:#000000;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+         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" />
       <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(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible" />
+         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" />
       <path
-         style="opacity:0.40206185;color:#000000;fill:url(#radialGradient5392);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible"
+         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" />
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0" />
     </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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Edit.svg b/src/Mod/Draft/Resources/icons/Draft_Edit.svg
index 27ab0eefbb..a14e4f39c0 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Edit.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Edit.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Draft_Drawing.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Edit.svg">
   <defs
      id="defs3614">
     <inkscape:perspective
@@ -365,7 +365,7 @@
        xlink:href="#linearGradient4095"
        id="linearGradient4937"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.10456791,0,0,0.10456791,420.90006,-32.97638)"
+       gradientTransform="matrix(0.10456791,0,0,0.10456791,368.43605,-33.490763)"
        x1="901.1875"
        y1="1190.875"
        x2="1267.9062"
@@ -389,18 +389,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="11"
+     inkscape:cx="31.099711"
+     inkscape:cy="23.038466"
+     inkscape:current-layer="g4928"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -409,7 +418,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -421,55 +430,81 @@
        id="g4928"
        transform="matrix(0.98259094,0,0,1,-503.91256,-68.006097)">
       <path
-         sodipodi:nodetypes="czccczcczc"
-         id="path3278-8-6"
-         d="m 560.84771,76.626352 c 0,0 -6.57909,3.504749 -11.08268,5.903862 -4.5036,2.399114 -15.9389,8.490818 -15.9389,8.490818 l 18.68782,7.07107 -16.66752,31.567258 c 0,0 15.81556,-5.07291 22.50783,-7.21949 C 565.04652,120.2933 576,116.77992 576,116.77992 l -11.8693,-9.84899 c 0,0 -1.07129,-10.845521 -1.61845,-14.939595 -0.54717,-4.094073 -1.66454,-15.364983 -1.66454,-15.364983 z"
-         style="opacity:0.56488552;fill:#000000;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="czccczcczc"
+         sodipodi:nodetypes="cccczccc"
          id="path3278-8"
-         d="m 555.78654,71.839721 c 0,0 -6.57909,3.504749 -11.08268,5.903862 -4.5036,2.399114 -15.9389,8.490818 -15.9389,8.490818 l 18.68782,7.07107 -16.66752,31.567259 c 0,0 15.81556,-5.07291 22.50783,-7.21949 6.69226,-2.14657 17.64574,-5.65995 17.64574,-5.65995 l -11.8693,-9.84899 c 0,0 -1.07129,-10.845522 -1.61845,-14.939596 -0.54717,-4.094073 -1.66454,-15.364983 -1.66454,-15.364983 z"
-         style="fill:#0013ff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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" />
       <path
-         inkscape:export-ydpi="6.2926431"
-         inkscape:export-xdpi="6.2926431"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         sodipodi:nodetypes="cczccc"
-         id="path3385-6"
-         d="m 550.80187,95.18176 2.58638,2.80742 c 0,0 0.75336,5.28251 1.20788,8.10363 0.45452,2.82111 1.52787,8.82045 1.52787,8.82045 l -16.09075,-3.75581 -3.7667,-4.05456"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.40498567;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="cczcssccssccsccc"
-         inkscape:export-ydpi="6.2926431"
-         inkscape:export-xdpi="6.2926431"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         id="rect2390-8"
-         d="M 529.49385,72 515.6582,84.76056 c 0,0 7.61872,8.451747 11.66709,12.843022 4.04837,4.391278 12.62861,13.498288 12.62861,13.498288 -0.20842,-0.43361 -0.32351,-0.91301 -0.32351,-1.41821 0,-1.92414 1.68147,-3.48341 3.75138,-3.48341 0.56046,0 1.0909,0.11516 1.56852,0.32023 l 0.22548,-0.20913 c -0.0699,-0.26592 -0.10784,-0.54459 -0.10784,-0.83 0,-1.92416 1.67818,-3.48669 3.7481,-3.48669 0.31808,0 0.62651,0.0382 0.92151,0.10783 l 0.78427,-0.72217 c -0.0437,-0.2116 -0.0686,-0.43033 -0.0686,-0.65355 0,-1.51793 1.0483,-2.8067 2.50636,-3.28408 L 529.49388,72 l -3e-5,0 z"
-         style="fill:url(#linearGradient4937);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.40498567;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:nodetypes="czc"
-         inkscape:export-ydpi="6.2926431"
-         inkscape:export-xdpi="6.2926431"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         id="path3373-7"
-         d="m 550.19062,101.78426 c 0,0 -8.5184,-8.769198 -12.54897,-13.101754 C 533.61108,84.349949 526.00146,75.79939 526.00146,75.79939"
-         style="fill:none;stroke:#000000;stroke-width:1.04567921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="czc"
-         inkscape:export-ydpi="6.2926431"
-         inkscape:export-xdpi="6.2926431"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         id="path3375-9"
-         d="m 544.90915,106.2207 c 0,0 -8.29419,-9.080493 -12.2553,-13.428911 C 528.69274,88.44337 521.1425,80.13019 521.1425,80.13019"
-         style="fill:none;stroke:#000000;stroke-width:1.04567921;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-      <path
-         sodipodi:nodetypes="czccc"
-         inkscape:export-ydpi="6.2926431"
-         inkscape:export-xdpi="6.2926431"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-         id="path3387-0"
-         d="m 554.73269,106.53758 c 0,0 -1.81786,2.70422 -2.92169,3.75092 -1.10383,1.04671 -3.73297,2.48122 -3.73297,2.48122 l 8.34474,2.1126 -1.69008,-8.34474 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.10456792px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc"
+         id="path3278-8-3"
+         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" />
+      <g
+         id="g3973"
+         transform="translate(73.275671,-13.000009)">
+        <path
+           sodipodi:nodetypes="cccccc"
+           inkscape:connector-curvature="0"
+           id="path3969"
+           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" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path3843"
+           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" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path3843-7"
+           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" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path3843-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:#204a87;stroke:none" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path3888"
+           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" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path3888-5"
+           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" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path3843-5-6"
+           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" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path3843-5-6-2"
+           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" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path3843-5-6-9"
+           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" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path3971"
+           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" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Ellipse.svg b/src/Mod/Draft/Resources/icons/Draft_Ellipse.svg
index 0adc2bea04..98b4eec2e8 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Ellipse.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Ellipse.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Ellipse.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -287,6 +287,108 @@
          offset="1"
          id="stop3148-55" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3892"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3892">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3894" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3896" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3850"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3850">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3852" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3854" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7"
+       id="linearGradient3801-1-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7-6"
+       id="linearGradient3801-1-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7-6">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-4-7" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-0-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -295,19 +397,33 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11"
-     inkscape:cx="16.219897"
-     inkscape:cy="36.195002"
+     inkscape:zoom="20.387325"
+     inkscape:cx="29.610142"
+     inkscape:cy="34.003953"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1057"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-page="false" />
+     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>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -325,69 +441,80 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.52863434;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.95238727;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 57.812501,12.599432 c -2.305988,0.08129 -4.430396,1.531167 -5.28125,3.8125 -1.134472,3.041778 0.431475,6.432267 3.5,7.59375 3.068525,1.161483 6.490528,-0.364472 7.625,-3.40625 1.134472,-3.041777 -0.431475,-6.432267 -3.5,-7.59375 -0.767131,-0.290371 -1.575087,-0.433345 -2.34375,-0.40625 z m -20.5625,9.65625 c -1.816237,-0.0041 -3.664419,0.07227 -5.5625,0.28125 -15.4549,1.701565 -27.1809911,10.217049 -25.9062501,16.875 1.274742,6.65795 15.0451001,12.482812 30.5000001,10.78125 15.454882,-1.701562 26.774726,-10.310795 25.5,-16.96875 l -0.09375,-0.3125 C 60.22715,27.230414 49.963658,22.284163 37.250001,22.255682 z m -0.28125,3.90625 c 10.403968,-0.142958 19.453168,3.159714 20.625,7.71875 l 0.0625,0.25 c 1.0229,5.342559 -9.348483,10.540858 -21.75,11.90625 -12.401503,1.365389 -24.758354,-1.563692 -25.78125,-6.90625 -1.0228941,-5.342558 9.910998,-11.322111 22.3125,-12.6875 1.523085,-0.16769 3.044969,-0.260827 4.53125,-0.28125 z M 8.1875009,46.505682 c -2.305988,0.08129 -4.430396,1.531167 -5.28125,3.8125 -1.134472,3.041777 0.431475,6.432267 3.5,7.59375 3.068525,1.161483 6.4592781,-0.364473 7.5937501,-3.40625 1.134472,-3.041777 -0.431475,-6.432267 -3.5,-7.59375 -0.7671311,-0.290371 -1.5438371,-0.433345 -2.3125001,-0.40625 z"
-       id="path4425-1"
-       inkscape:connector-curvature="0" />
+       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"
+       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)" />
     <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.95238727;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 30.207939,19.287423 C 14.753039,20.988988 3.0223557,29.482544 4.2970968,36.140495 5.5718395,42.798445 19.356537,48.62887 34.811437,46.927308 50.266319,45.225746 61.571171,36.632994 60.296445,29.975039 l -0.07803,-0.329925 C 58.549443,23.15195 45.392553,17.615618 30.207905,19.287428 z m 1.040477,4.797449 c 12.184684,-1.34152 21.525328,1.962025 22.955473,6.172353 l 0.06085,0.265817 c 0.568355,3.706195 -7.0785,9.809031 -19.480017,11.174423 C 22.383219,43.062854 11.169997,39.994822 10.016575,35.86836 8.7179464,31.222413 18.846972,25.450253 31.248474,24.084864 z"
-       id="path4425"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csscccccccsscc" />
+       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"
+       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)" />
+    <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"
+       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)" />
+    <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"
+       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)" />
     <g
-       id="g3185"
-       transform="matrix(-0.11438937,-0.04329811,0.04229118,-0.11339228,1.820864,131.98448)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-       inkscape:export-xdpi="7.2934141"
-       inkscape:export-ydpi="7.2934141"
-       style="stroke-width:8.21939373;stroke-miterlimit:4;stroke-dasharray:none">
-      <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="path3187"
-         style="fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8.21939373;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"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path3189"
-         style="fill:url(#radialGradient3248);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+       transform="translate(40.06872,-39.716536)"
+       id="g3827-1-9">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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" />
+        <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"
+           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" />
+      </g>
     </g>
     <g
-       id="g3185-60"
-       transform="matrix(-0.11438937,-0.04329811,0.04229118,-0.11339228,51.466813,98.075824)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-       inkscape:export-xdpi="7.2934141"
-       inkscape:export-ydpi="7.2934141"
-       style="stroke-width:8.21939373;stroke-miterlimit:4;stroke-dasharray:none">
-      <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="path3187-0"
-         style="fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8.21939373;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"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path3189-3"
-         style="fill:url(#radialGradient3269);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+       transform="translate(0.06872,0.283464)"
+       id="g3827-1-9-3">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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" />
+        <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"
+           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" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Facebinder.svg b/src/Mod/Draft/Resources/icons/Draft_Facebinder.svg
index 3105ff8ca8..0b8a965f34 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Facebinder.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Facebinder.svg
@@ -14,12 +14,24 @@
    height="64px"
    id="svg2766"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Facebinder.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2768">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3826">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3828" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3830" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3787">
       <stop
@@ -111,16 +123,6 @@
          offset="1"
          style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient
-       y2="100.2725"
-       x2="672.73157"
-       y1="100.79263"
-       x1="635.40765"
-       gradientTransform="matrix(1.4041623,-0.84133513,0,0.94380163,-878.00151,497.49367)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4018"
-       xlink:href="#linearGradient3864-0-2-3"
-       inkscape:collect="always" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3864-0-9"
@@ -359,26 +361,6 @@
        y1="100.79263"
        x2="672.73157"
        y2="100.2725" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2-3"
-       id="linearGradient3771"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4041623,-0.84133513,0,0.94380163,-901.23938,511.71482)"
-       x1="635.40765"
-       y1="100.79263"
-       x2="672.73157"
-       y2="100.2725" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864-0-2-3"
-       id="linearGradient3773"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.4041623,-0.84133513,0,0.94380163,-878.10747,467.32114)"
-       x1="635.40765"
-       y1="100.79263"
-       x2="672.73157"
-       y2="100.2725" />
     <linearGradient
        y2="100.2725"
        x2="672.73157"
@@ -452,6 +434,33 @@
        id="linearGradient3800"
        xlink:href="#linearGradient3864-0-2-1"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3832"
+       x1="26.03454"
+       y1="58.604141"
+       x2="16.614164"
+       y2="18.186876"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3840"
+       x1="46.791019"
+       y1="16.110708"
+       x2="41.987568"
+       y2="4.7310886"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3848"
+       x1="49.734024"
+       y1="48.417618"
+       x2="44.576797"
+       y2="31.838688"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -460,20 +469,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="27.92905"
-     inkscape:cy="28.410055"
+     inkscape:zoom="10.193663"
+     inkscape:cx="31.74825"
+     inkscape:cy="32.519292"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1053"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-nodes="false" />
+     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>
   <metadata
      id="metadata2771">
     <rdf:RDF>
@@ -491,25 +511,40 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.50442475;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.49613571;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 35.091973,0.99631448 C 34.298543,1.4783153 32.658366,2.481625 32.062165,2.841677 c -2.47e-4,0.038064 2.43e-4,0.055861 0,0.093832 C 31.691097,3.1630287 9.3896645,16.836743 1.8514799,21.389133 1.8089979,27.926889 1.8086899,47.845131 1.8223469,60.42324 l 19.4898251,0 c 4.460256,-2.726408 8.650339,-5.29257 10.953922,-6.630794 1.3e-4,-0.02629 -1.26e-4,-0.03643 0,-0.06255 0.201296,-0.125022 16.293124,-10.145279 23.21882,-14.16863 0.01956,-3.957548 0,-5.95387 0,-9.414477 l 0,-11.35367 c 0,0 -15.584713,9.557369 -23.21882,14.16863 l 0,-14.888009 C 32.602416,17.86573 45.719668,9.7526718 55.688844,3.6861649 l 0,-2.68985042 -20.596871,0 z"
-       id="rect3200-8-2"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:url(#linearGradient4018);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:1.49613570999999990;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.708929,34.723403 c 7.600945,-4.590292 23.329698,-14.210845 23.329698,-14.210845 0,0 0,7.882137 0,11.342743 0,3.460607 0.01956,5.463347 0,9.420895 -6.969049,4.048537 -23.329698,14.210844 -23.329698,14.210844 0,0 -0.05821,-11.805893 0,-20.763637 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"
+       d="M 37,35 61,23 61.038627,41.276196 37,55 z"
        id="rect3200-8"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cczccc" />
+       sodipodi:nodetypes="ccccc" />
     <path
-       style="color:#000000;fill:url(#linearGradient3773);fill-opacity:1.0;fill-rule:evenodd;stroke:#000000;stroke-width:1.49613570999999990;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 40.639057,2.6939705 c -0.793431,0.4820007 -2.433608,1.4853104 -3.029809,1.8453624 -0.05821,8.9577441 0,15.3571691 0,15.3571691 0,0 13.529368,-8.368202 23.626679,-14.5126812 l 0,-2.6898503 -20.59687,0 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"
+       d="M 41,3 37,5 37,20 61,7 61,3 z"
        id="rect3200-8-99"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
     <path
-       style="color:#000000;fill:url(#linearGradient3771);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.49613571;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.813178,4.5080556 c 0,0 -22.813669,13.9884424 -30.4146157,18.5787334 -0.042484,6.537756 -0.042786,26.455998 -0.029133,39.034108 l 19.4898257,0 c 4.460256,-2.726409 8.650339,-5.292571 10.953923,-6.630794 0.01956,-3.957548 0,-5.95387 0,-9.414476 l 0,-41.5675714 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"
+       d="M 37,5 3,23 3,61 27,61 37,55 z"
        id="rect3200-8-9"
-       inkscape:connector-curvature="0" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <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" />
+    <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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Finish.svg b/src/Mod/Draft/Resources/icons/Draft_Finish.svg
index 07cda38516..59e1922bb3 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Finish.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Finish.svg
@@ -14,10 +14,21 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Finish.svg">
   <defs
      id="defs3614">
+    <linearGradient
+       id="linearGradient4082">
+      <stop
+         id="stop4084"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop4086"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
     <linearGradient
        id="linearGradient4280">
       <stop
@@ -205,6 +216,111 @@
          offset="1"
          id="stop4284-5" />
     </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"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </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"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
+       id="linearGradient3836-6">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838-7" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </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"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
+       id="linearGradient3836-2">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838-9" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840-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"
+       x2="56.319412"
+       y2="483.99524" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3838-3" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3840-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3979"
+       x1="89"
+       y1="67"
+       x2="84"
+       y2="49"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1)" />
+    <linearGradient
+       id="linearGradient3098">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3100" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3102" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -213,21 +329,41 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890872"
-     inkscape:cx="13.668976"
-     inkscape:cy="10.980782"
+     inkscape:zoom="11"
+     inkscape:cx="4.0723865"
+     inkscape:cy="37.023593"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="777"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false"
+     inkscape:snap-global="true"
      inkscape:snap-nodes="true"
-     inkscape:object-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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -245,60 +381,77 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <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"
-       id="path4235-8-7"
-       d="m 28.873502,8.1632589 c -2.837435,0.2881572 -5.0625,2.7115381 -5.0625,5.6250001 0,1.085407 0.311381,2.077914 0.843749,2.9375 L 11.061002,29.882009 C 10.198524,29.34446 9.1833717,29.007008 8.0922517,29.007008 c -3.1076916,0 -5.6250003,2.51731 -5.6250003,5.625001 0,3.10769 2.5173087,5.625 5.6250003,5.625 0.2913453,0 0.5955877,-0.01981 0.8749994,-0.0625 l 14.4999999,14.65625 c -0.07495,0.3663 -0.124999,0.73654 -0.124999,1.125 0,3.10769 2.517309,5.625 5.624999,5.625 3.107692,0 5.625001,-2.51731 5.625001,-5.625 0,-0.51871 -0.08736,-1.02305 -0.21875,-1.500001 l 7.562499,-7.687499 c 1.448885,0.75273 3.039722,1.2967 4.750001,1.53125 8.007085,1.09811 15.37064,-4.49291 16.46875,-12.5 1.09811,-8.007087 -4.492914,-15.401885 -12.5,-16.5 -8.007087,-1.098115 -15.370636,4.524164 -16.46875,12.53125 -0.690574,5.035429 1.240843,9.80409 4.781249,12.9375 l -6.593749,6.6875 c -0.943363,-0.7142 -2.131802,-1.125 -3.406251,-1.125 -1.376472,0 -2.647179,0.4918 -3.624999,1.3125 L 12.154751,38.538259 c 0.971456,-1.01124 1.5625,-2.39326 1.5625,-3.90625 0,-0.77692 -0.15276,-1.5143 -0.4375,-2.1875 l 13.843751,-13.53125 c 0.70626,0.319315 1.487018,0.499999 2.3125,0.499999 3.10769,0 5.624999,-2.517309 5.624999,-5.624999 0,-3.107691 -2.517309,-5.6250001 -5.624999,-5.6250001 -0.194232,0 -0.373339,-0.019209 -0.5625,0 z"
-       style="opacity:0.525;fill:#000000;fill-opacity:1;stroke:none" />
+       sodipodi:nodetypes="cccc" />
     <path
-       id="path4235-8"
-       style="fill:#ffffff;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="M 51.088219,32.609591 28.222994,55.817606 4.2513883,31.570426 29.329376,7.3232466 31.568077,9.701098 9.0978561,31.621409 28.245092,50.724986 48.50255,30.21124 z"
+       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"
+       id="path3981-1"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       sodipodi:nodetypes="cccc" />
+    <g
+       style="stroke:#3465a4;stroke-width:2.12214088"
+       id="g4312"
+       transform="matrix(0.94235513,0.01446014,-0.01446079,0.94231206,-148.41869,-195.06957)">
+      <g
+         style="stroke:#3465a4;stroke-width:14.15507793"
+         transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
+         id="g4248">
+        <g
+           transform="translate(-3.7314339,-3.2817175)"
+           id="g3906"
+           style="stroke-width:14.15507793">
+          <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"
+             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" />
+          <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"
+             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" />
+          <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"
+             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" />
+          <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"
+             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" />
+          <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"
+             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" />
+          <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"
+             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" />
+        </g>
+      </g>
+    </g>
     <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#linearGradient4331);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4278"
-       sodipodi:cx="51.727272"
-       sodipodi:cy="36.272728"
-       sodipodi:rx="13.545455"
-       sodipodi:ry="13.545455"
-       d="m 65.272727,36.272728 a 13.545455,13.545455 0 1 1 -27.09091,0 13.545455,13.545455 0 1 1 27.09091,0 z"
-       transform="matrix(0.14678818,-1.0703303,1.0703303,0.14678818,1.7228232,79.496419)" />
+       inkscape:connector-curvature="0"
+       style="fill:#3465a4;fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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" />
     <path
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 37.283515,26.72743 6.35716,13.292442 13.985756,-17.592938 -13.19111,7.819084 z"
-       id="path4290"
-       inkscape:connector-curvature="0" />
+       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"
+       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" />
     <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#3f81f9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.97554541;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4292"
-       sodipodi:cx="11.056579"
-       sodipodi:cy="36.229988"
-       sodipodi:rx="7.4567623"
-       sodipodi:ry="7.4567623"
-       d="m 18.513341,36.229988 a 7.4567623,7.4567623 0 1 1 -14.9135247,0 7.4567623,7.4567623 0 1 1 14.9135247,0 z"
-       transform="matrix(0.75461342,0,0,0.75461342,-0.77038182,2.9275619)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#3f81f9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.97554541;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4292-3"
-       sodipodi:cx="11.056579"
-       sodipodi:cy="36.229988"
-       sodipodi:rx="7.4567623"
-       sodipodi:ry="7.4567623"
-       d="m 18.513341,36.229988 a 7.4567623,7.4567623 0 1 1 -14.9135247,0 7.4567623,7.4567623 0 1 1 14.9135247,0 z"
-       transform="matrix(0.75461342,0,0,0.75461342,20.560933,-17.934934)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#3f81f9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.97554541;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4292-35"
-       sodipodi:cx="11.056579"
-       sodipodi:cy="36.229988"
-       sodipodi:rx="7.4567623"
-       sodipodi:ry="7.4567623"
-       d="m 18.513341,36.229988 a 7.4567623,7.4567623 0 1 1 -14.9135247,0 7.4567623,7.4567623 0 1 1 14.9135247,0 z"
-       transform="matrix(0.75461342,0,0,0.75461342,20.092113,24.258877)" />
+       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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_FlipDimension.svg b/src/Mod/Draft/Resources/icons/Draft_FlipDimension.svg
index 05f9ab96d3..efe87cb175 100644
--- a/src/Mod/Draft/Resources/icons/Draft_FlipDimension.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_FlipDimension.svg
@@ -7,18 +7,43 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64px"
    height="64px"
    id="svg2735"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Tree_Dimension.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_FlipDimension.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2737">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5192">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop5194" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop5196" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5127">
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="0"
+         id="stop5129" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="1"
+         id="stop5131" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -26,6 +51,55 @@
        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="499.98511"
+       y1="19.713791"
+       x2="540.14728"
+       y2="4.3889422"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5127-2"
+       id="linearGradient5133-1"
+       x1="499.98511"
+       y1="19.713791"
+       x2="540.14728"
+       y2="4.3889422"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5127-2">
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="0"
+         id="stop5129-0" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="1"
+         id="stop5131-6" />
+    </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" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5192"
+       id="linearGradient5198"
+       x1="33.634201"
+       y1="60.706417"
+       x2="29.080149"
+       y2="38.657543"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -34,18 +108,38 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.75"
-     inkscape:cx="-26.048784"
-     inkscape:cy="67.197879"
+     inkscape:zoom="22"
+     inkscape:cx="34.460511"
+     inkscape:cy="17.891681"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1053"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata2740">
     <rdf:RDF>
@@ -54,7 +148,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -63,46 +157,41 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       sodipodi:type="star"
-       style="fill:#ffdf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;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="path2644"
-       sodipodi:sides="3"
-       sodipodi:cx="519.64288"
-       sodipodi:cy="9.9285707"
-       sodipodi:r1="31.436687"
-       sodipodi:r2="15.718344"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.52359878"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 519.64288,-21.508117 27.22497,47.155032 -54.44994,-1e-6 z"
-       transform="matrix(0,-0.59069326,0.37332419,0,16.798495,327.24589)"
-       inkscape:export-xdpi="28.909956"
-       inkscape:export-ydpi="28.909956" />
-    <path
-       sodipodi:type="star"
-       style="fill:#ffdf00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;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="path2644-2"
-       sodipodi:sides="3"
-       sodipodi:cx="519.64288"
-       sodipodi:cy="9.9285707"
-       sodipodi:r1="31.436687"
-       sodipodi:r2="15.718344"
-       sodipodi:arg1="-1.5707963"
-       sodipodi:arg2="-0.52359878"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 519.64288,-21.508117 27.22497,47.155032 -54.44994,-1e-6 z"
        transform="matrix(0,0.59069326,-0.37332419,0,46.495674,-286.6532)"
-       inkscape:export-xdpi="28.909956"
-       inkscape:export-ydpi="28.909956" />
+       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" />
     <path
-       style="fill:#0092ff;fill-opacity:1;stroke:#000532;stroke-width:2.84847212;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 60.609991,38.395477 -18.646619,-1.876978 2.968682,5.59018 c 0,0 -5.870572,7.81311 -16.885982,4.911213 C 19.173661,44.682545 14.908906,32.678401 14.908906,32.678401 L 4.6382855,39.913964 c 0,0 6.3313485,14.929395 19.7786945,18.566016 12.972511,3.5082 25.455148,-6.273406 25.455148,-6.273406 l 2.420233,4.587809 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"
+       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="cccsccsccc" />
+       sodipodi:nodetypes="ccczcczccc" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Grid.svg b/src/Mod/Draft/Resources/icons/Draft_Grid.svg
index 7be9b83cb8..4014819113 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Grid.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Grid.svg
@@ -14,12 +14,24 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Grid.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3946">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="0"
+         id="stop3948" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3950" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -73,6 +85,74 @@
          offset="1"
          id="stop3148-8" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3946"
+       id="linearGradient3952"
+       x1="182.81459"
+       y1="734.65814"
+       x2="127.30297"
+       y2="469.43594"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3946"
+       id="linearGradient3962"
+       gradientUnits="userSpaceOnUse"
+       x1="182.81459"
+       y1="734.65814"
+       x2="127.30297"
+       y2="469.43594"
+       gradientTransform="translate(0.8811394,4.4056794)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3946"
+       id="linearGradient3964"
+       gradientUnits="userSpaceOnUse"
+       x1="182.81459"
+       y1="734.65814"
+       x2="127.30297"
+       y2="469.43594"
+       gradientTransform="translate(-4.0774755e-6,4.4056694)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3946"
+       id="linearGradient3966"
+       gradientUnits="userSpaceOnUse"
+       x1="182.81459"
+       y1="734.65814"
+       x2="127.30297"
+       y2="469.43594"
+       gradientTransform="translate(-0.88114055,4.4056794)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3946"
+       id="linearGradient3968"
+       gradientUnits="userSpaceOnUse"
+       x1="182.81459"
+       y1="734.65814"
+       x2="127.30297"
+       y2="469.43594" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3946"
+       id="linearGradient3970"
+       gradientUnits="userSpaceOnUse"
+       x1="182.81459"
+       y1="734.65814"
+       x2="127.30297"
+       y2="469.43594"
+       gradientTransform="translate(-1.1451159e-5,5.286812)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3946"
+       id="linearGradient3972"
+       gradientUnits="userSpaceOnUse"
+       x1="182.81459"
+       y1="734.65814"
+       x2="127.30297"
+       y2="469.43594"
+       gradientTransform="translate(-1.1451159e-5,4.4056755)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -81,18 +161,42 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="17.208101"
-     inkscape:cy="30.896655"
+     inkscape:zoom="20.387325"
+     inkscape:cx="56.397058"
+     inkscape:cy="15.341752"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1053"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -101,7 +205,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -113,17 +217,104 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <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;fill:#4c4c4c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:6.00766993;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 21.523034,442.71224 0,26.31194 -26.3002481,0 0,36.97011 26.3002481,0 0,89.42111 -26.3002481,0 0,36.97011 26.3002481,0 0,88.22254 -26.3002481,0 0,36.97011 26.3002481,0 0,26.30024 36.9701,0 0,-26.30024 88.651006,0 0,26.30024 36.9701,0 0,-26.30024 88.99267,0 0,26.30024 36.9701,0 0,-26.30024 26.30025,0 0,-36.97011 -26.30025,0 0,-88.22254 26.30025,0 0,-36.97011 -26.30025,0 0,-89.42111 26.30025,0 0,-36.97011 -26.30025,0 0,-26.31194 -36.9701,0 0,26.31194 -88.99267,0 0,-26.31194 -36.9701,0 0,26.31194 -88.651006,0 0,-26.31194 z m 36.9701,63.28205 88.651006,0 0,89.42111 -88.651006,0 z m 125.621106,0 88.99267,0 0,89.42111 -88.99267,0 z m -125.621106,126.39122 88.651006,0 0,88.22254 -88.651006,0 z m 125.621106,0 88.99267,0 0,88.22254 -88.99267,0 z"
-         id="rect4144-3"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+         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" />
       <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;fill:#cdcdcd;fill-opacity:1;fill-rule:nonzero;stroke:#373737;stroke-width:6.00766993;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 9.1871168,430.37632 0,26.31194 -26.3002478,0 0,36.9701 26.3002478,0 0,89.42112 -26.3002478,0 0,36.9701 26.3002478,0 0,88.22255 -26.3002478,0 0,36.9701 26.3002478,0 0,26.30025 36.9701012,0 0,-26.30025 88.651002,0 0,26.30025 36.9701,0 0,-26.30025 88.99267,0 0,26.30025 36.9701,0 0,-26.30025 26.30025,0 0,-36.9701 -26.30025,0 0,-88.22255 26.30025,0 0,-36.9701 -26.30025,0 0,-89.42112 26.30025,0 0,-36.9701 -26.30025,0 0,-26.31194 -36.9701,0 0,26.31194 -88.99267,0 0,-26.31194 -36.9701,0 0,26.31194 -88.651002,0 0,-26.31194 z m 36.9701012,63.28204 88.651002,0 0,89.42112 -88.651002,0 z m 125.621102,0 88.99267,0 0,89.42112 -88.99267,0 z m -125.621102,126.39122 88.651002,0 0,88.22255 -88.651002,0 z m 125.621102,0 88.99267,0 0,88.22255 -88.99267,0 z"
-         id="rect4144"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+         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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <g
+         id="g3890"
+         style="fill:#fad647;fill-opacity:1"
+         transform="translate(0.88113641,-4.4056837)">
+        <g
+           id="g3938"
+           style="stroke:url(#linearGradient3952)">
+          <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" />
+          <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" />
+          <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" />
+          <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" />
+          <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" />
+          <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" />
+        </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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Heal.svg b/src/Mod/Draft/Resources/icons/Draft_Heal.svg
index 577ae5678e..64015be6a8 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Heal.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Heal.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Draft_Draft.svg"
+   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"
@@ -23,6 +23,18 @@
    inkscape:export-ydpi="45">
   <defs
      id="defs5823">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3792">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3794" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3796" />
+    </linearGradient>
     <linearGradient
        id="linearGradient4569">
       <stop
@@ -123,6 +135,36 @@
        y1="14.796122"
        x2="49.987103"
        y2="48.776375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3792"
+       id="linearGradient3798"
+       x1="1119.6676"
+       y1="1322.2788"
+       x2="1090.4249"
+       y2="1088.3372"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(3.4352637e-6,14.621356)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4569-7"
+       id="linearGradient4643-6"
+       gradientUnits="userSpaceOnUse"
+       x1="12.932842"
+       y1="14.796122"
+       x2="49.987103"
+       y2="48.776375" />
+    <linearGradient
+       id="linearGradient4569-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4571-5" />
+      <stop
+         style="stop-color:#a9a9a9;stop-opacity:1;"
+         offset="1"
+         id="stop4573-3" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -131,18 +173,43 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="46.282005"
-     inkscape:cy="31.706344"
+     inkscape:zoom="7.2080078"
+     inkscape:cx="23.349075"
+     inkscape:cy="27.194764"
      inkscape:current-layer="g3360"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1057"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -151,7 +218,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -167,29 +234,36 @@
        transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
       <path
          sodipodi:type="arc"
-         style="opacity:0.5506608;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3799-3"
-         sodipodi:cx="32"
-         sodipodi:cy="30"
-         sodipodi:rx="20.727272"
-         sodipodi:ry="20.727272"
-         d="m 52.727272,30 a 20.727272,20.727272 0 1 1 -41.454544,0 20.727272,20.727272 0 1 1 41.454544,0 z"
-         transform="matrix(9.1546703,0,0,9.1546703,837.33363,968.53222)" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:url(#linearGradient4643);fill-opacity:1;fill-rule:evenodd;stroke:#000f53;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"
+         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"
          id="path3799"
          sodipodi:cx="32"
          sodipodi:cy="30"
          sodipodi:rx="20.727272"
          sodipodi:ry="20.727272"
          d="m 52.727272,30 a 20.727272,20.727272 0 1 1 -41.454544,0 20.727272,20.727272 0 1 1 41.454544,0 z"
-         transform="matrix(9.1546706,0,0,9.1546706,802.34686,931.26374)" />
+         transform="matrix(9.5231147,0,0,9.5231147,800.3066,934.2359)" />
       <path
-         style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#530900;stroke-width:8.36640167;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 1061.7831,1066.028 0,101.4426 -101.44255,0 0,68.5 101.44255,0 0,101.4426 68.4999,0 0,-101.4426 101.4427,0 0,-68.5 -101.4427,0 0,-101.4426 -68.4999,0 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"
+         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" />
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccc" />
+      <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" />
+      <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"
+         id="path3799-5"
+         sodipodi:cx="32"
+         sodipodi:cy="30"
+         sodipodi:rx="20.727272"
+         sodipodi:ry="20.727272"
+         d="m 52.727272,30 a 20.727272,20.727272 0 1 1 -41.454544,0 20.727272,20.727272 0 1 1 41.454544,0 z"
+         transform="matrix(8.8176988,0,0,8.8176988,822.8799,955.39837)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Line.svg b/src/Mod/Draft/Resources/icons/Draft_Line.svg
index 796e6e326b..037cad0bfc 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Line.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Line.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,45 +14,12 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="line.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Line.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2728">
-    <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"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       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"
@@ -59,6 +27,46 @@
        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"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -67,17 +75,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="19.138856"
-     inkscape:cy="25.806874"
+     inkscape:zoom="14.501717"
+     inkscape:cx="33.640165"
+     inkscape:cy="34.74811"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="722"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="25" />
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -93,79 +115,50 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
+    <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" />
+    <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" />
     <g
-       id="g4289"
-       transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
+       transform="translate(40.005735,-40.005445)"
+       id="g3827-1">
       <g
-         transform="translate(43.714324,68.714247)"
-         id="g3255">
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9">
         <path
-           id="rect3257"
-           d="M 246.91044,448.95693 C 225.9778,449.54289 208.91959,466.46188 208.4386,487.63259 C 208.32871,492.46948 209.11156,497.11973 210.60424,501.44168 L 52.207293,643.86391 C 45.051985,637.84843 35.757122,634.34569 25.684657,634.61538 C 3.8332069,635.20044 -13.4232,653.40137 -12.838133,675.25285 C -12.253066,697.10429 5.9478825,714.36071 27.799334,713.77564 C 49.650782,713.19057 66.90719,694.98964 66.322124,673.13817 C 66.2475,670.35107 65.871094,667.64635 65.252047,665.03615 L 225.40698,521.03429 C 231.58064,525.34231 239.0547,527.93349 247.13974,528.11719 C 268.99338,528.61369 287.12783,511.29516 287.62434,489.44153 C 288.12084,467.58789 270.80233,449.45343 248.94868,448.95693 C 248.26576,448.94142 247.58568,448.93803 246.91044,448.95693 z"
-           style="opacity:1;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000114;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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
+           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"
+           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
+       transform="translate(0.005735,-0.005445)"
+       id="g3827-1-3">
       <g
-         id="g3242">
-        <rect
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000114;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect2269"
-           width="30.000006"
-           height="330.00009"
-           x="534.10168"
-           y="119.87096"
-           transform="matrix(0.668591,0.7436304,-0.7436304,0.668591,0,0)" />
-        <g
-           id="g3154"
-           transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2162"
-             style="fill:#ffa900;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3134"
-             style="fill:url(#radialGradient4272);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g3160"
-           transform="matrix(-0.999742,-2.2713514e-2,2.2713514e-2,-0.999742,475.0668,1137.8902)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3162"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3164"
-             style="fill:url(#radialGradient4274);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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" />
+        <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"
+           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" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Lock.svg b/src/Mod/Draft/Resources/icons/Draft_Lock.svg
index 06e3c68589..8ba9a94c8a 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Lock.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Lock.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Draft_Finish.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Lock.svg">
   <defs
      id="defs3614">
     <linearGradient
@@ -324,6 +324,100 @@
          offset="1"
          id="stop4284-7" />
     </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"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </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"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
+       id="linearGradient3836-6">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838-7" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </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"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
+       id="linearGradient3836-2">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3838-9" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840-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"
+       x2="56.319412"
+       y2="483.99524" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3838-3" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3840-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3979"
+       x1="89"
+       y1="67"
+       x2="84"
+       y2="49"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-1)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -332,21 +426,43 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.9445436"
-     inkscape:cx="37.240913"
-     inkscape:cy="-11.10556"
+     inkscape:zoom="15.556349"
+     inkscape:cx="39.597192"
+     inkscape:cy="36.790664"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="777"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false"
+     inkscape:snap-global="true"
      inkscape:snap-nodes="true"
-     inkscape:object-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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -355,7 +471,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -364,73 +480,86 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.5625;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 28.389205,7.9886364 c -3.107691,0 -5.625,2.5485586 -5.625,5.6562496 0,1.085407 0.311382,2.077914 0.84375,2.9375 l -13.59375,13.125 c -0.8595865,-0.532368 -1.8833435,-0.84375 -2.9687505,-0.84375 -3.107691,0 -5.625,2.517309 -5.625,5.625 0,3.107691 2.517309,5.625 5.625,5.625 0.291346,0 0.595588,-0.01981 0.875,-0.0625 l 14.4687505,14.625 c -0.07496,0.366302 -0.09375,0.767789 -0.09375,1.15625 0,3.107691 2.517309,5.625 5.625,5.625 3.10769,0 5.625,-2.517309 5.625,-5.625 0,-0.515189 -0.08907,-1.02595 -0.21875,-1.5 l 7.5625,-7.6875 c 1.44889,0.752733 3.03972,1.296697 4.75,1.53125 8.00709,1.098115 15.37064,-4.492914 16.46875,-12.5 1.09811,-8.007086 -4.49291,-15.401885 -12.5,-16.5 -4.07521,-0.558887 -7.99484,0.623091 -11,2.96875 l -5.4375,-5.53125 c 0.53205,-0.859273 0.84375,-1.883343 0.84375,-2.96875 0,-3.107691 -2.51731,-5.6562496 -5.625,-5.6562496 z m -2.28125,10.7499996 c 0.70018,0.312724 1.46484,0.53125 2.28125,0.53125 0.70508,0 1.3782,-0.138342 2,-0.375 l 5.6875,5.8125 c -1.53023,1.965212 -2.60598,4.354802 -2.96875,7 -0.69057,5.035434 1.27209,9.804093 4.8125,12.9375 l -6.625,6.6875 c -0.94189,-0.710233 -2.10446,-1.125 -3.375,-1.125 -1.376473,0 -2.647179,0.491805 -3.625,1.3125 l -13.1875,-13.15625 c 0.969574,-1.010921 1.5625,-2.363665 1.5625,-3.875 0,-0.787112 -0.145648,-1.538504 -0.4375,-2.21875 l 13.875,-13.53125 z"
-       id="rect4425-7"
+       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" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;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="rect4425"
-       width="34.583946"
-       height="3.5998166"
-       x="26.779446"
-       y="-15.409233"
-       transform="matrix(0.69977942,0.71435899,-0.71435899,0.69977942,0,0)" />
     <path
-       id="path4235-8"
-       style="fill:#ffffff;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
-       d="M 51.088219,32.609591 28.222994,55.817606 4.2513883,31.570426 29.329376,7.3232466 31.568077,9.701098 9.0978561,31.621409 28.245092,50.724986 48.50255,30.21124 z"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
+       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"
+       id="path3981-1"
+       inkscape:connector-curvature="0" />
     <g
-       id="g4327"
-       transform="matrix(1.0803489,0,0,1.0803489,-5.9760819,-8.3209228)">
-      <path
-         transform="matrix(0.13587109,-0.99072652,0.99072652,0.13587109,7.1263136,81.286094)"
-         d="m 65.272727,36.272728 a 13.545455,13.545455 0 1 1 -27.09091,0 13.545455,13.545455 0 1 1 27.09091,0 z"
-         sodipodi:ry="13.545455"
-         sodipodi:rx="13.545455"
-         sodipodi:cy="36.272728"
-         sodipodi:cx="51.727272"
-         id="path4278"
-         style="color:#000000;fill:url(#linearGradient4331);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
+       style="stroke:#3465a4;stroke-width:2.12214079"
+       id="g4312"
+       transform="matrix(0.94235513,0.01446014,-0.01446079,0.94231206,-148.41745,-195.06938)">
+      <g
+         style="stroke:#3465a4;stroke-width:14.15507818"
+         transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
+         id="g4248">
+        <g
+           transform="translate(-3.7314339,-3.2817175)"
+           id="g3906"
+           style="stroke-width:14.15507818">
+          <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"
+             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" />
+          <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"
+             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" />
+          <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"
+             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" />
+          <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"
+             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" />
+          <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"
+             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" />
+          <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"
+             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" />
+        </g>
+      </g>
     </g>
     <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#3f81f9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.97554541;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4292"
-       sodipodi:cx="11.056579"
-       sodipodi:cy="36.229988"
-       sodipodi:rx="7.4567623"
-       sodipodi:ry="7.4567623"
-       d="m 18.513341,36.229988 a 7.4567623,7.4567623 0 1 1 -14.9135247,0 7.4567623,7.4567623 0 1 1 14.9135247,0 z"
-       transform="matrix(0.75461342,0,0,0.75461342,-0.77038182,2.9275619)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#3f81f9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.97554541;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4292-3"
-       sodipodi:cx="11.056579"
-       sodipodi:cy="36.229988"
-       sodipodi:rx="7.4567623"
-       sodipodi:ry="7.4567623"
-       d="m 18.513341,36.229988 a 7.4567623,7.4567623 0 1 1 -14.9135247,0 7.4567623,7.4567623 0 1 1 14.9135247,0 z"
-       transform="matrix(0.75461342,0,0,0.75461342,20.560933,-17.934934)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:#3f81f9;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.97554541;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4292-35"
-       sodipodi:cx="11.056579"
-       sodipodi:cy="36.229988"
-       sodipodi:rx="7.4567623"
-       sodipodi:ry="7.4567623"
-       d="m 18.513341,36.229988 a 7.4567623,7.4567623 0 1 1 -14.9135247,0 7.4567623,7.4567623 0 1 1 14.9135247,0 z"
-       transform="matrix(0.75461342,0,0,0.75461342,20.092113,24.258877)" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2.16735911;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 48.43322,17.751552 c -3.571667,-1e-6 -6.482061,2.903751 -6.551623,6.511178 l 0,0.134808 0,4.205978 -1.334595,0 0,9.349478 15.893753,0 0,-9.349478 -1.442442,0 0,-4.381228 -0.01344,0 c -0.09341,-3.591952 -2.995875,-6.470734 -6.551612,-6.470736 z m 0.01519,3.926805 c 1.874434,0 3.395139,1.508085 3.445859,3.401245 l 0.01112,0 0,3.523914 -6.914014,0 0,-3.590824 c 0,-1.857629 1.606701,-3.334335 3.457012,-3.334335 z"
-       id="path2387"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccccccccccsssccccsss" />
+       style="fill:#3465a4;fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       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" />
+    <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"
+       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" />
+    <g
+       id="g3201"
+       transform="translate(-41,-27)"
+       style="fill:#eeeeec;stroke:#000000;stroke-linejoin:round">
+      <path
+         sodipodi:nodetypes="cccczccccc"
+         inkscape:connector-curvature="0"
+         id="path3195"
+         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" />
+      <path
+         sodipodi:nodetypes="ccczcc"
+         inkscape:connector-curvature="0"
+         id="path3199"
+         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" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Macro.svg b/src/Mod/Draft/Resources/icons/Draft_Macro.svg
index 2b1d9c7a8f..ad44d67982 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Macro.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Macro.svg
@@ -14,10 +14,21 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Draft_SwitchMode.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Macro.svg">
   <defs
      id="defs3614">
+    <linearGradient
+       id="linearGradient3814">
+      <stop
+         id="stop3816"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3818"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -299,15 +310,36 @@
          id="stop4251" />
     </linearGradient>
     <linearGradient
-       y2="140.22731"
-       x2="434.73947"
-       y1="185.1304"
-       x1="394.15784"
+       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="#linearGradient4247"
+       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)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5087-1"
+       xlink:href="#linearGradient3814-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3814-7">
+      <stop
+         id="stop3816-4"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3818-0"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -316,18 +348,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="11"
+     inkscape:cx="37.250679"
+     inkscape:cy="36.614065"
+     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="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-x="2479"
+     inkscape:window-y="150"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3044"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -336,7 +377,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -348,15 +389,17 @@
        id="g4293"
        transform="translate(-384.19864,-132.64563)">
       <path
-         sodipodi:nodetypes="ccccccccccccccccccccccc"
-         id="path3464-0"
-         d="m 417.58096,193.99996 c -3.4546,-0.68767 -1.70811,-4.91638 -2.05666,-7.32801 0,-5.6534 0,-11.30679 0,-16.96019 -4.50577,-0.86165 -9.84166,-2.22 -11.9539,-6.77496 -2.72956,-5.54115 -1.35551,-11.92711 0.17812,-17.59973 -0.0103,-3.8736 5.57607,-3.44474 5.96762,0.0651 0.59623,2.65976 3.76412,3.47599 4.80246,0.66125 0.819,-2.61227 4.23315,-5.19431 5.99086,-1.77888 0.87842,2.2217 4.22883,5.19734 5.49859,1.61725 0.26415,-2.89738 4.61289,-5.09936 5.86169,-1.63205 2.39753,6.48582 2.81741,14.3034 -1.02265,20.34483 -1.76379,3.3535 -5.79612,3.82172 -8.89294,5.30016 -1.15305,3.9297 -0.69766,8.47823 -0.78402,12.63535 0.85692,3.44319 3.29234,-0.64758 4.6381,-1.59441 5.44186,-5.15347 10.39349,-10.8246 16.15617,-15.63645 1.69444,5.88935 0.9592,12.22722 -0.70226,18.0314 C 437.0121,193.39918 427.15576,194.64838 417.58096,194 l 0,-2e-5 z m -24.24428,-10.43528 c -0.10652,-5.83274 -0.18291,-11.67244 0.1374,-17.50022 5.68341,1.92851 14.01168,11.29481 18.47927,15.78482 0.69829,3.71944 1.34067,7.93361 -0.79895,11.32148 -6.98562,1.37087 -14.09619,-4.22557 -17.81772,-9.60608 z"
-         style="opacity:0.60305343;fill:#000000;fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccccccccccccccccccccc"
+         sodipodi:nodetypes="ccczzzzzzzzczzczcczzccz"
          id="path3464"
-         d="m 413.76495,188.42941 c -3.4546,-0.68767 -1.70811,-4.91638 -2.05666,-7.32801 0,-5.6534 0,-11.30679 0,-16.96019 -4.50577,-0.86165 -9.84166,-2.22 -11.9539,-6.77496 -2.72956,-5.54115 -1.35551,-11.92711 0.17812,-17.59973 -0.0103,-3.8736 5.57607,-3.44474 5.96762,0.0651 0.59623,2.65976 3.76412,3.47599 4.80246,0.66125 0.819,-2.61227 4.23315,-5.19431 5.99086,-1.77888 0.87842,2.2217 4.22883,5.19734 5.49859,1.61725 0.26415,-2.89738 4.61289,-5.09936 5.86169,-1.63205 2.39753,6.48582 2.81741,14.3034 -1.02265,20.34483 -1.76379,3.3535 -5.79612,3.82172 -8.89294,5.30016 -1.15305,3.9297 -0.69766,8.47823 -0.78402,12.63535 0.85692,3.44319 3.29234,-0.64758 4.6381,-1.59441 5.44186,-5.15347 10.39349,-10.8246 16.15617,-15.63645 1.69444,5.88935 0.9592,12.22722 -0.70226,18.0314 -4.25004,10.04856 -14.10638,11.29776 -23.68118,10.64938 l 0,-2e-5 z m -24.24428,-10.43528 c -0.10652,-5.83274 -0.18291,-11.67244 0.1374,-17.50022 5.68341,1.92851 14.01168,11.29481 18.47927,15.78482 0.69829,3.71944 1.34067,7.93361 -0.79895,11.32148 -6.98562,1.37087 -14.09619,-4.22557 -17.81772,-9.60608 z"
-         style="fill:url(#linearGradient5087);fill-opacity:1;stroke:#154b00;stroke-width:2.82695484;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         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" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Mirror.svg b/src/Mod/Draft/Resources/icons/Draft_Mirror.svg
index 6421b5efa2..790e164c3b 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Mirror.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Mirror.svg
@@ -14,12 +14,36 @@
    height="64px"
    id="svg2766"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Mirror.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2768">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4087">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4089" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop4091" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4004">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4006" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop4008" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3787">
       <stop
@@ -49,16 +73,6 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2774" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient4195"
-       x1="33.863636"
-       y1="62.454544"
-       x2="33.590908"
-       y2="2.0909081"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-2.1818182,-0.18181818)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3787"
@@ -71,24 +85,214 @@
        gradientTransform="matrix(1.0614931,0,0,1,-617.05296,-100.11156)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient4229"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0663257,0,0,0.63511735,-694.0785,-10.579799)"
-       x1="660.59497"
-       y1="94.477272"
-       x2="669.62323"
-       y2="36.649147" />
+       xlink:href="#linearGradient4004"
+       id="linearGradient4010"
+       x1="18.199173"
+       y1="47.870518"
+       x2="16"
+       y2="28"
+       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient4229-7"
+       xlink:href="#linearGradient4004-9"
+       id="linearGradient4010-0"
+       x1="18.199173"
+       y1="47.870518"
+       x2="14.614764"
+       y2="23.571756"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4004-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop4006-4" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop4008-8" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(-1,0,0,1,64,6.1e-7)"
+       y2="27"
+       x2="21"
+       y1="48"
+       x1="14"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0663257,0,0,0.63511735,758.22943,-10.579799)"
-       x1="660.59497"
-       y1="94.477272"
-       x2="669.62323"
-       y2="36.649147" />
+       id="linearGradient4028"
+       xlink:href="#linearGradient4004-9"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4087"
+       id="linearGradient4093"
+       x1="37"
+       y1="53"
+       x2="27"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3856"
+       id="linearGradient3862"
+       x1="613.25824"
+       y1="135.1946"
+       x2="595.35895"
+       y2="68.194603"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3856">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3858" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3860" />
+    </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"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3040-5"
+       xlink:href="#linearGradient3856-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3856-1">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3858-7" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3860-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" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3856-7">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3858-6" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3860-14" />
+    </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" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3856-2">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3858-1" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3860-6" />
+    </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"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3040-7"
+       xlink:href="#linearGradient3856-6"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3856-6">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3858-18" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3860-9" />
+    </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" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3856-2-7">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3858-1-9" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3860-6-5" />
+    </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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -97,19 +301,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="42.445645"
-     inkscape:cy="22.613414"
+     inkscape:zoom="11"
+     inkscape:cx="40.331916"
+     inkscape:cy="0.67979615"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1053"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:object-paths="true"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2996"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2771">
     <rdf:RDF>
@@ -118,7 +331,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -127,21 +340,74 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:none;fill-rule:evenodd;stroke:url(#linearGradient4195);stroke-width:5.5999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:5.5999999,5.5999999;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 31.454546,1.2727273 0,61.2727277"
-       id="path4187"
+       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" />
     <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;fill:url(#linearGradient4229);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.06983113;stroke-linecap:butt;stroke-linejoin:miter;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 3.6583237,49.424356 20.0910513,0 0,-0.121565 0.03139,0 0,-36.60608 z"
-       id="rect4197"
+       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="cccccc" />
+       sodipodi:nodetypes="cccc" />
     <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" />
+    <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"
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient4229-7);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.06983113;stroke-linecap:butt;stroke-linejoin:miter;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 60.4926,49.424356 -20.091052,0 0,-0.121565 -0.03139,0 0,-36.60608 z"
-       id="rect4197-8"
-       sodipodi:nodetypes="cccccc" />
+       sodipodi:nodetypes="cccc" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Move.svg b/src/Mod/Draft/Resources/icons/Draft_Move.svg
index 8ad236fbe6..ea0edbd8e2 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Move.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Move.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,9 +14,10 @@
    height="64px"
    id="svg2963"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="move.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Move.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2965">
     <linearGradient
@@ -29,15 +31,6 @@
          offset="1"
          id="stop3358" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3354"
-       id="linearGradient3376"
-       x1="1634.3081"
-       y1="1218.0156"
-       x2="2032.5356"
-       y2="1218.0156"
-       gradientUnits="userSpaceOnUse" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -45,6 +38,148 @@
        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" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </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" />
+    <linearGradient
+       id="linearGradient3895-6">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897-7" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899-5" />
+    </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" />
+    <linearGradient
+       id="linearGradient3895-6-2">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897-7-9" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899-5-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" />
+    <linearGradient
+       id="linearGradient3895-9">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897-3" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899-6" />
+    </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"
+       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"
+       x2="45.482754"
+       y2="52.400002" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895-9"
+       id="linearGradient3936"
+       x1="20"
+       y1="12"
+       x2="44"
+       y2="52"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895-9"
+       id="linearGradient3944"
+       x1="20"
+       y1="12"
+       x2="44"
+       y2="52"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -53,17 +188,40 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.9445436"
-     inkscape:cx="25.927063"
-     inkscape:cy="1.8247675"
+     inkscape:zoom="15.556349"
+     inkscape:cx="32.081922"
+     inkscape:cy="32.974481"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="722"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="25" />
+     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>
   <metadata
      id="metadata2968">
     <rdf:RDF>
@@ -79,20 +237,97 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
+    <rect
+       style="fill:url(#linearGradient3936);fill-opacity:1;stroke:none"
+       id="rect3126"
+       width="12"
+       height="6"
+       x="26"
+       y="29" />
+    <rect
+       style="fill:url(#linearGradient3944);fill-opacity:1;stroke:none"
+       id="rect3126-2"
+       width="6"
+       height="11.999999"
+       x="29"
+       y="26" />
     <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)">
-      <path
-         id="path3378"
-         d="M 1857.8214,1052.335 L 1775.2276,1127.7724 L 1827.8526,1127.7724 L 1827.8526,1214.0224 L 1810.1338,1214.0224 L 1810.1338,1214.46 L 1734.0401,1214.46 L 1734.0401,1162.3974 L 1658.6026,1245.0224 L 1734.0401,1327.6162 L 1734.0401,1274.9912 L 1827.8526,1274.9912 L 1827.8526,1288.1474 L 1828.2901,1288.1474 L 1828.2901,1364.2412 L 1776.2276,1364.2412 L 1858.8526,1439.6787 L 1941.4464,1364.2412 L 1888.8214,1364.2412 L 1888.8214,1274.9912 L 1894.4464,1274.9912 L 1894.4464,1274.5537 L 1970.5088,1274.5537 L 1970.5088,1326.6162 L 2045.9464,1243.9912 L 1970.5088,1161.3974 L 1970.5088,1214.0224 L 1888.8214,1214.0224 L 1888.8214,1203.835 L 1888.3838,1203.835 L 1888.3838,1127.7724 L 1940.4464,1127.7724 L 1857.8214,1052.335 z"
-         style="fill:#000000;fill-opacity:0.56796115;fill-rule:evenodd;stroke:none;stroke-width:10.88381958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         id="path2385"
-         d="M 1838.9688,1024.3438 L 1756.375,1099.7812 L 1809,1099.7812 L 1809,1186.0312 L 1791.2812,1186.0312 L 1791.2812,1186.4688 L 1715.1875,1186.4688 L 1715.1875,1134.4062 L 1639.75,1217.0312 L 1715.1875,1299.625 L 1715.1875,1247 L 1809,1247 L 1809,1260.1562 L 1809.4375,1260.1562 L 1809.4375,1336.25 L 1757.375,1336.25 L 1840,1411.6875 L 1922.5938,1336.25 L 1869.9688,1336.25 L 1869.9688,1247 L 1875.5938,1247 L 1875.5938,1246.5625 L 1951.6562,1246.5625 L 1951.6562,1298.625 L 2027.0938,1216 L 1951.6562,1133.4062 L 1951.6562,1186.0312 L 1869.9688,1186.0312 L 1869.9688,1175.8438 L 1869.5312,1175.8438 L 1869.5312,1099.7812 L 1921.5938,1099.7812 L 1838.9688,1024.3438 z"
-         style="fill:url(#linearGradient3376);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:10.88381958;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
+       transform="matrix(0.1378133,0,0,0.1378133,-221.39699,-138.35275)" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Offset.svg b/src/Mod/Draft/Resources/icons/Draft_Offset.svg
index 89c7439a9f..fae800bc25 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Offset.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Offset.svg
@@ -14,12 +14,24 @@
    height="64px"
    id="svg3136"
    sodipodi:version="0.32"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="Draft_Offset.not.svg.zip"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Offset.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs3138">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3802">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3804" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop3806" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3841">
       <stop
@@ -31,15 +43,6 @@
          offset="1"
          id="stop3845" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3841"
-       id="linearGradient4235"
-       x1="8"
-       y1="31.75"
-       x2="52"
-       y2="31.75"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3841"
@@ -48,7 +51,8 @@
        y1="31.75"
        x2="37"
        y2="31.75"
-       gradientUnits="userSpaceOnUse" />
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,0)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3841"
@@ -59,6 +63,38 @@
        y1="2560.25"
        x2="1270.7085"
        y2="2560.25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3802"
+       id="linearGradient3808"
+       x1="29"
+       y1="4"
+       x2="44"
+       y2="56"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(1,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3802-5"
+       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)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3802-5">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3804-3" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop3806-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -67,23 +103,40 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="27.631036"
-     inkscape:cy="28.001052"
+     inkscape:zoom="7.9999999"
+     inkscape:cx="11.246032"
+     inkscape:cy="21.99235"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="941"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="30"
+     inkscape:window-y="27"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-maximized="1">
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true">
     <inkscape:grid
        type="xygrid"
-       id="grid4167" />
+       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>
   <metadata
      id="metadata3141">
@@ -93,7 +146,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -102,34 +155,40 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       id="path4210"
-       style="opacity:0.6;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 31,43 c 4.14214,0 7.5,-3.357865 7.5,-7.5 l 0,-10 -12.5,0 -6.25,6.25 M 8.5,20.500001 18.5,10.5 l 35,0 0,25 C 53.5,47.926406 43.426408,58 31,58"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csccccccsc" />
-    <path
-       id="path4173"
-       style="color:#000000;fill:none;stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 7,18.000001 10,-10.0000012 35,0 L 52,33 C 52,45.426406 41.926408,55.5 29.5,55.5"
+       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
-       id="path4198"
-       style="fill:none;stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 29.5,40.5 c 4.14214,0 7.5,-3.357865 7.5,-7.5 l 0,-10 -12.5,0 -6.25,6.25"
+       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"
+       id="path2996-3"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       sodipodi:nodetypes="ccccc"
+       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"
-       d="m 29.5,40.5 c 4.14214,0 7.5,-3.357865 7.5,-7.5 l 0,-10 -12.5,0 -6.25,6.25"
-       style="fill:none;stroke:url(#linearGradient4243);stroke-width:4;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="path4217" />
+       sodipodi:nodetypes="cccccc" />
     <path
-       sodipodi:nodetypes="ccccc"
+       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"
-       d="m 7,18.000001 10,-10.0000012 35,0 L 52,33 C 52,45.426406 41.926408,55.5 29.5,55.5"
-       style="color:#000000;fill:none;stroke:url(#linearGradient4235);stroke-width:4;stroke-linecap:square;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4219" />
+       sodipodi:nodetypes="ccccc" />
+    <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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_PathArray.svg b/src/Mod/Draft/Resources/icons/Draft_PathArray.svg
index 17b0eb3076..c61b9147dd 100644
--- a/src/Mod/Draft/Resources/icons/Draft_PathArray.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_PathArray.svg
@@ -15,8 +15,8 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Draft_PathArray5.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_PathArray.svg">
   <defs
      id="defs3614">
     <inkscape:path-effect
@@ -768,6 +768,147 @@
          offset="1"
          style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791-6"
+       id="linearGradient3797-3"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791-6">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793-7" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795-5" />
+    </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"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791"
+       id="linearGradient3896"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791-7"
+       id="linearGradient3797-36"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791-7">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793-5" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791-6-9"
+       id="linearGradient3797-3-0"
+       x1="939.98767"
+       y1="1097.5122"
+       x2="893.2572"
+       y2="989.77716"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791-6-9">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793-7-3" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795-5-6" />
+    </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" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791-6-0"
+       id="linearGradient3797-3-2"
+       x1="896.17792"
+       y1="1050.1741"
+       x2="937.06708"
+       y2="1030.5859"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791-6-0">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3793-7-2" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3795-5-3" />
+    </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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -776,18 +917,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.796875"
-     inkscape:cx="19.92674"
-     inkscape:cy="32.039072"
+     inkscape:zoom="11.85882"
+     inkscape:cx="38.168286"
+     inkscape:cy="31.314285"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="1004"
-     inkscape:window-x="1278"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -796,7 +948,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -805,42 +957,114 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="fill:none;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 11.643467,48.840049 C 18.389575,48.374858 30.860463,51.191417 30.554335,28.678877 31.065714,12.333935 39.668071,14.445035 52.669109,14.456655"
-       id="path4713"
+       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"
+       id="path3347-1"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccc" />
     <g
-       id="g3359"
-       style="fill:#000ff0;fill-opacity:0">
+       transform="matrix(0.11724541,0,0,0.12538745,-103.41875,-91.213827)"
+       id="g3799-3">
       <g
-         id="g3328"
-         style="fill:#000ff0;fill-opacity:0">
-        <path
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccssccssc"
-           id="path4424-5"
-           d="m 15.755452,48.509925 -0.243165,5.781814 c 0,0 13.285739,2.119706 18.190444,-6.375493 5.32376,-9.221022 -2.386926,-14.102164 2.502438,-22.09605 5.3018,-8.668187 16.389586,-8.280516 16.389586,-8.280516 l -1.949688,-6.170781 c 0,0 -14.081886,0.948882 -19.910711,10.694183 -5.572451,9.316648 1.356037,16.752035 -1.659148,21.974489 -3.337784,5.781191 -13.166787,4.374983 -13.319756,4.472354 z"
-           style="opacity:0.59999999999999998;fill:#000ff0;fill-opacity:0;stroke:none" />
+         id="g3956-5">
+        <g
+           id="g3812-6"
+           transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
+           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1">
+          <rect
+             y="983.79187"
+             x="887.41589"
+             height="119.7056"
+             width="58.413097"
+             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" />
+        </g>
+        <g
+           id="g3812-0-9"
+           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">
+          <rect
+             y="983.79187"
+             x="887.41589"
+             height="119.7056"
+             width="58.413097"
+             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" />
+        </g>
       </g>
+    </g>
+    <g
+       transform="matrix(0.11724541,0,0,0.12538745,-57.418732,-125.21383)"
+       id="g3799-3-2">
       <g
-         id="g3354"
-         style="fill:#000ff0;fill-opacity:0" />
+         id="g3956-5-6">
+        <g
+           id="g3812-6-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">
+          <rect
+             y="983.79187"
+             x="887.41589"
+             height="119.7056"
+             width="58.413097"
+             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" />
+        </g>
+        <g
+           id="g3812-0-9-7"
+           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">
+          <rect
+             y="983.79187"
+             x="887.41589"
+             height="119.7056"
+             width="58.413097"
+             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" />
+        </g>
+      </g>
     </g>
-    <path
-       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 39.424491,24.109036 -19.145299,-0.0032 -0.0016,9.689865 19.145299,0.0032 z"
-       id="path4676"
-       inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
-       id="path4678"
-       d="m 6.9548234,38.915751 0,19.145299 9.6898656,0 0,-19.145299 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" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4680"
-       d="m 47.5116,5.0012206 0,19.1452994 9.689865,0 0,-19.1452994 z"
+       id="path4678-5"
+       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" />
+    <g
+       transform="matrix(0,-0.11724541,0.12538745,0,-107.21383,143.41875)"
+       id="g3799-3-9">
+      <g
+         id="g3956-5-2">
+        <g
+           id="g3812-6-2"
+           transform="matrix(1.7521655,0,0,1.4657307,-647.24141,-419.43277)"
+           style="fill:#3465a4;stroke:#0b1521;stroke-width:10.29296303;stroke-opacity:1">
+          <rect
+             y="983.79187"
+             x="887.41589"
+             height="119.7056"
+             width="58.413097"
+             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" />
+        </g>
+        <g
+           id="g3812-0-9-73"
+           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">
+          <rect
+             y="983.79187"
+             x="887.41589"
+             height="119.7056"
+             width="58.413097"
+             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" />
+        </g>
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Point.svg b/src/Mod/Draft/Resources/icons/Draft_Point.svg
index 1b3d98e445..1eeb98f5e6 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Point.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Point.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Point.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -149,6 +149,26 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -157,18 +177,39 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.75"
-     inkscape:cx="-18.446295"
-     inkscape:cy="20.906021"
+     inkscape:zoom="11"
+     inkscape:cx="43.835579"
+     inkscape:cy="19.833559"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
-     inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -177,7 +218,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -185,25 +226,23 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff9500;fill-opacity:1;stroke:#000000;stroke-width:5.80000019000000044;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path2333"
-       sodipodi:cx="197.14285"
-       sodipodi:cy="655.2193"
-       sodipodi:rx="48.57143"
-       sodipodi:ry="48.57143"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       transform="matrix(-0.26657259,0.00713741,-0.00713741,-0.26657259,87.746907,205.06229)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3205);fill-opacity:1;stroke:none"
-       id="path2335"
-       sodipodi:cx="225.26402"
-       sodipodi:cy="672.79736"
-       sodipodi:rx="34.345188"
-       sodipodi:ry="23.991123"
-       d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-       transform="matrix(-0.22318904,0.14594017,-0.14594017,-0.22318904,176.50544,145.54681)" />
+    <g
+       transform="translate(20.005735,-20)"
+       id="g3827-1">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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
+           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"
+           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>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Polygon.svg b/src/Mod/Draft/Resources/icons/Draft_Polygon.svg
index e581a067be..0c9371b4b6 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Polygon.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Polygon.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Polygon.svg">
   <defs
      id="defs3614">
@@ -32,40 +32,46 @@
        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"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
-       id="linearGradient3144-3"
-       inkscape:collect="always">
-      <stop
-         id="stop3146-0"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop3148-1"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3598"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-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" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -75,17 +81,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:cx="16.834788"
+     inkscape:cy="29.583381"
      inkscape:current-layer="g3448"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
-     inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -106,66 +123,88 @@
        transform="translate(0.86678264,-132.17127)"
        id="g3448">
       <path
-         id="path3454-7"
-         d="m 59.32375,167.00214 c -0.10652,-3.97835 -3.37958,-7.13292 -7.34375,-7.09375 l -10.6875,-18.46875 -30.78125,6.53125 -3.28125,31.3125 28.75,12.78125 15.875,-17.625 c 0.12445,0.003 0.24915,0.0346 0.375,0.0312 4.02023,-0.10764 7.20139,-3.44853 7.09375,-7.46875 z m -12,-5.375 c -1.62037,1.37863 -2.62388,3.4577 -2.5625,5.75 0.0557,2.08099 1.00195,3.92959 2.4375,5.21875 l -12.125,13.5 -21.96875,-9.78125 2.5,-23.90625 23.53125,-5 8.1875,14.21875 z m -9.875,4.875 c 0.0913,-4.02063 -3.10437,-7.37741 -7.125,-7.46875 -4.02063,-0.0914 -7.34615,3.10437 -7.4375,7.125 -0.0913,4.02063 3.07312,7.34615 7.09375,7.4375 4.02063,0.0914 7.3774,-3.07312 7.46875,-7.09375 z"
-         style="opacity:0.60305343;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.14992082;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         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"
+         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" />
       <path
-         id="path3454"
-         d="m 54.64154,164.68964 c 0,0 -7.239927,-12.52622 -9.864927,-17.06789 -2.625,-4.54167 -5.885073,-10.18211 -5.885073,-10.18211 0,0 -10.825502,2.29698 -15.95571,3.38553 -5.130208,1.08854 -14.82554,3.14572 -14.82554,3.14572 l -3.2812502,31.3125 c 0,0 9.5063062,4.22617 14.2979732,6.35638 4.791667,2.13021 14.452027,6.42487 14.452027,6.42487 z m -5.90625,-0.46875 c 0,0 -5.610999,6.24415 -8.288083,9.22331 -2.677083,2.97917 -7.774417,8.65169 -7.774417,8.65169 l -21.96875,-9.78125 c 0,0 0.914326,-8.74324 1.330992,-12.72761 0.416667,-3.98438 1.169008,-11.17864 1.169008,-11.17864 0,0 7.461865,-1.58552 11.38374,-2.41886 3.921875,-0.83333 12.14751,-2.58114 12.14751,-2.58114 z"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.59619784;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="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"
+         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" />
+      <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="czczcczccczcczczcc" />
+         sodipodi:nodetypes="ccc" />
+      <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" />
       <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.00401265,-0.1498671,0.1498671,-0.00401265,-47.77454,195.34725)"
-         id="g3154-2">
-        <path
-           sodipodi:type="arc"
-           style="fill:#ffa900;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path2162-5"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           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" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3600);fill-opacity:1;stroke:none"
-           id="path3134-7"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+         transform="translate(39.138953,108.17127)"
+         id="g3827-1-3">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             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" />
+          <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"
+             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" />
+        </g>
       </g>
       <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.00340523,-0.14988214,0.14988214,0.00340523,-71.13271,189.63388)"
-         id="g3160-4">
-        <path
-           sodipodi:type="arc"
-           style="fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;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="path3162-9"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           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" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3598);fill-opacity:1;stroke:none"
-           id="path3164-9"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+         transform="translate(15.138953,113.17127)"
+         id="g3827-1-3-4">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5-8">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             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" />
+          <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"
+             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" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Rectangle.svg b/src/Mod/Draft/Resources/icons/Draft_Rectangle.svg
old mode 100755
new mode 100644
index 9fffac0c6c..83f138aaa2
--- a/src/Mod/Draft/Resources/icons/Draft_Rectangle.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Rectangle.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,45 +14,12 @@
    height="64px"
    id="svg2825"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="rectangle.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Rectangle.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2827">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2229"
-       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">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2215"
-       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"
@@ -59,6 +27,46 @@
        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"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -67,17 +75,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.75"
-     inkscape:cx="35.277161"
-     inkscape:cy="23.395671"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="44.209268"
+     inkscape:cy="16.544987"
+     inkscape:current-layer="g3527"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="722"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2830">
     <rdf:RDF>
@@ -98,66 +117,61 @@
        inkscape:export-xdpi="6.5895667"
        inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
        id="g3527"
-       transform="matrix(0.1367702,0,0,0.1367702,-125.84674,-47.962092)">
-      <path
-         style="opacity:0.56084744;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 1325.7276,414.66071 C 1303.3778,414.66071 1284.5351,429.78547 1278.8839,450.34821 L 993.13393,450.34821 L 993.13393,685.56696 C 974.47613,692.34696 961.13393,710.23195 961.13393,731.22321 C 961.13393,758.03464 982.91623,779.78571 1009.7276,779.78571 C 1031.3589,779.78571 1049.6658,765.62019 1055.9464,746.06696 L 1340.2902,746.06696 L 1340.2902,509.56696 C 1359.9944,503.37596 1374.2902,484.96212 1374.2902,463.22321 C 1374.2902,436.41179 1352.5391,414.66071 1325.7276,414.66071 z M 1025.3214,482.87946 L 1281.2902,482.87946 C 1286.2964,494.17047 1295.4855,503.20013 1306.8839,508.00446 L 1306.8839,713.62946 L 1054.9776,713.62946 C 1049.7913,700.30906 1038.9165,689.8362 1025.3214,685.22321 L 1025.3214,482.87946 z"
-         id="path2734" />
+       transform="matrix(0.12582859,0,0,0.13656891,-113.21901,-47.81056)">
       <path
          id="rect2233"
-         d="M 968.5625,425.21875 L 968.5625,720.9375 L 1315.7188,720.9375 L 1315.7188,425.21875 L 968.5625,425.21875 z M 1000.75,457.75 L 1282.3125,457.75 L 1282.3125,688.5 L 1000.75,688.5 L 1000.75,457.75 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         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" />
+      <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"
+         id="path3040"
+         inkscape:connector-curvature="0"
+         transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+         sodipodi:nodetypes="ccc" />
+      <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" />
+    </g>
+    <g
+       transform="translate(40.005735,-40.005445)"
+       id="g3827-1">
       <g
-         inkscape:export-ydpi="6.5019679"
-         inkscape:export-xdpi="6.5019679"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
-         transform="matrix(-1,0,0,-1,1182.2857,1361.2958)"
-         id="g2209">
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9">
         <path
-           sodipodi:type="arc"
-           style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path2211"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z" />
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient2215);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path2213"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+           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"
+           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
+       id="g3827-1-3">
       <g
-         inkscape:export-ydpi="6.5019679"
-         inkscape:export-xdpi="6.5019679"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
-         transform="matrix(-1,0,0,-1,1498.2857,1093.2958)"
-         id="g2217">
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-5">
         <path
-           sodipodi:type="arc"
-           style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path2219"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z" />
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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" />
         <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient2229);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path2221"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+           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"
+           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" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Rotate.svg b/src/Mod/Draft/Resources/icons/Draft_Rotate.svg
old mode 100755
new mode 100644
index 0d4f0e82ce..62d013a3be
--- a/src/Mod/Draft/Resources/icons/Draft_Rotate.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Rotate.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,19 +14,20 @@
    height="64px"
    id="svg3000"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="rotate.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Rotate.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs3002">
     <linearGradient
        id="linearGradient3393">
       <stop
-         style="stop-color:#003ddd;stop-opacity:1;"
+         style="stop-color:#204a87;stop-opacity:1"
          offset="0"
          id="stop3395" />
       <stop
-         style="stop-color:#639ef0;stop-opacity:1;"
+         style="stop-color:#729fcf;stop-opacity:1"
          offset="1"
          id="stop3397" />
     </linearGradient>
@@ -33,12 +35,12 @@
        inkscape:collect="always"
        xlink:href="#linearGradient3393"
        id="linearGradient3399"
-       x1="1669.7315"
-       y1="1726.0585"
-       x2="2067.1701"
-       y2="1726.0585"
+       x1="1942.7382"
+       y1="1934.756"
+       x2="1809.5021"
+       y2="1547.4135"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9135837,0,0,0.9135837,138.63723,130.60625)" />
+       gradientTransform="matrix(0.98657811,0,0,0.99922078,20.129251,-2.6811697)" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -46,6 +48,27 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective3008" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3393-7"
+       id="linearGradient3399-1"
+       x1="1669.7314"
+       y1="1726.0585"
+       x2="2067.1702"
+       y2="1726.0585"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.98657811,0,0,0.99922078,20.129251,-2.6811697)" />
+    <linearGradient
+       id="linearGradient3393-7">
+      <stop
+         style="stop-color:#003ddd;stop-opacity:1;"
+         offset="0"
+         id="stop3395-4" />
+      <stop
+         style="stop-color:#639ef0;stop-opacity:1;"
+         offset="1"
+         id="stop3397-0" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -54,17 +77,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.9445436"
-     inkscape:cx="34.762141"
-     inkscape:cy="26.807556"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="15.556349"
+     inkscape:cx="47.837373"
+     inkscape:cy="25.002094"
+     inkscape:current-layer="g3405"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="722"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata3005">
     <rdf:RDF>
@@ -83,14 +118,18 @@
     <g
        id="g3405"
        transform="matrix(0.1369365,0,0,0.1369365,-222.21754,-203.36512)">
-      <path
-         id="path3401"
-         d="M 1699.9407,1805.7444 C 1727.4912,1898.9303 1825.4774,1952.198 1918.6632,1924.6476 C 2011.849,1897.097 2065.1168,1799.1109 2037.5663,1705.9251 C 2023.0472,1656.8161 1988.9697,1618.8019 1946.3408,1597.8543 L 1967.1674,1550.583 L 1795.4978,1576.3295 L 1895.824,1712.4633 L 1920.1276,1657.3166 C 1946.9049,1671.1549 1968.2283,1695.4493 1977.4435,1726.6181 C 1995.384,1787.2999 1960.7015,1851.0989 1900.0195,1869.0395 C 1839.3375,1886.9801 1775.5113,1852.3055 1757.5707,1791.6237 C 1752.4375,1774.2611 1751.6305,1756.6547 1754.493,1739.9281 L 1695.2911,1725.8738 C 1690.8003,1751.704 1692.0084,1778.9144 1699.9407,1805.7444 z"
-         style="opacity:1;fill:#000000;fill-opacity:0.56310676;fill-rule:evenodd;stroke:none;stroke-width:10.96300411;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
          id="path2396"
-         d="M 1676.8023,1772.0039 C 1704.3528,1865.1898 1802.339,1918.4575 1895.5248,1890.9071 C 1988.7106,1863.3565 2041.9784,1765.3704 2014.4279,1672.1846 C 1999.9088,1623.0756 1965.8313,1585.0614 1923.2024,1564.1138 L 1944.029,1516.8425 L 1772.3594,1542.589 L 1872.6856,1678.7228 L 1896.9892,1623.5761 C 1923.7665,1637.4144 1945.0899,1661.7088 1954.3051,1692.8776 C 1972.2456,1753.5594 1937.5631,1817.3584 1876.8811,1835.299 C 1816.1991,1853.2396 1752.3729,1818.565 1734.4323,1757.8832 C 1729.2991,1740.5206 1728.4921,1722.9142 1731.3546,1706.1876 L 1672.1527,1692.1333 C 1667.6619,1717.9635 1668.87,1745.1739 1676.8023,1772.0039 z"
-         style="opacity:1;fill:url(#linearGradient3399);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:10.96300411;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         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" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Scale.svg b/src/Mod/Draft/Resources/icons/Draft_Scale.svg
old mode 100755
new mode 100644
index 9d5ddde983..28cfce9a51
--- a/src/Mod/Draft/Resources/icons/Draft_Scale.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Scale.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,20 +14,36 @@
    height="64px"
    id="svg2766"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Scale.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2768">
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3528"
-       gradientUnits="userSpaceOnUse"
-       x1="605.94659"
-       y1="92.711899"
-       x2="626.31323"
-       y2="92.711899" />
+       id="linearGradient3856">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3858" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3860" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3824">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3826" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop3828" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3787">
       <stop
@@ -38,15 +55,6 @@
          offset="1"
          style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3787"
-       id="linearGradient3526"
-       gradientUnits="userSpaceOnUse"
-       x1="581.31873"
-       y1="100.8125"
-       x2="634.21252"
-       y2="100.8125" />
     <linearGradient
        id="linearGradient3864">
       <stop
@@ -58,15 +66,6 @@
          offset="1"
          style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3524"
-       gradientUnits="userSpaceOnUse"
-       x1="581.26331"
-       y1="126.79625"
-       x2="609.54919"
-       y2="100.10708" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -74,6 +73,56 @@
        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" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </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"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.9420628,1.000004)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3856"
+       id="linearGradient3862"
+       x1="613.25824"
+       y1="135.1946"
+       x2="595.35895"
+       y2="68.194603"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -82,17 +131,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="11"
+     inkscape:cx="15.623644"
+     inkscape:cy="35.514141"
+     inkscape:current-layer="g3518"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="640"
-     inkscape:window-height="684"
-     inkscape:window-x="0"
-     inkscape:window-y="93" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:snap-global="true"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2771">
     <rdf:RDF>
@@ -111,22 +170,119 @@
     <g
        id="g3518"
        transform="matrix(1.0614931,0,0,1,-612.96941,-69.194602)">
-      <path
-         id="path3503"
-         d="M 617.06696,85.03125 L 619.59821,87.6875 L 610.25446,96.40625 L 617.97321,104.25 L 627.06696,95.28125 L 629.31696,97.65625 L 629.06696,85.03125 L 617.06696,85.03125 z M 585.59821,102.71875 L 585.59821,130 L 612.53571,130 L 612.53571,102.71875 L 585.59821,102.71875 z M 591.16071,108.8125 L 606.87946,108.8125 L 606.87946,124.71875 L 591.16071,124.71875 L 591.16071,108.8125 z"
-         style="opacity:0.63090126;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         id="rect2663"
-         d="M 581.9375,100.78125 L 581.9375,128.0625 L 608.875,128.0625 L 608.875,100.78125 L 581.9375,100.78125 z M 587.5,106.875 L 603.21875,106.875 L 603.21875,122.78125 L 587.5,122.78125 L 587.5,106.875 z"
-         style="opacity:1;fill:url(#linearGradient3524);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
          id="rect3446"
-         d="M 581.96875,73.84375 L 581.96875,86.90625 L 587.6875,86.90625 L 587.6875,80.09375 L 589.46875,80.09375 L 589.46875,73.84375 L 581.96875,73.84375 z M 592.5,73.84375 L 592.5,80.09375 L 599.8125,80.09375 L 599.8125,73.84375 L 592.5,73.84375 z M 602.5,73.84375 L 602.5,80.09375 L 610.1875,80.09375 L 610.1875,73.84375 L 602.5,73.84375 z M 613.03125,73.84375 L 613.03125,80.09375 L 621.0625,80.09375 L 621.0625,73.84375 L 613.03125,73.84375 z M 623.9375,73.84375 L 623.9375,80.09375 L 628.03125,80.09375 L 628.03125,83.5 L 633.5625,83.5 L 633.5625,73.84375 L 623.9375,73.84375 z M 628.03125,87.0625 L 628.03125,94.40625 L 633.5625,94.40625 L 633.5625,87.0625 L 628.03125,87.0625 z M 581.96875,89.9375 L 581.96875,96 L 587.6875,96 L 587.6875,89.9375 L 581.96875,89.9375 z M 628.03125,97.25 L 628.03125,105.46875 L 633.5625,105.46875 L 633.5625,97.25 L 628.03125,97.25 z M 628.03125,108.15625 L 628.03125,116.71875 L 633.5625,116.71875 L 633.5625,108.15625 L 628.03125,108.15625 z M 628.03125,119.21875 L 628.03125,122.59375 L 624.09375,122.59375 L 624.09375,127.78125 L 633.5625,127.78125 L 633.5625,119.21875 L 628.03125,119.21875 z M 613.5625,122.59375 L 613.5625,127.78125 L 621.59375,127.78125 L 621.59375,122.59375 L 613.5625,122.59375 z"
-         style="opacity:1;fill:url(#linearGradient3526);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         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" />
       <path
-         id="path3485"
-         d="M 625.4107,83.115453 L 613.41514,83.115453 L 615.94052,85.767103 L 606.59661,94.479669 L 614.29902,102.30835 L 623.39039,93.343247 L 625.66324,95.742359 L 625.4107,83.115453 z"
-         style="fill:url(#linearGradient3528);fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.29999995;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         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" />
+      <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" />
+      <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" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 36,57 10,0"
+         id="path3832"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <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"
+         id="path3834"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 57,48 0,-6"
+         id="path3836"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 57,36 0,-6"
+         id="path3838"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 57,24 0,-6"
+         id="path3840"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <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"
+         id="path3842"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 46,5 40,5"
+         id="path3844"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 34,5 28,5"
+         id="path3846"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 22,5 16,5"
+         id="path3848"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <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"
+         id="path3850"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 5,22 0,6"
+         id="path3852"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 57,12 57,9"
+         id="path3854"
+         inkscape:connector-curvature="0"
+         transform="matrix(0.94206924,0,0,1,577.45963,69.194602)" />
     </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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_SelectGroup.svg b/src/Mod/Draft/Resources/icons/Draft_SelectGroup.svg
index 1bef192e36..aef6a6476d 100644
--- a/src/Mod/Draft/Resources/icons/Draft_SelectGroup.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_SelectGroup.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_SelectGroup.svg">
   <defs
      id="defs3614">
@@ -336,18 +336,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="10.127693"
-     inkscape:cy="16.204645"
+     inkscape:zoom="15.556349"
+     inkscape:cx="26.321351"
+     inkscape:cy="25.250265"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
-     inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3080"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -356,7 +364,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -365,52 +373,176 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 9.83097,8.58705 0,9.625 32.125,0 0,-9.625 -32.125,0 z m 14,21.818182 0,9.625 32.125,0 0,-9.625 -32.125,0 z m 0,14.545454 0,9.625 32.125,0 0,-9.625 -32.125,0 z"
-       id="rect4258-7"
-       sodipodi:nodetypes="ccccccccccccccc" />
-    <rect
-       style="color:#000000;fill:#62a4ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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"
-       width="32.142857"
-       height="9.6428576"
-       x="21.044043"
-       y="41.87886"
-       rx="0"
-       ry="0" />
-    <rect
-       style="color:#000000;fill:#62a4ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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"
-       width="32.142857"
-       height="9.6428576"
-       x="20.862225"
-       y="26.787952"
-       rx="0"
-       ry="0" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;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"
-       width="32.142857"
-       height="9.6428576"
-       x="6.8622246"
-       y="4.7879515"
-       rx="0"
-       ry="0" />
+       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
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 11.21936,14.64508 0,31.870133 9.28571,0"
-       id="path5098"
-       sodipodi:nodetypes="ccc" />
+       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
-       style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 21.04079,31.9308 -9.64286,0"
-       id="path5100" />
+       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" />
+    <path
+       id="path5100-7"
+       d="M 23,29 8.999999,29"
+       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" />
     <rect
-       style="color:#000000;fill:none;stroke:#0036d9;stroke-width:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-miterlimit:4;stroke-dasharray:8,4;stroke-dashoffset:0;stroke-linecap:butt;stroke-linejoin:miter"
-       id="rect3032"
-       width="45.330067"
-       height="38.784615"
-       x="15.607694"
-       y="20.334965" />
+       ry="0"
+       rx="0"
+       y="3"
+       x="3"
+       height="10"
+       width="37.999989"
+       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"
+       height="10"
+       width="28"
+       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" />
+    <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"
+       x="24.806452"
+       y="43" />
+    <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" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 53.000001,19 C 57,19 57,19 57,19"
+       id="path3957-5-8"
+       inkscape:connector-curvature="0" />
+    <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"
+       id="path3953-1-1-7"
+       inkscape:connector-curvature="0" />
+    <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" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2;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-8-9"
+       inkscape:connector-curvature="0" />
+    <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"
+       id="path3953-1-1-7-7"
+       inkscape:connector-curvature="0" />
+    <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"
+       id="path3953-1-1-4"
+       inkscape:connector-curvature="0" />
+    <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"
+       id="path3953-1-1-7-2"
+       inkscape:connector-curvature="0" />
+    <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"
+       id="path3953-1-1-4-3"
+       inkscape:connector-curvature="0" />
+    <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"
+       id="path3953-1-1-7-2-1"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_SelectPlane.svg b/src/Mod/Draft/Resources/icons/Draft_SelectPlane.svg
index 5fd36c60c5..8bd5c591b5 100644
--- a/src/Mod/Draft/Resources/icons/Draft_SelectPlane.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_SelectPlane.svg
@@ -14,10 +14,22 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_SelectPlane.svg">
   <defs
      id="defs3614">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -185,6 +197,15 @@
          offset="1"
          style="stop-color:#379cfb;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="linearGradient3815"
+       x1="34"
+       y1="52"
+       x2="22"
+       y2="10"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -193,21 +214,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.75"
-     inkscape:cx="23.565355"
-     inkscape:cy="22.134067"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="8.9698563"
+     inkscape:cy="23.125081"
+     inkscape:current-layer="g4075"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="777"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false"
+     inkscape:snap-global="true"
      inkscape:snap-nodes="true"
-     inkscape:object-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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -216,7 +247,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -225,60 +256,69 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g4075">
+       id="g4075"
+       style="stroke:#042a2a;stroke-width:2;fill:#16d0d2">
       <path
          sodipodi:nodetypes="ccccccc"
          inkscape:connector-curvature="0"
          id="path3305"
-         d="M 33.636364,3.0909091 9.4545455,16 l 0,45.454545 L 12.545455,61.272727 51.636364,39.818182 51.272727,3.0909091 z"
-         style="fill:#00bcbf;stroke:#004550;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:0.73333335;opacity:1" />
+         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" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path3190"
-         d="M 2.6817614,19.853542 34.227331,2.7648421"
-         style="fill:none;stroke:#004550;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;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" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path3305-1"
+         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" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path3190-7"
-         d="M 2.6817603,43.362531 61.318239,11.546559"
-         style="fill:none;stroke:#004550;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;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" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path3190-9"
-         d="M 12.681761,61.180713 61.136421,34.819286"
-         style="fill:none;stroke:#004550;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;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" />
       <path
          sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
          id="path3190-1"
-         d="m 51.778932,61.073314 9.545569,-4.361427"
-         style="fill:none;stroke:#004550;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;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" />
       <path
          inkscape:connector-curvature="0"
          id="path3224"
-         d="m 9.6363637,2.6639428 0,58.7180442"
-         style="fill:none;stroke:#004550;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;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" />
       <path
          inkscape:connector-curvature="0"
          id="path3224-4"
-         d="m 30.727272,3.4574795 0,57.9941315"
-         style="fill:none;stroke:#004550;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
-      <rect
+         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" />
+      <path
          transform="matrix(0.87830639,-0.4780982,0,1,0,0)"
-         y="35.24979"
-         x="21.541641"
-         height="21.627987"
-         width="26.756208"
+         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"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.20109248;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="ccccc" />
       <path
          inkscape:connector-curvature="0"
          id="path3224-7"
-         d="m 51.454545,2.7325478 0,58.3530852"
-         style="fill:none;stroke:#004550;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
+         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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_ShapeString.svg b/src/Mod/Draft/Resources/icons/Draft_ShapeString.svg
index 53b09f83cd..ada7d125d6 100644
--- a/src/Mod/Draft/Resources/icons/Draft_ShapeString.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_ShapeString.svg
@@ -7,18 +7,31 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64px"
    height="64px"
    id="svg4594"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_ShapeString.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs4596">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3788">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3790" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3792" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -26,6 +39,15 @@
        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"
+       y2="11.793966"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -35,17 +57,27 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568542"
-     inkscape:cx="16.724718"
-     inkscape:cy="24.831907"
+     inkscape:cx="35.241723"
+     inkscape:cy="27.176182"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="695"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2991"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4599">
     <rdf:RDF>
@@ -63,7 +95,7 @@
      inkscape:groupmode="layer">
     <text
        xml:space="preserve"
-       style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+       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"
@@ -73,37 +105,39 @@
          x="15.684914"
          y="19.773684" /></text>
     <g
-       id="g4061">
-      <text
-         transform="scale(1.2630773,0.79171719)"
-         sodipodi:linespacing="125%"
-         id="text3892"
-         y="69.508385"
-         x="5.465425"
-         style="font-size:77.39546203999999818px;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;opacity:0.62711863999999995;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.191;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;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman, Italic'"
-         xml:space="preserve"><tspan
-           style="stroke-width:3.191;stroke-miterlimit:4;stroke-dasharray:none"
-           y="69.508385"
-           x="5.465425"
-           id="tspan3894"
-           sodipodi:role="line">S</tspan><tspan
-           style="stroke-width:3.191;stroke-miterlimit:4;stroke-dasharray:none"
-           id="tspan3896"
-           y="166.25272"
-           x="5.465425"
-           sodipodi:role="line" /></text>
+       transform="matrix(1.2179745,0,0,1.215783,-1.4419685,-6.5564093)"
+       id="g4061-3"
+       style="fill:url(#linearGradient3794);stroke:#fce94f;stroke-width:1.64354979999999995;fill-opacity:1">
+      <g
+         transform="scale(1.258685,0.79447996)"
+         inkscape:transform-center-x="1.9859923"
+         inkscape:transform-center-y="17.646795"
+         style="font-size:80.06713104000000669px;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:#fce94f;stroke-width:1.64354979999999995;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:url(#linearGradient3794);fill-opacity:1"
+         id="text3103-6">
+        <path
+           d="m 4.975742,52.093901 1.4169134,0.320276 -0.1338711,6.506371 c 0.4170103,0.625531 1.9417208,2.277325 2.6715058,2.850717 0.7558346,0.547339 2.0195169,0.08172 2.9838759,0.524794 0.96434,0.417019 2.064535,0.847353 3.185278,1.107985 1.146781,0.234574 2.419153,0.443367 3.644154,0.443364 2.21538,3e-6 4.201734,-0.443647 5.843756,-0.96492 1.668041,-0.54733 3.437198,-0.629898 4.557955,-1.620317 1.120704,-1.01647 2.127701,-2.365684 2.675064,-3.773122 0.573368,-1.407419 1.263654,-3.409075 1.263684,-5.181407 -3e-5,-1.407414 -0.02452,-3.501719 -0.5347,-4.773044 -0.481414,-1.225537 -1.865227,-3.311684 -2.907741,-4.145736 -1.042566,-0.834011 -2.199627,-1.785899 -3.528842,-2.489636 -1.303198,-0.703692 -2.616639,-1.361652 -3.997986,-2.065391 -1.381384,-0.729753 -2.851996,-1.498627 -4.18122,-2.306622 -1.303189,-0.834005 -2.504874,-1.693815 -3.547403,-2.762448 -1.042551,-1.094637 -1.410553,-1.351244 -2.110671,-2.671929 -0.700118,-1.320685 -1.193743,-2.25649 -1.193735,-4.159163 -8e-6,-2.397803 0.239215,-3.938003 1.073256,-5.736429 0.860086,-1.798336 1.360867,-2.516537 2.924689,-3.689444 1.589861,-1.198871 4.116431,-2.881581 6.357909,-3.481093 2.267506,-0.599409 3.808409,-0.701682 6.623292,-0.701735 2.58026,5.3e-5 4.27243,0.115589 6.305415,0.402235 2.058983,0.260688 2.999824,1.009494 4.77218,1.452522 l -1.161777,7.614443 -0.962592,0.09151 0.375588,-6.351534 c -0.834066,-0.677604 -2.881846,-1.850791 -4.367435,-2.319983 -1.48565,-0.469094 -5.18159,-0.247398 -7.110263,-0.247447 -1.902661,4.9e-5 -2.820241,-0.198076 -4.201585,0.297081 -1.355323,0.495255 -2.562972,1.57999 -3.449108,2.466102 -0.860113,0.860142 -1.917562,2.828682 -2.334562,4.001495 -0.417031,1.172902 -0.604712,2.965238 -0.604698,4.3205 -1.4e-5,1.303214 0.608394,4.068959 1.772074,5.327596 1.163679,1.258637 1.728798,1.940528 2.758373,2.735516 1.029575,0.794988 1.849652,1.191633 3.178911,1.895316 1.329217,0.677683 3.51949,1.910367 4.874817,2.640115 1.38134,0.729807 2.75112,1.603117 4.080388,2.437122 1.329208,0.834059 2.719672,2.014102 3.576231,3.265738 0.856559,1.251636 1.373407,1.86198 1.637267,3.622545 0.26386,1.760564 0.199035,0.527747 0.199035,2.743144 0,2.215397 -0.314774,3.527343 -1.174834,5.58635 -0.834067,2.059025 -1.608076,3.118974 -3.302171,4.552462 -1.694159,1.433496 -3.328263,2.815716 -5.88246,3.597621 -2.554247,0.755841 -5.234445,1.225269 -8.67481,1.22527 -3.284016,-10e-7 -5.492703,-1.057854 -8.125108,-1.709441 C 7.6334222,62.293596 6.2773275,61.773468 4.4418271,60.907566 L 5.984711,51.682118"
+           style="stroke:#fce94f;stroke-width:1.64354979999999995;marker:none;fill:url(#linearGradient3794);fill-opacity:1"
+           id="path3018"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccscccccccccczccccccccccccccsczzccczzzcccsccc" />
+      </g>
+    </g>
+    <g
+       id="g4061"
+       style="fill:none;stroke:#302b00;stroke-width:1.6435498"
+       transform="matrix(1.2179745,0,0,1.215783,-1.7577346,13.225313)">
       <text
          inkscape:transform-center-y="17.646795"
          inkscape:transform-center-x="1.9859923"
          transform="scale(1.258685,0.79447996)"
          sodipodi:linespacing="125%"
          id="text3103"
-         y="65.225639"
+         y="44.51989"
          x="2.1774669"
-         style="font-size:80.06713104px;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:#ffda04;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.57333159;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;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman, Italic'"
+         style="font-size:80.06713104px;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:none;stroke:#302b00;stroke-width:1.6435498;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;font-family:Times New Roman;-inkscape-font-specification:'Times New Roman, Italic'"
          xml:space="preserve"><tspan
-           style="stroke-width:1.57333159"
-           y="65.225639"
+           style="fill:none;stroke:#302b00;stroke-width:1.6435498"
+           y="44.51989"
            x="2.1774669"
            id="tspan3105"
            sodipodi:role="line">S</tspan></text>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Slope.svg b/src/Mod/Draft/Resources/icons/Draft_Slope.svg
index 3231a10a92..2936e8be0f 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Slope.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Slope.svg
@@ -14,10 +14,22 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Slope.svg">
   <defs
      id="defs3614">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3882" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3884" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -361,6 +373,46 @@
        x2="55.130848"
        y2="21.430153"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895"
+       id="linearGradient3909"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </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"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.99519621,0.09790048,-0.09790048,0.99519621,4.3300722,-2.6052795)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -369,18 +421,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="34.950925"
-     inkscape:cy="34.512542"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="20.776966"
+     inkscape:cy="37.51357"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1053"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3053"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -389,7 +450,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -397,19 +458,38 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <rect
-       width="4.4988194"
-       height="54.438503"
-       x="29.892143"
-       y="-69.320946"
-       transform="matrix(-0.29039954,0.95690548,-0.95705178,-0.28991704,0,0)"
-       id="rect4329"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.50000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
     <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;fill:url(#linearGradient4248);fill-opacity:1.0;fill-rule:nonzero;stroke:#10121e;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="m 42.104588,12.717092 -2.401331,7.041558 -25.191717,-9.13173 -2.248512,6.281225 25.191717,9.131728 -2.424608,6.193521 19.100787,-4.115576 z"
-       id="rect4236"
        inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
+       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" />
+    <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" />
+    <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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Snap.svg b/src/Mod/Draft/Resources/icons/Draft_Snap.svg
index 3d44556d12..de73316849 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Snap.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Snap.svg
@@ -14,7 +14,7 @@
    height="64"
    id="svg4025"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_Snap.svg">
   <defs
      id="defs4027">
@@ -94,6 +94,58 @@
          offset="1"
          id="stop3764-3" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759"
+       id="linearGradient3765"
+       x1="182.81459"
+       y1="728.49023"
+       x2="127.30297"
+       y2="598.96307"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3759">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3761" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3763" />
+    </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"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.19425077,0.01140678,-0.0186946,-0.19481462,52.138813,96.130272)"
+       x1="18.784323"
+       y1="436.03323"
+       x2="43.604301"
+       y2="499.08353" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -102,18 +154,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.9795105"
-     inkscape:cx="-20.648533"
-     inkscape:cy="-4.8977275"
+     inkscape:zoom="5.5989012"
+     inkscape:cx="38.177266"
+     inkscape:cy="23.530606"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="777"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata4030">
     <rdf:RDF>
@@ -132,39 +194,44 @@
      inkscape:groupmode="layer"
      transform="translate(0,32)">
     <path
-       style="opacity:0.5125;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 58.782886,-6.2838377 -16.03125,10.1875 c -1.838518,-1.386109 -4.113879,-2.25 -6.59375,-2.25 -6.066461,0 -11,4.933539 -11,10.9999997 0,0.780011 0.09541,1.54723 0.25,2.28125 l -15.5312495,9.875 3.5312495,5.5625 15.25,-9.6875 c 1.962454,1.831554 4.603867,2.9375 7.5,2.9375 6.066461,0 10.96875,-4.902289 10.96875,-10.96875 0,-1.17252 -0.159785,-2.315512 -0.5,-3.3749996 l 15.71875,-10.00000008 -3.5625,-5.56250002 z"
-       id="rect3780-8"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;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="rect3780"
-       width="57.972908"
-       height="6.6166019"
-       x="-3.088403"
-       y="21.954212"
-       transform="matrix(0.84392386,-0.53646298,0.53646298,0.84392386,0,0)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#linearGradient3766);fill-opacity:1;fill-rule:evenodd;stroke:#00092b;stroke-width:3.5;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="path3782"
-       sodipodi:cx="20.629047"
-       sodipodi:cy="29.082434"
-       sodipodi:rx="10.984299"
-       sodipodi:ry="10.984299"
-       d="m 31.613346,29.082434 a 10.984299,10.984299 0 1 1 -21.9685973,0 10.984299,10.984299 0 1 1 21.9685973,0 z"
-       transform="translate(14.83703,-21.048975)" />
-    <path
-       style="opacity:0.525;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.2386322;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 13.837304,-25.425773 0,17.8846493 -7.9063406,0 0,5.5831146 7.9063406,0 6.069514,0 8.225788,0 0,-5.5831146 -8.225788,0 0,-17.8846493 z"
-       id="rect3784-6"
+       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="ccccccccccc" />
+       sodipodi:nodetypes="ccccccccc" />
     <path
-       style="color:#000000;fill:#00d8ba;fill-opacity:1;fill-rule:evenodd;stroke:#00473d;stroke-width:2.7533958;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 11.281486,-29.246676 0,17.88465 -7.9063407,0 0,5.5831144 7.9063407,0 6.069513,0 8.225788,0 0,-5.5831144 -8.225788,0 0,-17.88465 z"
-       id="rect3784"
+       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="ccccccccccc" />
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-193.32124,-0.82063019)"
+       id="g3856">
+      <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"
+         y="37"
+         transform="translate(127.44439,128.22016)" />
+      <path
+         style="fill:none;stroke:#babdb6;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 59,41 5,41"
+         id="path3854"
+         inkscape:connector-curvature="0"
+         transform="translate(127.44439,128.22016)" />
+    </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"
+       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" />
+    <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"
+       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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_SwitchMode.svg b/src/Mod/Draft/Resources/icons/Draft_SwitchMode.svg
index b59b5838c2..d04b72259c 100644
--- a/src/Mod/Draft/Resources/icons/Draft_SwitchMode.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_SwitchMode.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Draft_Edit.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_SwitchMode.svg">
   <defs
      id="defs3614">
     <inkscape:perspective
@@ -288,18 +288,31 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="5.9553595"
+     inkscape:cx="16.176824"
+     inkscape:cy="54.726113"
+     inkscape:current-layer="g5015"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
-     inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -308,7 +321,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -318,21 +331,43 @@
      inkscape:groupmode="layer">
     <g
        transform="translate(-446.8047,-67.879686)"
-       id="g5015">
+       id="g5015"
+       style="stroke:#2e3436">
       <rect
-         y="91.935097"
-         x="470.39413"
-         height="34.707325"
-         width="34.375309"
+         y="92.879707"
+         x="471.80469"
+         height="33.999977"
+         width="33.999607"
          id="rect4094"
-         style="color:#000000;fill:#000fff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:4;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" />
+         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" />
       <rect
-         y="73.844223"
-         x="452.47632"
-         height="34.707325"
-         width="34.375309"
-         id="rect4094-9"
-         style="color:#000000;fill:none;stroke:#000000;stroke-width:4;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" />
+         y="96.879707"
+         x="475.80469"
+         height="26"
+         width="26"
+         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" />
+      <rect
+         y="92.879707"
+         x="471.80508"
+         height="33.999977"
+         width="33.999607"
+         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"
+         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"
+         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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Text.svg b/src/Mod/Draft/Resources/icons/Draft_Text.svg
old mode 100755
new mode 100644
index ac1e8d7f31..cfa6716be0
--- a/src/Mod/Draft/Resources/icons/Draft_Text.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Text.svg
@@ -1,22 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64px"
    height="64px"
    id="svg4594"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="text.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Text.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs4596">
+    <linearGradient
+       id="linearGradient3792">
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="0"
+         id="stop3794" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="1"
+         id="stop3796" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -24,6 +38,15 @@
        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"
+       y2="1734.2576"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -32,17 +55,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.9445436"
-     inkscape:cx="20.833111"
-     inkscape:cy="7.2926147"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="15.556349"
+     inkscape:cx="24.182072"
+     inkscape:cy="30.009846"
+     inkscape:current-layer="g3491"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="722"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:snap-global="true"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4599">
     <rdf:RDF>
@@ -64,14 +97,24 @@
        inkscape:export-xdpi="7.820137"
        inkscape:export-ydpi="7.820137"
        transform="matrix(0.1649204,0,0,0.1649204,-643.71716,-232.01446)">
-      <path
-         id="path3489"
-         d="M 4176.0736,1682.8371 L 4054.9798,1682.8371 L 4029.3939,1720.3371 C 4025.8782,1725.5455 4023.86,1729.647 4023.3392,1732.6418 C 4022.1673,1738.371 4025.6829,1742.3423 4033.8861,1744.5558 L 4032.7142,1750.8058 L 3944.433,1750.8058 L 3945.6048,1744.5558 C 3951.0736,1743.5142 3955.4356,1741.6913 3958.6908,1739.0871 C 3961.946,1736.4829 3966.1126,1731.4048 3971.1908,1723.8527 L 4110.058,1518.9699 C 4114.4849,1512.4597 4117.089,1507.2514 4117.8705,1503.3449 C 4119.1724,1497.3556 4116.3078,1493.0587 4109.2767,1490.4543 L 4110.4486,1484.2043 L 4204.9798,1484.2043 L 4203.808,1490.4543 C 4195.6046,1492.6681 4190.9822,1496.5092 4189.9408,1501.9777 C 4189.1593,1505.754 4189.5499,1510.0509 4191.1127,1514.8683 L 4251.4642,1720.3371 C 4254.0681,1729.0611 4256.6722,1735.0507 4259.2767,1738.3058 C 4261.8806,1741.4309 4265.7868,1743.5142 4270.9955,1744.5558 L 4269.8236,1750.8058 L 4171.7767,1750.8058 L 4172.9486,1744.5558 C 4181.9327,1743.1236 4187.076,1739.0871 4188.3783,1732.4465 C 4188.8989,1729.7121 4188.378,1725.6757 4186.8158,1720.3371 L 4176.0736,1682.8371 M 4166.5033,1646.3137 L 4142.2845,1551.3918 L 4079.5892,1646.3137 L 4166.5033,1646.3137"
-         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;opacity:0.62711864;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Copperplate Gothic Bold;-inkscape-font-specification:'Copperplate Gothic Bold, Bold'" />
       <path
          id="text2714"
-         d="M 4155.865,1658.6792 L 4034.7712,1658.6792 L 4009.1853,1696.1792 C 4005.6696,1701.3876 4003.6514,1705.4891 4003.1306,1708.4839 C 4001.9587,1714.2131 4005.4743,1718.1844 4013.6775,1720.3979 L 4012.5056,1726.6479 L 3924.2244,1726.6479 L 3925.3962,1720.3979 C 3930.865,1719.3563 3935.227,1717.5334 3938.4822,1714.9292 C 3941.7374,1712.325 3945.904,1707.2469 3950.9822,1699.6948 L 4089.8494,1494.812 C 4094.2763,1488.3018 4096.8804,1483.0935 4097.6619,1479.187 C 4098.9638,1473.1977 4096.0992,1468.9008 4089.0681,1466.2964 L 4090.24,1460.0464 L 4184.7712,1460.0464 L 4183.5994,1466.2964 C 4175.396,1468.5102 4170.7736,1472.3513 4169.7322,1477.8198 C 4168.9507,1481.5961 4169.3413,1485.893 4170.9041,1490.7104 L 4231.2556,1696.1792 C 4233.8595,1704.9032 4236.4636,1710.8928 4239.0681,1714.1479 C 4241.672,1717.273 4245.5782,1719.3563 4250.7869,1720.3979 L 4249.615,1726.6479 L 4151.5681,1726.6479 L 4152.74,1720.3979 C 4161.7241,1718.9657 4166.8674,1714.9292 4168.1697,1708.2886 C 4168.6903,1705.5542 4168.1694,1701.5178 4166.6072,1696.1792 L 4155.865,1658.6792 M 4146.2947,1622.1558 L 4122.0759,1527.2339 L 4059.3806,1622.1558 L 4146.2947,1622.1558"
-         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffda04;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Copperplate Gothic Bold;-inkscape-font-specification:'Copperplate Gothic Bold, Bold'" />
+         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" />
+      <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" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Trimex.svg b/src/Mod/Draft/Resources/icons/Draft_Trimex.svg
index 85893c3dee..a2703270c7 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Trimex.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Trimex.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,9 +14,10 @@
    height="64px"
    id="svg3111"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="trimex.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Trimex.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs3113">
     <linearGradient
@@ -46,6 +48,77 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective3119" />
+    <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" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </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)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3025-3"
+       xlink:href="#linearGradient3895-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3895-6">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897-7" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899-5" />
+    </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"
+       id="linearGradient3066"
+       xlink:href="#linearGradient3895-6"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895-6"
+       id="linearGradient3900"
+       x1="30"
+       y1="6"
+       x2="34"
+       y2="57"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -54,17 +127,38 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="16.765276"
-     inkscape:cy="47.135721"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="62.063305"
+     inkscape:cy="14.084917"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="722"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="25" />
+     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>
   <metadata
      id="metadata3116">
     <rdf:RDF>
@@ -80,20 +174,56 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <g
-       id="g6658"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/extend.png"
-       inkscape:export-xdpi="4.8983116"
-       inkscape:export-ydpi="4.8983116"
-       transform="matrix(9.9502321e-2,0,0,9.9502321e-2,-12.291864,-221.09226)">
-      <path
-         id="path6647"
-         d="M 434.92644,2369.0285 L 434.92644,2766.1535 L 492.08269,2766.1535 L 492.08269,2369.0285 L 434.92644,2369.0285 z M 309.11394,2432.2473 L 181.83269,2567.6223 L 309.11394,2700.9661 L 309.11394,2599.9348 L 406.08269,2599.9348 L 406.08269,2535.2785 L 309.11394,2535.2785 L 309.11394,2432.2473 z M 612.14519,2434.2473 L 612.14519,2535.2785 L 515.17644,2535.2785 L 515.17644,2599.9348 L 612.14519,2599.9348 L 612.14519,2702.9661 L 739.42644,2567.5911 L 612.14519,2434.2473 z"
-         style="opacity:0.60553188;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:12;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         id="rect6635"
-         d="M 410.5625,2344.6562 L 410.5625,2741.7812 L 467.71875,2741.7812 L 467.71875,2344.6562 L 410.5625,2344.6562 z M 284.75,2407.875 L 157.46875,2543.25 L 284.75,2676.5938 L 284.75,2575.5625 L 381.71875,2575.5625 L 381.71875,2510.9062 L 284.75,2510.9062 L 284.75,2407.875 z M 587.78125,2409.875 L 587.78125,2510.9062 L 490.8125,2510.9062 L 490.8125,2575.5625 L 587.78125,2575.5625 L 587.78125,2678.5938 L 715.0625,2543.2188 L 587.78125,2409.875 z"
-         style="opacity:1;fill:url(#linearGradient6655);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:12;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Upgrade.svg b/src/Mod/Draft/Resources/icons/Draft_Upgrade.svg
index e9ad7b824b..c468a386c7 100755
--- a/src/Mod/Draft/Resources/icons/Draft_Upgrade.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Upgrade.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -11,13 +12,14 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64px"
    height="64px"
-   id="svg3037"
+   id="svg3074"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="upgrade.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Downgrade.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
-     id="defs3039">
+     id="defs3076">
     <linearGradient
        id="linearGradient3841">
       <stop
@@ -32,19 +34,49 @@
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3841"
-       id="linearGradient3847"
+       id="linearGradient3863"
+       gradientUnits="userSpaceOnUse"
        x1="3709.3296"
        y1="1286.7291"
        x2="3935.5251"
-       y2="1076.6174"
-       gradientUnits="userSpaceOnUse" />
+       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="perspective3045" />
+       id="perspective3082" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895"
+       id="linearGradient3909"
+       x1="43"
+       y1="22"
+       x2="48"
+       y2="44"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -53,25 +85,52 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.375"
-     inkscape:cx="15.298255"
-     inkscape:cy="37.660973"
+     inkscape:zoom="6.6796359"
+     inkscape:cx="15.460671"
+     inkscape:cy="18.687728"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="641"
-     inkscape:window-height="722"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="25" />
+     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>
   <metadata
-     id="metadata3042">
+     id="metadata3079">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -79,20 +138,23 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <g
-       id="g3853"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/upgrade.png"
-       inkscape:export-xdpi="8.71"
-       inkscape:export-ydpi="8.71"
-       transform="matrix(0.1731146,0,0,0.1731146,-635.22048,-168.53671)">
-      <path
-         id="path3849"
-         d="M 3875.9311,1028.0961 L 3726.4311,1183.6586 L 3811.2748,1183.6586 L 3811.2748,1323.0649 L 3938.5561,1323.0649 L 3938.5561,1183.6586 L 4015.3374,1183.6586 L 3875.9311,1028.0961 z"
-         style="opacity:0.60792954;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         id="rect3066"
-         d="M 3848.6875,999.84375 L 3699.1875,1155.4062 L 3784.0312,1155.4062 L 3784.0312,1294.8125 L 3911.3125,1294.8125 L 3911.3125,1155.4062 L 3988.0938,1155.4062 L 3848.6875,999.84375 z"
-         style="opacity:1;fill:url(#linearGradient3847);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
+    <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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_VisGroup.svg b/src/Mod/Draft/Resources/icons/Draft_VisGroup.svg
index ee1da70544..6057385376 100644
--- a/src/Mod/Draft/Resources/icons/Draft_VisGroup.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_VisGroup.svg
@@ -7,16 +7,84 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64px"
    height="64px"
    id="svg2985"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 2">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_VisGroup.svg">
   <defs
-     id="defs2987" />
+     id="defs2987">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3815">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop3817" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3819" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3807">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop3809" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3811" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3799">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop3801" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3803" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3799"
+       id="linearGradient3805"
+       x1="53.257175"
+       y1="19.086002"
+       x2="25.928942"
+       y2="-1.3815211"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.02151317,-0.91811256)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3807"
+       id="linearGradient3813"
+       x1="61.719494"
+       y1="27.953379"
+       x2="36.843666"
+       y2="12.022611"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0.75600263,0.0412295)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3815"
+       id="linearGradient3821"
+       x1="74.313408"
+       y1="43.419685"
+       x2="48.388607"
+       y2="23.542751"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.18895427,-1.1237431)" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,18 +92,32 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="27.272917"
-     inkscape:cy="23.009609"
+     inkscape:zoom="10.193662"
+     inkscape:cx="61.316771"
+     inkscape:cy="37.911449"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1053"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata2990">
     <rdf:RDF>
@@ -44,7 +126,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -53,28 +135,46 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.35696189;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       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.548679"
-       y="17.615974"
+       x="40.359722"
+       y="16.492231"
        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.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" />
     <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.35696189;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       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.233379"
-       y="6.1760535"
+       x="31.989382"
+       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:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.35696189;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       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"
        height="27.016869"
-       x="21.918077"
-       y="-5.2638688"
+       x="21.896566"
+       y="-6.1819811"
        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.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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Wipe.svg b/src/Mod/Draft/Resources/icons/Draft_Wipe.svg
index ae1abed29b..0f7562b5d8 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Wipe.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Wipe.svg
@@ -7,16 +7,39 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64px"
    height="64px"
    id="svg2985"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="New document 2">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Wipe.svg">
   <defs
-     id="defs2987" />
+     id="defs2987">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3793">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3795" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3797" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3793"
+       id="linearGradient3799"
+       x1="29"
+       y1="47"
+       x2="15"
+       y2="17"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,18 +47,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="43.644313"
-     inkscape:cy="31.545376"
+     inkscape:zoom="9.4464321"
+     inkscape:cx="39.109856"
+     inkscape:cy="44.153962"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="756"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata2990">
     <rdf:RDF>
@@ -44,7 +78,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -52,29 +86,45 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="opacity:0.63500001;color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.33899999;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 17.923295,19.28125 -6.84375,6.03125 5.34375,6.0625 -12.3437495,0 0,8.375 11.9687495,0 -5.8125,5.5625 6.28125,6.59375 9.78125,-9.34375 8.9375,10.15625 6.84375,-6.03125 -6.125,-6.9375 28.3125,0 0,-8.375 -26.25,0 4.90625,-4.6875 -6.28125,-6.59375 -9.78125,9.34375 -8.9375,-10.15625 z"
-       id="rect3784-2-4"
-       inkscape:connector-curvature="0" />
     <rect
-       style="color:#000000;fill:#0027ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.33899999000000003;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-2"
-       width="32.909092"
-       height="8.363636"
-       x="29.09091"
-       y="26.727272" />
+       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"
+       x="25"
+       y="27" />
     <rect
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.33899999000000003;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"
+       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="23.272728"
-       height="8.363636"
-       x="1.8181819"
-       y="26.727272" />
+       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" />
+    <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"
+       height="4"
+       x="5"
+       y="29" />
     <path
-       style="color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.33899999;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.659091,14.627841 -6.8437501,6.03125 9.1875001,10.40625 -10.0312501,9.59375 6.2812501,6.59375 9.78125,-9.34375 8.9375,10.15625 6.84375,-6.03125 -9.1875,-10.40625 10.03125,-9.59375 -6.28125,-6.59375 -9.78125,9.34375 -8.9375,-10.15625 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"
+       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" />
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Wire.svg b/src/Mod/Draft/Resources/icons/Draft_Wire.svg
old mode 100755
new mode 100644
index b4744c2f74..35b3b56a27
--- a/src/Mod/Draft/Resources/icons/Draft_Wire.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Wire.svg
@@ -1,5 +1,6 @@
 <?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#"
@@ -13,9 +14,10 @@
    height="64px"
    id="svg2772"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="polyline.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_Wire.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2774">
     <radialGradient
@@ -125,6 +127,86 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7"
+       id="linearGradient3801-1-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-4"
+       id="linearGradient3801-1-2"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-4">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2-5" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5-51" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -133,17 +215,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.75"
-     inkscape:cx="12.206428"
-     inkscape:cy="35.159543"
+     inkscape:zoom="5.5"
+     inkscape:cx="-16.267177"
+     inkscape:cy="32.520777"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1045"
-     inkscape:window-height="722"
-     inkscape:window-x="0"
-     inkscape:window-y="25" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2777">
     <rdf:RDF>
@@ -159,132 +252,111 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
     <g
-       id="g3244"
-       transform="matrix(0.9205539,0,0,0.9205539,1.1497621,0.9652214)">
-      <path
-         id="rect2404"
-         d="M 58.946023,5.4147727 C 54.610489,5.4147727 51.071023,8.954238 51.071023,13.289773 C 51.071023,15.753808 52.231407,17.943166 54.008523,19.383523 L 45.727273,43.539773 C 44.47726,43.507182 43.271856,43.784535 42.196023,44.289773 L 33.633523,33.008523 C 34.241883,31.947938 34.612153,30.720242 34.664773,29.414773 C 34.839386,25.082756 31.465541,21.433135 27.133523,21.258523 C 22.801506,21.08391 19.151887,24.457756 18.977273,28.789773 C 18.89222,30.899875 19.646541,32.85554 20.946023,34.321023 L 14.696023,45.164773 C 14.341909,45.106699 14.002347,45.0489 13.633523,45.039773 C 9.2993157,44.932515 5.6782807,48.361816 5.5710227,52.696023 C 5.4637647,57.03023 8.8930657,60.651265 13.227273,60.758523 C 17.56148,60.865781 21.182516,57.43648 21.289773,53.102273 C 21.34462,50.885962 20.451616,48.848219 19.008523,47.383523 L 25.133523,36.758523 C 25.581526,36.857487 26.034146,36.926902 26.508523,36.946023 C 27.764999,36.996669 28.965303,36.74174 30.039773,36.258523 L 38.664773,47.633523 C 38.195329,48.488468 37.850763,49.418803 37.727273,50.446023 C 37.209789,54.750563 40.297734,58.678539 44.602273,59.196023 C 48.906813,59.713507 52.803539,56.625563 53.321023,52.321023 C 53.663437,49.472754 52.439429,46.80006 50.321023,45.164773 L 58.508523,21.102273 C 58.652657,21.11016 58.799931,21.133523 58.946023,21.133523 C 63.281557,21.133523 66.789773,17.625306 66.789773,13.289773 C 66.789773,8.954239 63.281557,5.4147727 58.946023,5.4147727 z"
-         style="opacity:0.49377597;fill:#030303;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93788773;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       transform="translate(40.005735,-40.005445)"
+       id="g3827-1">
       <g
-         transform="matrix(0.1617047,0,0,0.1617047,-68.554249,-58.596732)"
-         id="g4301">
-        <rect
-           transform="matrix(0.8668894,0.4985005,-0.4985005,0.8668894,0,0)"
-           y="191.68196"
-           x="736.7525"
-           height="146.82083"
-           width="30.000004"
-           id="rect4264"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000257;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <rect
-           transform="matrix(0.9463805,0.3230542,-0.3230542,0.9463805,0,0)"
-           y="156.68855"
-           x="843.52881"
-           height="269.46069"
-           width="30.000063"
-           id="rect4268"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.8000102;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <rect
-           transform="matrix(-0.7974337,0.6034066,-0.6034066,-0.7974337,0,0)"
-           y="-958.38055"
-           x="-148.08578"
-           height="217.16235"
-           width="30.000015"
-           id="rect4270"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000257;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           id="g2180"
-           transform="matrix(-0.9996939,-2.473928e-2,2.473928e-2,-0.9996939,660.87286,1337.2581)">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2182"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2184"
-             style="fill:url(#radialGradient3263);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g2186"
-           transform="matrix(-0.9991886,-4.0274961e-2,4.0274961e-2,-0.9991886,733.45111,1192.8469)">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2188"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2190"
-             style="fill:url(#radialGradient3265);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g2196"
-           transform="matrix(-0.9928512,-0.1193588,0.1193588,-0.9928512,796.09873,1342.1425)">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2198"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2200"
-             style="fill:url(#radialGradient3267);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g2204"
-           transform="matrix(-1,0,0,-1,958.57143,1087.5815)">
-          <path
-             d="M 245.71428,655.2193 A 48.57143,48.57143 0 1 1 148.57142,655.2193 A 48.57143,48.57143 0 1 1 245.71428,655.2193 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2206"
-             style="opacity:1;fill:#ffa900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="M 259.60921,672.79736 A 34.345188,23.991123 0 1 1 190.91883,672.79736 A 34.345188,23.991123 0 1 1 259.60921,672.79736 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2208"
-             style="fill:url(#radialGradient3269);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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
+           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"
+           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
+       transform="translate(26.005735,-9.9773715e-8)"
+       id="g3827-1-3">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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" />
+        <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"
+           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" />
+      </g>
+    </g>
+    <g
+       transform="translate(10.005735,-26)"
+       id="g3827-1-9">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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" />
+        <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"
+           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" />
+      </g>
+    </g>
+    <g
+       id="g3827-1-7">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-1">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#2e2900;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           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" />
+        <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"
+           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" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Draft/Resources/icons/Draft_WireToBSpline.svg b/src/Mod/Draft/Resources/icons/Draft_WireToBSpline.svg
index 262185d27f..4ca312aed8 100644
--- a/src/Mod/Draft/Resources/icons/Draft_WireToBSpline.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_WireToBSpline.svg
@@ -14,10 +14,22 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Draft_DelPoint.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Draft_WireToBSpline.svg">
   <defs
      id="defs3614">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3955">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3957" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3959" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -388,6 +400,24 @@
        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="164.2444"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -396,18 +426,43 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="5.0810398"
+     inkscape:cx="-8.3974944"
+     inkscape:cy="54.626075"
+     inkscape:current-layer="g4664"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="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>
   <metadata
      id="metadata3617">
     <rdf:RDF>
@@ -416,7 +471,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -428,35 +483,54 @@
        transform="translate(-320.04711,-131.2444)"
        id="g4664">
       <path
-         id="path4422-2"
-         d="m 346.20856,141.05199 -19.86569,17.39964 3.09717,5.03828 16.29925,-13.91386 12.92052,16.08149 22.52488,-17.57539 -3.4413,-4.68678 -18.98972,13.88456 -12.54511,-16.22794 z m -5.4748,25.95299 12.10713,11.27755 12.10712,-11.27755 -24.21425,0 z m 35.53926,8.75841 c 0,0 -5.20294,9.78987 -15.36072,10.04727 -9.36759,0.23736 -9.71872,-8.87558 -20.36624,-8.87558 -9.80941,0 -14.64117,12.56641 -14.64117,12.56641 l 5.13066,2.69489 c 0.16081,-0.0838 3.86734,-9.31495 10.5429,-9.31496 6.03037,-1e-5 9.01101,9.71686 19.86569,9.5493 11.35409,-0.17526 19.20871,-11.89268 19.20871,-11.89268 l -4.37983,-4.77465 z"
-         style="opacity:0.6;fill:#000000;fill-opacity:1;stroke:none" />
+         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" />
       <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.93741131;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 323.93348,153.17717 19.87611,-17.42526 12.54318,16.25241 18.97558,-13.90671 3.46681,4.68993 -22.53136,17.59181 -12.91868,-16.08503 -16.31283,13.90771 -3.09881,-5.02486 z"
-         id="path4422"
-         sodipodi:nodetypes="ccccccccc" />
+         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" />
       <path
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.93741131;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 328.64338,186.89725 -5.12878,-2.68032 c 0,0 4.80715,-12.56564 14.61656,-12.56564 10.64752,0 11.01937,9.11822 20.38696,8.88085 10.15777,-0.2574 15.36593,-10.05354 15.36593,-10.05354 l 4.36921,4.77387 c 0,0 -7.8627,11.72083 -19.21679,11.89609 -10.85468,0.16756 -13.82967,-9.55038 -19.86004,-9.55038 -6.67555,10e-6 -10.37224,9.21528 -10.53305,9.29907 z"
-         id="path4424"
-         sodipodi:nodetypes="ccssccssc" />
+         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" />
       <path
-         transform="matrix(0.82098053,0,0,0.44095861,71.167521,67.948985)"
-         d="m 325.44155,212.67016 29.47402,0 -14.73701,25.52525 -14.73701,-25.52525 z"
-         inkscape:randomized="0"
-         inkscape:rounded="0"
-         inkscape:flatsided="true"
-         sodipodi:arg2="-1.5707963"
-         sodipodi:arg1="-2.6179939"
-         sodipodi:r2="8.5084181"
-         sodipodi:r1="17.016836"
-         sodipodi:cy="221.17857"
-         sodipodi:cx="340.17856"
-         sodipodi:sides="3"
-         id="path4559"
-         style="color:#000000;fill:url(#linearGradient5390);fill-opacity:1;fill-rule:evenodd;stroke:#000004;stroke-width:3.22000456;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="star" />
+         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"
+         id="path3893-5"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <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" />
+      <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" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Angle.svg b/src/Mod/Draft/Resources/icons/Snap_Angle.svg
index ed16f54e8a..c9f7ee5a53 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Angle.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Angle.svg
@@ -14,12 +14,24 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Angle.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3823">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3825" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3827" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -301,6 +313,195 @@
          offset="1"
          id="stop3148-2" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3823"
+       id="linearGradient3829"
+       x1="252.19032"
+       y1="655.12787"
+       x2="152.68495"
+       y2="657.4104"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3823-4"
+       id="linearGradient3829-7"
+       x1="252.19032"
+       y1="655.12787"
+       x2="152.68495"
+       y2="657.4104"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3823-4">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3825-0" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3827-9" />
+    </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"
+       x1="252.19032"
+       y1="655.12787"
+       x2="152.68495"
+       y2="657.4104"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3823-2">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3825-4" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3827-5" />
+    </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"
+       x1="252.19032"
+       y1="655.12787"
+       x2="152.68495"
+       y2="657.4104"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3823-5">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3825-2" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3827-7" />
+    </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"
+       x1="252.19032"
+       y1="655.12787"
+       x2="152.68495"
+       y2="657.4104"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3823-1">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3825-49" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3827-8" />
+    </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"
+       x1="252.19032"
+       y1="655.12787"
+       x2="152.68495"
+       y2="657.4104"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3823-29">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3825-9" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3827-83" />
+    </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"
+       x1="252.19032"
+       y1="655.12787"
+       x2="152.68495"
+       y2="657.4104"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3823-6">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3825-23" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3827-82" />
+    </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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -309,18 +510,39 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="26.702912"
-     inkscape:cy="30.26697"
+     inkscape:zoom="5.5"
+     inkscape:cx="38.488767"
+     inkscape:cy="29.39274"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="755"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -342,34 +564,24 @@
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <path
          sodipodi:type="arc"
-         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:5;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"
+         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"
          id="path4313"
          sodipodi:cx="31.884087"
          sodipodi:cy="31.858782"
          sodipodi:rx="19.027601"
          sodipodi:ry="19.027601"
          d="m 50.911688,31.858782 a 19.027601,19.027601 0 1 1 -38.055203,0 19.027601,19.027601 0 1 1 38.055203,0 z"
-         transform="matrix(6.1679584,0,0,6.1679584,-39.231908,407.75637)" />
+         transform="matrix(6.6152338,0,0,6.6152339,-52.777954,394.37776)" />
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-6"
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:23.16313362;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.0152816,0.20452475,-0.20130309,-1.0315302,364.95551,1238.6254)" />
-      <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-6-2"
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:23.16313362;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.0152816,0.20452475,-0.2013031,-1.0315302,611.67392,1238.6254)" />
+         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"
+         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 a 19.027601,19.027601 0 1 1 -38.055203,0 19.027601,19.027601 0 1 1 38.055203,0 z"
+         transform="matrix(6.6152338,0,0,6.6152339,-52.777953,394.37777)" />
       <path
          d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
          sodipodi:ry="48.57143"
@@ -377,19 +589,79 @@
          sodipodi:cy="655.2193"
          sodipodi:cx="197.14285"
          id="path3162-6-7"
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:23.16313362;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"
+         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.20452475,1.0152816,-1.0315302,0.2013031,791.81946,394.37353)" />
+         transform="matrix(0.22223428,1.1208489,-1.1208491,0.22223424,848.73281,361.9107)" />
       <path
          d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
          sodipodi:ry="48.57143"
          sodipodi:rx="48.57143"
          sodipodi:cy="655.2193"
          sodipodi:cx="197.14285"
-         id="path3162-6-2-3"
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:23.16313362;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.20452475,1.0152816,-1.0315302,0.2013031,791.81946,147.65509)" />
+         transform="matrix(0.17284887,0.87177139,-0.87177138,0.17284885,695.26827,443.37281)" />
+      <path
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
+         sodipodi:ry="48.57143"
+         sodipodi:rx="48.57143"
+         sodipodi:cy="655.2193"
+         sodipodi:cx="197.14285"
+         id="path3162-6-7-2"
+         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)" />
+      <path
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
+         sodipodi:ry="48.57143"
+         sodipodi:rx="48.57143"
+         sodipodi:cy="655.2193"
+         sodipodi:cx="197.14285"
+         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)" />
+      <path
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
+         sodipodi:ry="48.57143"
+         sodipodi:rx="48.57143"
+         sodipodi:cy="655.2193"
+         sodipodi:cx="197.14285"
+         id="path3162-6-7-6"
+         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)" />
+      <path
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
+         sodipodi:ry="48.57143"
+         sodipodi:rx="48.57143"
+         sodipodi:cy="655.2193"
+         sodipodi:cx="197.14285"
+         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)" />
+      <path
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
+         sodipodi:ry="48.57143"
+         sodipodi:rx="48.57143"
+         sodipodi:cy="655.2193"
+         sodipodi:cx="197.14285"
+         id="path3162-6-7-27"
+         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)" />
+      <path
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
+         sodipodi:ry="48.57143"
+         sodipodi:rx="48.57143"
+         sodipodi:cy="655.2193"
+         sodipodi:cx="197.14285"
+         id="path3162-6-7-1-5"
+         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)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Center.svg b/src/Mod/Draft/Resources/icons/Snap_Center.svg
index 2471899893..2f94dfa6c7 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Center.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Center.svg
@@ -14,12 +14,36 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Center.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3827">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3829" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3831" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3819">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3821" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3823" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -84,6 +108,24 @@
        id="radialGradient4437"
        xlink:href="#linearGradient3144-7"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3819"
+       id="linearGradient3825"
+       x1="188.60719"
+       y1="615.00635"
+       x2="206.72833"
+       y2="690.13739"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3827"
+       id="linearGradient3833"
+       x1="213.65439"
+       y1="771.66589"
+       x2="102.63113"
+       y2="450.93207"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -92,18 +134,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="28.117126"
-     inkscape:cy="53.665776"
+     inkscape:zoom="11"
+     inkscape:cx="28.436777"
+     inkscape:cy="25.367771"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="755"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -124,10 +176,11 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <path
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:5;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 31.75 4.3125 C 16.893974 4.3125 4.875 16.362724 4.875 31.21875 C 4.875 46.074777 16.893974 58.09375 31.75 58.09375 C 46.606026 58.09375 58.65625 46.074777 58.65625 31.21875 C 58.65625 16.362724 46.606026 4.3125 31.75 4.3125 z M 31.75 13.46875 C 41.538951 13.46875 49.5 21.429801 49.5 31.21875 C 49.5 41.007702 41.538951 48.9375 31.75 48.9375 C 21.961049 48.9375 14.03125 41.007702 14.03125 31.21875 C 14.03125 21.429801 21.961049 13.46875 31.75 13.46875 z "
-         transform="matrix(6.1679584,0,0,6.1679584,-39.231908,407.75637)"
-         id="path4364" />
+         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" />
       <path
          d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
          sodipodi:ry="48.57143"
@@ -135,9 +188,39 @@
          sodipodi:cy="655.2193"
          sodipodi:cx="197.14285"
          id="path3162"
-         style="fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:30.83979276;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;color:#000000"
+         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(-0.98090505,0.19448714,-0.19448714,-0.98090505,478.13202,1203.4409)" />
+         transform="matrix(-1.1208489,0.22223427,-0.22223425,-1.120849,524.72228,1295.721)" />
+      <path
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
+         sodipodi:ry="48.57143"
+         sodipodi:rx="48.57143"
+         sodipodi:cy="655.2193"
+         sodipodi:cx="197.14285"
+         id="path3162-1"
+         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)" />
+      <path
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
+         sodipodi:ry="48.57143"
+         sodipodi:rx="48.57143"
+         sodipodi:cy="655.2193"
+         sodipodi:cx="197.14285"
+         id="path3162-1-7"
+         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)" />
+      <path
+         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
+         sodipodi:ry="48.57143"
+         sodipodi:rx="48.57143"
+         sodipodi:cy="655.2193"
+         sodipodi:cx="197.14285"
+         id="path3162-1-7-4"
+         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)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg b/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg
index b312a40d3a..e73df2d2a3 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Dimensions.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Snap_Perpendicular.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Snap_Dimensions.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
@@ -275,20 +275,33 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="10.692507"
-     inkscape:cy="51.969772"
+     inkscape:zoom="5.0968312"
+     inkscape:cx="-18.052292"
+     inkscape:cy="40.241721"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1053"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:object-paths="true"
-     inkscape:object-nodes="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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -297,7 +310,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -309,12 +322,125 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <path
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;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 28.21875,5.84375 c -0.270422,0.7267996 -0.646568,1.3487013 -1.125,1.84375 -0.478435,0.4950682 -1.13466,0.928399 -2,1.28125 l 0,2.625 c 0.586599,-0.226456 1.050591,-0.439964 1.4375,-0.6875 0.391066,-0.247523 0.802718,-0.568481 1.21875,-0.96875 l 0,7.6875 2.59375,0 0,-11.78125 z m 12.96875,0 c -1.281375,1.3e-5 -2.278047,0.4642418 -2.90625,1.34375 -0.624046,0.8795293 -0.90625,2.3923263 -0.90625,4.59375 0,0.895325 0.0356,1.726166 0.15625,2.46875 0.124808,0.737325 0.310752,1.323408 0.53125,1.75 0.3037,0.60039 0.713223,1.064273 1.1875,1.375 0.47427,0.310728 1.07409,0.4375 1.84375,0.4375 1.372892,0 2.344604,-0.463182 2.90625,-1.4375 0.561633,-0.974316 0.843742,-2.49238 0.84375,-4.59375 -8e-6,-0.937446 -0.07944,-1.8550217 -0.25,-2.71875 C 44.506376,8.6095835 44.395602,8.212071 44.25,7.875 44.108542,7.5326825 43.874611,7.2117222 43.625,6.90625 43.375376,6.5955329 43.051473,6.3458589 42.65625,6.15625 42.261017,5.9613978 41.803219,5.843763 41.1875,5.84375 z m 8.5,0 c -1.281375,1.3e-5 -2.215547,0.4642418 -2.84375,1.34375 -0.624046,0.8795293 -0.9375,2.3923263 -0.9375,4.59375 0,0.895325 0.06685,1.726166 0.1875,2.46875 0.124808,0.737325 0.279504,1.323408 0.5,1.75 0.3037,0.60039 0.681975,1.064273 1.15625,1.375 0.474272,0.310728 1.10534,0.4375 1.875,0.4375 1.372892,0 2.344602,-0.463182 2.90625,-1.4375 0.561632,-0.974316 0.843742,-2.49238 0.84375,-4.59375 -8e-6,-0.937446 -0.07943,-1.8550217 -0.25,-2.71875 C 53.037627,8.6095835 52.926852,8.212071 52.78125,7.875 52.639793,7.5326825 52.437111,7.2117222 52.1875,6.90625 51.937876,6.5955329 51.613972,6.3458589 51.21875,6.15625 50.823515,5.9613978 50.303219,5.843763 49.6875,5.84375 z M 41.09375,8 c 0.411866,8.1e-6 0.702392,0.2493349 0.90625,0.78125 0.20801,0.526667 0.312495,1.555915 0.3125,3.09375 -5e-6,1.048055 -0.03348,1.848695 -0.125,2.34375 -0.08737,0.495062 -0.24613,0.830773 -0.4375,1.0625 -0.187219,0.226466 -0.398315,0.343752 -0.65625,0.34375 -0.391071,2e-6 -0.69824,-0.244056 -0.90625,-0.78125 -0.203858,-0.542455 -0.312503,-1.556603 -0.3125,-3.03125 -3e-6,-1.458836 0.09403,-2.4628012 0.28125,-3 C 40.343459,8.2700515 40.673556,8.0000081 41.09375,8 z M 49.625,8 c 0.411864,8.1e-6 0.70239,0.2493349 0.90625,0.78125 0.208009,0.526667 0.312494,1.555915 0.3125,3.09375 -6e-6,1.048055 -0.03348,1.848695 -0.125,2.34375 -0.08737,0.495062 -0.24613,0.830773 -0.4375,1.0625 -0.187218,0.226466 -0.398317,0.343752 -0.65625,0.34375 -0.391073,2e-6 -0.698238,-0.244056 -0.90625,-0.78125 -0.203858,-0.542455 -0.281253,-1.556603 -0.28125,-3.03125 -3e-6,-1.458836 0.09403,-2.4628012 0.28125,-3 C 48.905961,8.2700515 49.204806,8.0000081 49.625,8 z m -16.28125,6.40625 0,3.21875 2.71875,0 0,-3.21875 z m 21.375,6.21875 c -0.88574,0.02591 -1.781474,0.366933 -2.4375,1.0625 -0.252317,0.267526 -0.442872,0.59148 -0.59375,0.90625 l -24.34375,-0.0625 c -0.15605,-0.233041 -0.338706,-0.433937 -0.5625,-0.625 -1.314724,-1.122444 -3.283804,-0.970975 -4.40625,0.34375 -1.122444,1.314725 -0.970975,3.283804 0.34375,4.40625 0.225644,0.192644 0.461821,0.319561 0.71875,0.4375 l -0.03125,13.78125 0,1.96875 0,8.34375 c -0.233043,0.15605 -0.465187,0.307456 -0.65625,0.53125 -1.122443,1.314724 -0.970976,3.315054 0.34375,4.4375 1.314725,1.122443 3.315054,0.970975 4.4375,-0.34375 0.192644,-0.225644 0.319563,-0.493071 0.4375,-0.75 l 7.659091,0.0625 0,-2.625 L 28,52.5 c -0.1838,-0.408394 -0.480552,-0.814917 -0.84375,-1.125 -0.361551,-0.308673 -0.757466,-0.50719 -1.1875,-0.625 l 0,-7.90625 0.03125,0 0.03125,-15.71875 c 0.408394,-0.183801 0.783668,-0.4493 1.09375,-0.8125 0.308673,-0.361551 0.50719,-0.788718 0.625,-1.21875 l 23.75,0.0625 c 0.17324,0.535834 0.498906,1.023841 0.9375,1.4375 0.41988,0.396011 0.918001,0.665871 1.4375,0.8125 l -0.03125,7.693182 2.5625,0 0.0625,-8.005682 c 0.310884,-0.170107 0.587453,-0.353254 0.84375,-0.625 1.31205,-1.391135 1.266133,-3.5942 -0.125,-4.90625 -0.695569,-0.656026 -1.583011,-0.963413 -2.46875,-0.9375 z m -42.09375,4.5 c -0.937445,8e-6 -1.855023,0.07944 -2.71875,0.25 C 9.453334,25.462373 9.087071,25.573149 8.75,25.71875 8.407683,25.860207 8.086721,26.094139 7.78125,26.34375 7.470531,26.593374 7.189611,26.886027 7,27.28125 6.805149,27.676485 6.718763,28.196781 6.71875,28.8125 c 1.3e-5,1.281375 0.4329921,2.246797 1.3125,2.875 0.8795291,0.624046 2.423576,0.9375 4.625,0.9375 0.895325,0 1.726166,-0.06685 2.46875,-0.1875 0.737324,-0.12481 1.323408,-0.310752 1.75,-0.53125 0.60039,-0.303699 1.033025,-0.681975 1.34375,-1.15625 0.31073,-0.474272 0.46875,-1.10534 0.46875,-1.875 0,-1.372892 -0.494431,-2.344602 -1.46875,-2.90625 C 16.244434,25.407118 14.726371,25.125008 12.625,25.125 z m 0.125,2.53125 c 1.048057,6e-6 1.817446,0.06473 2.3125,0.15625 0.495063,0.08737 0.862022,0.21488 1.09375,0.40625 0.226466,0.187219 0.343753,0.398317 0.34375,0.65625 3e-6,0.391073 -0.275306,0.698238 -0.8125,0.90625 -0.542454,0.203858 -1.525353,0.312503 -3,0.3125 -1.458836,3e-6 -2.462801,-0.09403 -3,-0.28125 -0.5424489,-0.187211 -0.8437421,-0.517306 -0.84375,-0.9375 7.9e-6,-0.411864 0.2805849,-0.70239 0.8125,-0.90625 0.526667,-0.20801 1.555917,-0.312494 3.09375,-0.3125 z m -0.125,6.03125 c -0.937445,8e-6 -1.855023,0.07944 -2.71875,0.25 C 9.453334,34.024874 9.087071,34.135646 8.75,34.28125 8.407683,34.422707 8.086721,34.625389 7.78125,34.875 7.470531,35.124626 7.189611,35.448527 7,35.84375 c -0.194851,0.395233 -0.281237,0.884281 -0.28125,1.5 1.3e-5,1.281375 0.4329921,2.246797 1.3125,2.875 0.8795291,0.624046 2.423576,0.90625 4.625,0.90625 0.895325,0 1.726166,-0.0356 2.46875,-0.15625 0.737324,-0.124808 1.323408,-0.310752 1.75,-0.53125 0.60039,-0.3037 1.033025,-0.681973 1.34375,-1.15625 0.31073,-0.47427 0.46875,-1.10534 0.46875,-1.875 0,-1.372892 -0.494431,-2.344604 -1.46875,-2.90625 -0.974316,-0.561633 -2.492379,-0.812492 -4.59375,-0.8125 z m 0.125,2.53125 c 1.048057,5e-6 1.817446,0.0022 2.3125,0.09375 0.495063,0.08737 0.862022,0.24613 1.09375,0.4375 0.226466,0.187219 0.343753,0.429565 0.34375,0.6875 3e-6,0.391071 -0.275306,0.66699 -0.8125,0.875 -0.542454,0.203858 -1.525353,0.312502 -3,0.3125 -1.458836,2e-6 -2.462801,-0.09403 -3,-0.28125 C 9.1450511,38.156541 8.8437579,37.857694 8.84375,37.4375 8.8437579,37.025634 9.1243349,36.703858 9.65625,36.5 10.182917,36.291991 11.212167,36.218755 12.75,36.21875 z m 2.53125,6.21875 0,2.71875 3.21875,0 0,-2.71875 z m -8.5625,5.75 0,2.125 c 0.7268,0.270422 1.3487,0.646568 1.84375,1.125 0.495068,0.478435 0.897149,1.13466 1.25,2 l 2.65625,0 C 12.242294,52.850901 11.997537,52.355659 11.75,51.96875 11.502479,51.577684 11.181519,51.166032 10.78125,50.75 l 7.71875,0 0,-2.5625 z"
-         transform="matrix(6.1679584,0,0,6.1679584,-39.231908,407.75637)"
-         id="rect3730"
+         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="ccccccccccccsccsssccccccccsccsssccccccccsccccsccccsccccscccccccssccsssccccsssccccsccccsccsccccssscccccccsccssscsccccscccscccccccscccsscsccccscccsccccccccccccccc" />
+         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'"
+         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'"
+         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'"
+         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'"
+         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'"
+         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'"
+         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'"
+         id="path3055-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccsccscccscscccc" />
+      <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" />
+      <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"
+         id="path3854-7"
+         sodipodi:cx="28"
+         sodipodi:cy="52"
+         sodipodi:rx="7"
+         sodipodi:ry="7"
+         d="m 35,52 a 7,7 0 1 1 -14,0 7,7 0 1 1 14,0 z"
+         transform="matrix(3.965116,0,0,3.965116,7.0277833,358.85328)" />
+      <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"
+         id="path3854-7-7"
+         sodipodi:cx="28"
+         sodipodi:cy="52"
+         sodipodi:rx="7"
+         sodipodi:ry="7"
+         d="m 35,52 a 7,7 0 1 1 -14,0 7,7 0 1 1 14,0 z"
+         transform="matrix(3.965116,0,0,3.965116,7.0277856,513.05224)" />
+      <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"
+         id="path3854-7-1"
+         sodipodi:cx="28"
+         sodipodi:cy="52"
+         sodipodi:rx="7"
+         sodipodi:ry="7"
+         d="m 35,52 a 7,7 0 1 1 -14,0 7,7 0 1 1 14,0 z"
+         transform="matrix(3.965116,0,0,3.965116,173.56266,358.85328)" />
+      <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" />
+      <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"
+         id="path3854-7-3"
+         sodipodi:cx="28"
+         sodipodi:cy="52"
+         sodipodi:rx="7"
+         sodipodi:ry="7"
+         d="m 35,52 a 7,7 0 1 1 -14,0 7,7 0 1 1 14,0 z"
+         transform="matrix(2.2028423,0,0,2.2028423,56.371447,450.49151)" />
+      <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"
+         id="path3854-7-3-1"
+         sodipodi:cx="28"
+         sodipodi:cy="52"
+         sodipodi:rx="7"
+         sodipodi:ry="7"
+         d="m 35,52 a 7,7 0 1 1 -14,0 7,7 0 1 1 14,0 z"
+         transform="matrix(2.2028423,0,0,2.2028423,222.90633,450.49151)" />
+      <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"
+         id="path3854-7-3-2"
+         sodipodi:cx="28"
+         sodipodi:cy="52"
+         sodipodi:rx="7"
+         sodipodi:ry="7"
+         d="m 35,52 a 7,7 0 1 1 -14,0 7,7 0 1 1 14,0 z"
+         transform="matrix(2.2028423,0,0,2.2028423,56.371447,604.69047)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg b/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg
index c2646f3bbb..12c3d3bfdf 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Endpoint.svg
@@ -14,12 +14,24 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Endpoint.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3779">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3781" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3783" />
+    </linearGradient>
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144"
@@ -72,6 +84,15 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3779"
+       id="linearGradient3785"
+       x1="170.20491"
+       y1="728.83636"
+       x2="146.08063"
+       y2="508.38715"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -80,18 +101,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="15.796169"
-     inkscape:cy="25.292615"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="50.185544"
+     inkscape:cy="20.153033"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="755"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -112,10 +144,16 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <path
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:30.83979221;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.0564,455.28183 92.441027,621.31832 c -8.824277,-3.51857 -18.453835,-5.35513 -28.552802,-5.08474 -39.782772,1.06517 -71.0782086,34.14161 -70.0130348,73.92438 1.0651737,39.78277 34.1416048,71.27377 73.9243778,70.2086 39.782772,-1.06517 71.273782,-34.33718 70.208602,-74.11995 -0.10437,-3.89796 -0.67312,-7.62876 -1.36897,-11.34289 L 323.40581,506.91155 277.0564,455.28183 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"
+         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" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Extension.svg b/src/Mod/Draft/Resources/icons/Snap_Extension.svg
index 3614773f8f..fb5a04f048 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Extension.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Extension.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Extension.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -232,6 +232,156 @@
        id="radialGradient4815"
        xlink:href="#linearGradient3144-2"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3770"
+       id="linearGradient3803"
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312"
+       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
+       y2="18.702312"
+       x2="29.055662"
+       y1="34.472939"
+       x1="34.969646"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3015"
+       xlink:href="#linearGradient3770"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3770-7"
+       id="linearGradient3803-1"
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3770-7"
+       inkscape:collect="always">
+      <stop
+         id="stop3772-4"
+         offset="0"
+         style="stop-color:#06989a;stop-opacity:1" />
+      <stop
+         id="stop3774-0"
+         offset="1"
+         style="stop-color:#34e0e2;stop-opacity:1" />
+    </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" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3770-2"
+       id="linearGradient3803-8"
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3770-2"
+       inkscape:collect="always">
+      <stop
+         id="stop3772-45"
+         offset="0"
+         style="stop-color:#06989a;stop-opacity:1" />
+      <stop
+         id="stop3774-5"
+         offset="1"
+         style="stop-color:#34e0e2;stop-opacity:1" />
+    </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"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3015-1-1"
+       xlink:href="#linearGradient3770-2-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3770-2-5"
+       inkscape:collect="always">
+      <stop
+         id="stop3772-45-2"
+         offset="0"
+         style="stop-color:#06989a;stop-opacity:1" />
+      <stop
+         id="stop3774-5-7"
+         offset="1"
+         style="stop-color:#34e0e2;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="18.702312"
+       x2="29.055662"
+       y1="34.472939"
+       x1="34.969646"
+       gradientUnits="userSpaceOnUse"
+       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" />
+    <linearGradient
+       id="linearGradient3770-2-2"
+       inkscape:collect="always">
+      <stop
+         id="stop3772-45-3"
+         offset="0"
+         style="stop-color:#06989a;stop-opacity:1" />
+      <stop
+         id="stop3774-5-2"
+         offset="1"
+         style="stop-color:#34e0e2;stop-opacity:1" />
+    </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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -240,18 +390,39 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="28.502359"
-     inkscape:cy="27.32422"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="80.337355"
+     inkscape:cy="43.284171"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="755"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -272,35 +443,65 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162"
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:23.1889267;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.78922717,-0.47204736,0.48386925,-0.79797851,131.3483,1222.7997)" />
+         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"
+         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 a 8.8709764,8.8709764 0 1 1 -17.741953,0 8.8709764,8.8709764 0 1 1 17.741953,0 z"
+         transform="matrix(4.8670752,0,0,4.867076,125.00861,475.72705)" />
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-3"
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:23.1889267;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.78922715,-0.47204735,0.48386927,-0.7979785,-2.6129169,1223.9211)" />
+         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"
+         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 a 8.8709764,8.8709764 0 1 1 -17.741953,0 8.8709764,8.8709764 0 1 1 17.741953,0 z"
+         transform="matrix(3.4378549,0,0,3.4378554,171.1044,514.06929)" />
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-3-8"
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:23.1889267;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.78922715,-0.47204735,0.48386927,-0.7979785,-133.20979,1227.2854)" />
+         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"
+         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 a 8.8709764,8.8709764 0 1 1 -17.741953,0 8.8709764,8.8709764 0 1 1 17.741953,0 z"
+         transform="matrix(4.8670752,0,0,4.867076,2.3347765,475.72705)" />
+      <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"
+         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 a 8.8709764,8.8709764 0 1 1 -17.741953,0 8.8709764,8.8709764 0 1 1 17.741953,0 z"
+         transform="matrix(3.4378549,0,0,3.4378554,48.430568,514.06929)" />
+      <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"
+         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 a 8.8709764,8.8709764 0 1 1 -17.741953,0 8.8709764,8.8709764 0 1 1 17.741953,0 z"
+         transform="matrix(4.8670752,0,0,4.867076,-121.0244,475.72705)" />
+      <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"
+         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 a 8.8709764,8.8709764 0 1 1 -17.741953,0 8.8709764,8.8709764 0 1 1 17.741953,0 z"
+         transform="matrix(3.4378549,0,0,3.4378554,-74.928601,514.06929)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Grid.svg b/src/Mod/Draft/Resources/icons/Snap_Grid.svg
index fe467958e5..a2bcc3e32c 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Grid.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Grid.svg
@@ -14,12 +14,24 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Grid.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3897">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3899" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3901" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -73,6 +85,15 @@
          offset="1"
          id="stop3148-8" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3897"
+       id="linearGradient3903"
+       x1="207.48642"
+       y1="771.66589"
+       x2="108.79909"
+       y2="450.93207"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -81,18 +102,39 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="36.492831"
-     inkscape:cy="30.896655"
+     inkscape:zoom="5.5"
+     inkscape:cx="6.5710963"
+     inkscape:cy="18.928522"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1057"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -112,13 +154,84 @@
     <g
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
-      <path
-         transform="matrix(6.1679584,0,0,6.1679584,-28.130145,407.75637)"
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:4;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.90625,4.1875 C 11.415109,4.17955 10.05455,5.5401086 10.0625,7.03125 l 0,6.125 -5.125,0 C 3.4463586,13.1483 2.0858004,14.508859 2.09375,16 l 0,5.65625 C 2.0858,23.147391 3.4463586,24.50795 4.9375,24.5 l 5.125,0 0,18.65625 -5.125,0 C 3.4463586,43.1483 2.0858004,44.508859 2.09375,46 l 0,5.65625 C 2.0858,53.147391 3.4463586,54.50795 4.9375,54.5 l 5.125,0 0,3.96875 c -0.0079,1.491141 1.352609,2.8517 2.84375,2.84375 l 5.65625,0 c 1.491141,0.008 2.8517,-1.352609 2.84375,-2.84375 l 0,-3.96875 16.65625,0 0,3.96875 c -0.008,1.491141 1.352609,2.8517 2.84375,2.84375 l 5.65625,0 c 1.491141,0.008 2.8517,-1.352609 2.84375,-2.84375 l 0,-3.96875 6.71875,0 c 1.491141,0.008 2.8517,-1.352609 2.84375,-2.84375 l 0,-5.65625 c 0.008,-1.491141 -1.352609,-2.8517 -2.84375,-2.84375 l -6.71875,0 0,-18.65625 6.71875,0 c 1.491141,0.008 2.8517,-1.352609 2.84375,-2.84375 l 0,-5.65625 c 0.008,-1.491141 -1.352609,-2.8517 -2.84375,-2.84375 l -6.71875,0 0,-6.125 C 49.4142,5.5401086 48.053641,4.1795504 46.5625,4.1875 l -5.65625,0 C 39.415109,4.17955 38.05455,5.5401086 38.0625,7.03125 l 0,6.125 -16.65625,0 0,-6.125 C 21.4142,5.5401086 20.053641,4.1795504 18.5625,4.1875 z m 8.5,20.3125 c 0,0 5.037824,0 7.813866,0 2.776041,0 8.842384,0 8.842384,0 0,0 0.25713,5.190231 0.25713,8.299606 0,3.109375 -0.25713,10.356644 -0.25713,10.356644 0,0 -5.552083,0.128565 -8.328125,0.128565 -2.776042,0 -8.328125,-0.128565 -8.328125,-0.128565 0,0 -0.128565,-6.733009 -0.128565,-9.842384 0,-3.109375 0.128565,-8.813866 0.128565,-8.813866 z"
-         id="path3775"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccczczczczc" />
+      <g
+         id="g3861"
+         style="stroke:#042a2a">
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999"
+           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" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999-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" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999-7"
+           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" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999-4"
+           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" />
+      </g>
+      <g
+         id="g3855"
+         transform="translate(4.9588412e-6,-1.9669619e-6)"
+         style="fill:none;stroke:url(#linearGradient3903);stroke-width:24.67183376999999900">
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999-8"
+           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" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999-1-2"
+           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" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999-7-4"
+           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" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999-4-5"
+           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" />
+      </g>
+      <g
+         id="g3855-5"
+         transform="translate(-6.1679587,-6.1679699)"
+         style="fill:none;stroke:#34e0e2;stroke-width:12.33591652">
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999-8-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" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999-1-2-7"
+           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" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path2999-7-4-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" />
+        <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" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Intersection.svg b/src/Mod/Draft/Resources/icons/Snap_Intersection.svg
index 2f14be47dc..d778feb6d6 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Intersection.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Intersection.svg
@@ -14,12 +14,24 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Intersection.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3782">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3784" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3786" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -84,6 +96,15 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3782"
+       id="linearGradient3788"
+       x1="36"
+       y1="56"
+       x2="30"
+       y2="13"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -92,18 +113,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="15.517769"
-     inkscape:cy="17.410483"
+     inkscape:zoom="15.556349"
+     inkscape:cx="23.810967"
+     inkscape:cy="20.588263"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="755"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -124,10 +155,18 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <path
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:5.00000003;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 14.4375 4.78125 L 4.65625 14.5625 L 22 31.90625 L 4.65625 49.25 L 14.4375 59.03125 L 31.78125 41.6875 L 49.125 59.03125 L 58.90625 49.25 L 41.5625 31.90625 L 58.90625 14.5625 L 49.125 4.78125 L 31.78125 22.125 L 14.4375 4.78125 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"
+         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" />
+         id="rect3942-4-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccccc" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Lock.svg b/src/Mod/Draft/Resources/icons/Snap_Lock.svg
index 367b1198af..268fca357a 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Lock.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Lock.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg3230"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Lock.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -22,27 +22,16 @@
      id="defs3232">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3273">
+       id="linearGradient3838">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#34e0e2;stop-opacity:1"
          offset="0"
-         id="stop3275" />
+         id="stop3840" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#06989a;stop-opacity:1"
          offset="1"
-         id="stop3277" />
+         id="stop3842" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3273"
-       id="radialGradient2411"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.0807499,5.629409,-41.831703)"
-       cx="2780.5623"
-       cy="543.78192"
-       fx="2780.5623"
-       fy="543.78192"
-       r="38.829369" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3293"
@@ -84,28 +73,6 @@
        y1="671.11081"
        x2="2900.148"
        y2="671.11081" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3255">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3257" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3259" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3255"
-       id="linearGradient2403"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7890986,0,0,0.92684144,580.75719,52.023946)"
-       x1="2732.3571"
-       y1="711.11219"
-       x2="2839.0713"
-       y2="711.11219" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -113,6 +80,45 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective3238" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3844"
+       x1="2802.9631"
+       y1="538.36249"
+       x2="2859.7263"
+       y2="786.05646"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838-9"
+       id="linearGradient3844-7"
+       x1="2802.9631"
+       y1="538.36249"
+       x2="2859.7263"
+       y2="786.05646"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3838-9">
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="0"
+         id="stop3840-8" />
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="1"
+         id="stop3842-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3880"
+       gradientUnits="userSpaceOnUse"
+       x1="2802.9631"
+       y1="626.0874"
+       x2="2849.4058"
+       y2="822.17853" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -121,18 +127,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="51.419166"
-     inkscape:cy="17.054101"
+     inkscape:zoom="10.193662"
+     inkscape:cx="35.570761"
+     inkscape:cy="29.991045"
      inkscape:current-layer="g2383"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="777"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata3235">
     <rdf:RDF>
@@ -161,47 +178,50 @@
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/close.png"
          transform="translate(-6,-8)"
          id="g2385"
-         style="stroke-width:15.48087467;stroke-miterlimit:4;stroke-dasharray:none">
+         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">
         <path
-           style="opacity:1;fill:#009573;fill-opacity:1;fill-rule:evenodd;stroke:#002a2d;stroke-width:15.48087467;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 2830.8888,516.4852 C 2788.1638,516.48519 2753.3894,551.24098 2752.5573,594.39382 L 2752.5325,594.39382 L 2752.5325,595.98531 L 2752.5325,663.15135 L 2782.0746,663.15135 L 2782.0746,594.39382 L 2782.0249,594.39382 C 2783.2954,567.56146 2805.1518,546.17652 2831.9083,546.17652 C 2859.0136,546.17651 2881.0583,568.08689 2881.7917,595.4631 L 2882.0155,595.4631 L 2882.0155,662.82807 L 2909.3195,662.82807 L 2909.3195,593.87161 L 2909.1952,593.87161 C 2908.0773,550.90388 2873.4234,516.48521 2830.8888,516.4852 z"
-           id="path2387" />
+           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" />
         <rect
-           style="opacity:1;fill:#009174;fill-opacity:1;fill-rule:evenodd;stroke:#002a2d;stroke-width:15.48087467;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           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="190.15494"
-           height="145.67435"
-           x="2736.5015"
-           y="646.33221" />
+           width="196.09097"
+           height="154.80875"
+           x="2730.7192"
+           y="641.5683" />
+        <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"
+           x="2741.0398"
+           y="651.88885" />
       </g>
       <path
-         sodipodi:nodetypes="csscccc"
-         id="path2391"
-         d="m 2820.6698,645.73677 c 0,0 -15.7005,16.69534 -17.7546,34.75655 -2.5648,22.55078 8.1728,28.79829 10.4273,53.29339 2.2546,24.49509 -7.3273,42.70091 -7.3273,42.70091 l -68.4824,0 -0.2819,-130.41983 83.4189,-0.33102 z"
-         style="fill:url(#linearGradient2403);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         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" />
-      <g
-         transform="translate(0,8)"
-         id="g2393">
-        <path
-           style="opacity:1;fill:url(#linearGradient2405);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 2767.1875,661.5 C 2762.5699,661.5 2758.659,664.51139 2757.25,668.71875 C 2757.9725,668.55952 2758.6981,668.46875 2759.4688,668.46875 L 2883.9688,668.46875 C 2889.7809,668.46874 2894.4375,673.23326 2894.4375,679.15625 L 2894.4375,681 C 2894.4375,682.21435 2894.2378,683.38262 2893.875,684.46875 C 2898.6151,683.43716 2902.1562,679.1785 2902.1562,674.03125 L 2902.1562,672.1875 C 2902.1563,666.26451 2897.4684,661.49999 2891.6562,661.5 L 2767.1875,661.5 z"
-           id="path2395" />
-        <path
-           style="opacity:1;fill:url(#linearGradient2407);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 2767.1875,693.5 C 2762.5699,693.5 2758.659,696.51139 2757.25,700.71875 C 2757.9725,700.55952 2758.6981,700.46875 2759.4688,700.46875 L 2883.9688,700.46875 C 2889.7809,700.46874 2894.4375,705.23326 2894.4375,711.15625 L 2894.4375,713 C 2894.4375,714.21435 2894.2378,715.38262 2893.875,716.46875 C 2898.6151,715.43716 2902.1562,711.1785 2902.1562,706.03125 L 2902.1562,704.1875 C 2902.1563,698.26451 2897.4684,693.49999 2891.6562,693.5 L 2767.1875,693.5 z"
-           id="path2397" />
-        <path
-           style="opacity:1;fill:url(#linearGradient2409);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 2767.1875,725.5 C 2762.5699,725.5 2758.659,728.51139 2757.25,732.71875 C 2757.9725,732.55952 2758.6981,732.46875 2759.4688,732.46875 L 2883.9688,732.46875 C 2889.7809,732.46874 2894.4375,737.23326 2894.4375,743.15625 L 2894.4375,745 C 2894.4375,746.21435 2894.2378,747.38262 2893.875,748.46875 C 2898.6151,747.43716 2902.1562,743.1785 2902.1562,738.03125 L 2902.1562,736.1875 C 2902.1563,730.26451 2897.4684,725.49999 2891.6562,725.5 L 2767.1875,725.5 z"
-           id="path2399" />
-      </g>
       <path
-         sodipodi:nodetypes="csscczzzcc"
-         id="path2401"
-         d="m 2832.0579,513.74833 c 0,0 -24.6429,-0.35715 -41.7857,11.78571 -17.1429,12.14286 -25.7143,23.21429 -31.4286,40.35714 -5.7143,17.14286 -4.2857,27.85714 -4.2857,27.85714 l 12.5,3.92858 c 0,0 -0.3433,-0.89433 1.3531,-12.59076 1.6899,-11.65095 5.8505,-25.49622 16.0291,-36.92479 10.1785,-11.42857 27.8827,-17.92521 41.1892,-17.38802 13.3065,0.53719 8.2143,-2.025 8.2143,-2.025 z"
-         style="fill:url(#radialGradient2411);fill-opacity:1;fill-rule:evenodd;stroke:none"
+         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" />
+      <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" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg b/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg
index ce2b5e7440..96ae11b991 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Midpoint.svg
@@ -14,12 +14,24 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Midpoint.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3782">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3784" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3786" />
+    </linearGradient>
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144"
@@ -84,6 +96,15 @@
          offset="1"
          id="stop3148-3" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3782"
+       id="linearGradient3788"
+       x1="170.47868"
+       y1="740.82611"
+       x2="145.80684"
+       y2="481.77188"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -92,18 +113,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="-25.216024"
-     inkscape:cy="25.806874"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="11.568719"
+     inkscape:cy="17.781812"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="755"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -124,10 +155,16 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <path
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:29.49434662;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 282.11387,449.67455 -94.70489,86.96598 c -9.22482,-3.91235 -19.33784,-6.2723 -29.92602,-6.51779 -45.72868,-1.06027 -83.629813,36.01519 -84.668739,82.68285 -0.20126,9.04054 1.073033,17.65868 3.467038,25.88495 l -92.880142,85.28997 43.429221,49.349 91.055382,-83.61397 c 10.79365,5.66014 22.81831,9.19717 35.76525,9.49736 45.72868,1.06026 83.81228,-36.01519 84.8512,-82.68286 0.25371,-11.39607 -1.87016,-22.20357 -5.65674,-32.21651 l 92.88014,-85.28997 -43.6117,-49.34901 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"
+         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" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Near.svg b/src/Mod/Draft/Resources/icons/Snap_Near.svg
index a2389050ed..a9beb1a4a7 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Near.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Near.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="Snap_Parallel.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Snap_Near.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
@@ -50,6 +50,46 @@
          offset="1"
          id="stop3148-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" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3770"
+       id="linearGradient3803"
+       x1="34.969646"
+       y1="34.472939"
+       x2="29.055662"
+       y2="18.702312"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -58,18 +98,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="28.117126"
-     inkscape:cy="53.665776"
+     inkscape:zoom="11"
+     inkscape:cx="23.31398"
+     inkscape:cy="30.868817"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="755"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -78,7 +128,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -89,24 +139,40 @@
     <g
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
-      <rect
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:27.8452301;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="293.52496"
-         height="62.37265"
-         x="-613.99969"
-         y="-514.1391"
-         transform="matrix(-0.84132761,-0.54052553,0.53359906,-0.84573758,0,0)" />
       <path
          sodipodi:type="arc"
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:3.9179883;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"
+         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"
          id="path2998"
          sodipodi:cx="32.012653"
          sodipodi:cy="26.587624"
          sodipodi:rx="8.8709764"
          sodipodi:ry="8.8709764"
          d="m 40.88363,26.587624 a 8.8709764,8.8709764 0 1 1 -17.741953,0 8.8709764,8.8709764 0 1 1 17.741953,0 z"
-         transform="matrix(6.1679584,0,0,6.1679584,33.722506,345.90371)" />
+         transform="matrix(6.2576679,0,0,6.2576679,19.497793,340.06718)" />
+      <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"
+         y="-508.47748"
+         transform="matrix(-0.84132761,-0.54052553,0.53359908,-0.84573756,0,0)" />
+      <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" />
+      <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"
+         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 a 8.8709764,8.8709764 0 1 1 -17.741953,0 8.8709764,8.8709764 0 1 1 17.741953,0 z"
+         transform="matrix(4.8670752,0,0,4.867075,64.014356,377.03975)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Ortho.svg b/src/Mod/Draft/Resources/icons/Snap_Ortho.svg
index 7c6772e342..82ebd7ba6e 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Ortho.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Ortho.svg
@@ -14,12 +14,24 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Ortho.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3801">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3803" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3805" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -188,6 +200,16 @@
          offset="1"
          id="stop3148-13" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3801"
+       id="linearGradient3807"
+       x1="182.81459"
+       y1="716.1543"
+       x2="145.80684"
+       y2="481.77188"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,12.335917)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -196,18 +218,37 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11"
-     inkscape:cx="22.199652"
-     inkscape:cy="28.79221"
+     inkscape:zoom="15.556349"
+     inkscape:cx="40.693527"
+     inkscape:cy="29.653787"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="777"
-     inkscape:window-x="1920"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -228,11 +269,17 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <path
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:24.16598892;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 138.09323,476.2983 c 0,0 0.56072,34.97023 0.56072,51.61427 0,16.64403 -0.56072,48.24992 -0.56072,48.24992 0,0 -32.16661,0 -48.810648,0 -16.644032,0 -51.053542,0 -51.053542,0 l 0,49.08818 99.86419,0 c 0,0 0,34.97023 0,51.61426 0,16.64403 0,48.24992 0,48.24992 l 49.08818,0 0,-99.86418 99.86419,0 0,-49.08818 c 0,0 -33.84879,-1.12145 -50.49282,-1.12145 -16.64404,0 -49.37137,1.12145 -49.37137,1.12145 0,0 0.55862,-32.72629 0.56072,-49.37137 0.002,-16.64508 -0.56072,-50.49282 -0.56072,-50.49282 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"
+         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="czczccczccccczczcc" />
+         sodipodi:nodetypes="ccccccccccccc" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Parallel.svg b/src/Mod/Draft/Resources/icons/Snap_Parallel.svg
index ab186c586b..6c4b1d5898 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Parallel.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Parallel.svg
@@ -14,12 +14,36 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Parallel.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <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">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3762" />
+      <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"
@@ -50,6 +74,45 @@
          offset="1"
          id="stop3148-0" />
     </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">
+      <stop
+         id="stop3772-4"
+         offset="0"
+         style="stop-color:#06989a;stop-opacity:1" />
+      <stop
+         id="stop3774-0"
+         offset="1"
+         style="stop-color:#34e0e2;stop-opacity:1" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -58,18 +121,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="28.117126"
-     inkscape:cy="53.665776"
+     inkscape:zoom="11"
+     inkscape:cx="27.499625"
+     inkscape:cy="38.739135"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="755"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     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:grid
+       type="xygrid"
+       id="grid2990"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -90,21 +162,34 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <rect
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:27.8452301;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"
+         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="293.52496"
-         height="62.37265"
-         x="-604.0174"
-         y="-384.45615"
+         width="285.04855"
+         height="60.013901"
+         x="-599.68225"
+         y="-383.2905"
          transform="matrix(-0.84132762,-0.54052551,0.53359904,-0.84573759,0,0)" />
       <rect
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:27.8452301;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"
+         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="293.52496"
-         height="62.37265"
-         x="-603.26886"
-         y="-520.99738"
+         width="285.73264"
+         height="62.080875"
+         x="-599.61768"
+         y="-521.89862"
          transform="matrix(-0.84132761,-0.54052553,0.53359906,-0.84573758,0,0)" />
+      <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" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg b/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg
index 3988c5f268..c240bf16d7 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Perpendicular.svg
@@ -14,12 +14,24 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Perpendicular.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3759">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3761" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3763" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -50,6 +62,15 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3759"
+       id="linearGradient3765"
+       x1="182.81459"
+       y1="728.49023"
+       x2="127.30297"
+       y2="598.96307"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -58,18 +79,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="24.45243"
-     inkscape:cy="13.674951"
+     inkscape:zoom="11"
+     inkscape:cx="33.987142"
+     inkscape:cy="31.621572"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1057"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2989"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -90,11 +119,17 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <path
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:29.87757301;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 126.31496,439.55224 c 0,0 -0.79298,86.49258 -0.79298,128.94588 0,42.45331 0.79298,125.77395 0.79298,125.77395 l -137.088541,0 0,69.15728 c 0,0 111.830851,0.79298 168.539261,0.79298 56.70841,0 171.7112,-0.79298 171.7112,-0.79298 l 0,-69.15728 -132.51282,0 c 0,0 0.79298,-56.05449 0.79298,-121.80903 0,-65.75454 -0.79298,-132.9108 -0.79298,-132.9108 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"
+         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="czccczccczcc" />
+         sodipodi:nodetypes="ccccccccc" />
+      <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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_Special.svg b/src/Mod/Draft/Resources/icons/Snap_Special.svg
index 86096d7922..f73fe3be4d 100644
--- a/src/Mod/Draft/Resources/icons/Snap_Special.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_Special.svg
@@ -14,12 +14,36 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_Special.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3793" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3795" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3783">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3785" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3787" />
+    </linearGradient>
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144"
@@ -72,6 +96,24 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3783"
+       id="linearGradient3789"
+       x1="93.347816"
+       y1="767.216"
+       x2="46.826157"
+       y2="639.28143"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791"
+       id="linearGradient3797"
+       x1="182.81459"
+       y1="691.48248"
+       x2="121.13501"
+       y2="531.11554"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -80,18 +122,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.75"
-     inkscape:cx="5.7443796"
-     inkscape:cy="14.62037"
+     inkscape:zoom="3.8890873"
+     inkscape:cx="11.726839"
+     inkscape:cy="6.4835804"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1053"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -100,7 +152,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -112,27 +164,55 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <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;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:30.83979225;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 178.04538,442.10671 -91.441791,68.38893 -3.171931,201.41763 158.596552,3.17192 74.54037,-61.85265 1.77837,-209.34745 z"
-         id="path4165"
+         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" />
+      <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" />
+      <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" />
+      <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" />
+      <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="ccccccc" />
+         sodipodi:nodetypes="ccccc" />
       <circle
-         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:30.83979225;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+         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"
          id="path4161"
          cx="70.086983"
          cy="697.43347"
-         r="69.782486" />
-      <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;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:30.83979225;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="M 240.44224,719.84309 243.61417,512.0816 91.361484,507.32371"
-         id="path4223"
-         inkscape:connector-curvature="0" />
-      <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;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:30.83979225;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-         d="m 241.12983,515.41528 80.74419,-70.65116"
-         id="path4230"
-         inkscape:connector-curvature="0" />
+         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)" />
+      <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"
+         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)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg b/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg
index 288c269ba7..8ce42cd26a 100644
--- a/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg
+++ b/src/Mod/Draft/Resources/icons/Snap_WorkingPlane.svg
@@ -14,12 +14,36 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Snap_WorkingPlane.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3773">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3775" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3777" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3765">
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="0"
+         id="stop3767" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop3769" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -73,6 +97,24 @@
          offset="1"
          id="stop3148-8" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3765"
+       id="linearGradient3771"
+       x1="207.48643"
+       y1="802.50574"
+       x2="133.47093"
+       y2="457.10004"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3773"
+       id="linearGradient3779"
+       x1="25.81818"
+       y1="49.272728"
+       x2="22.545454"
+       y2="35.090908"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -81,18 +123,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="36.730761"
-     inkscape:cy="31.703356"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="37.77694"
+     inkscape:cy="23.489841"
      inkscape:current-layer="g4289"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1053"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     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>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -101,7 +153,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -113,23 +165,41 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <rect
-         style="opacity:1;color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:24.67183229000000111;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         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="325.12296"
-         height="321.95102"
-         x="-1.9617189"
-         y="445.66345"
-         ry="23.899611" />
+         width="357.74158"
+         height="357.74158"
+         x="-20.728033"
+         y="426.26025"
+         ry="26.556475" />
       <path
          sodipodi:type="arc"
-         style="color:#000000;fill:#00b286;fill-opacity:1;fill-rule:nonzero;stroke:#002e2e;stroke-width:3.99999976;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"
+         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"
          id="path4644"
          sodipodi:cx="24.727272"
          sodipodi:cy="41.636364"
          sodipodi:rx="7.6363635"
          sodipodi:ry="7.6363635"
-         d="m 32.363636,41.636364 a 7.6363635,7.6363635 0 1 1 -15.272727,0 7.6363635,7.6363635 0 1 1 15.272727,0 z"
-         transform="matrix(6.1679584,0,0,6.1679584,-45.96059,396.5419)" />
+         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)" />
+      <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"
+         y="438.59619"
+         ry="12.809631" />
+      <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"
+         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)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Draft/Resources/icons/preferences-draft.svg b/src/Mod/Draft/Resources/icons/preferences-draft.svg
index 7757564109..f4a1e9d818 100644
--- a/src/Mod/Draft/Resources/icons/preferences-draft.svg
+++ b/src/Mod/Draft/Resources/icons/preferences-draft.svg
@@ -15,8 +15,8 @@
    height="64px"
    id="svg2980"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Draft_Workbench_Idea2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="DraftWorkbench.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/yorik/Draft_Workbench_Idea16.png"
@@ -24,14 +24,50 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs2982">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3890">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3892" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3894" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3829">
+      <stop
+         style="stop-color:#8f5902;stop-opacity:1"
+         offset="0"
+         id="stop3831" />
+      <stop
+         style="stop-color:#e9b96e;stop-opacity:1"
+         offset="1"
+         id="stop3833" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3803">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3805" />
+      <stop
+         style="stop-color:#eeeeec;stop-opacity:1"
+         offset="1"
+         id="stop3807" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3855">
       <stop
-         style="stop-color:#d07200;stop-opacity:1;"
+         style="stop-color:#e9b96e;stop-opacity:1"
          offset="0"
          id="stop3857" />
       <stop
-         style="stop-color:#fcb200;stop-opacity:1;"
+         style="stop-color:#8f5902;stop-opacity:1"
          offset="1"
          id="stop3859" />
     </linearGradient>
@@ -72,24 +108,14 @@
          offset="1"
          id="stop3381" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3855"
-       id="linearGradient3861"
-       x1="3.9825215"
-       y1="31.552309"
-       x2="60.769054"
-       y2="51.094166"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.95198975,0,0,0.91651928,0.07298588,1.7291139)" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3855"
        id="linearGradient3863"
-       x1="3.9825215"
-       y1="31.552309"
-       x2="23.852976"
-       y2="45.686504"
+       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
@@ -153,6 +179,54 @@
        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)" />
+    <linearGradient
+       id="linearGradient3855-5">
+      <stop
+         style="stop-color:#e9b96e;stop-opacity:1"
+         offset="0"
+         id="stop3857-3" />
+      <stop
+         style="stop-color:#8f5902;stop-opacity:1"
+         offset="1"
+         id="stop3859-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3890"
+       id="linearGradient3896"
+       x1="37"
+       y1="38"
+       x2="32"
+       y2="14"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -161,21 +235,32 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="40.657951"
-     inkscape:cy="30.318818"
+     inkscape:zoom="14.416016"
+     inkscape:cx="30.182323"
+     inkscape:cy="39.646866"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1057"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-nodes="false"
+     inkscape:snap-nodes="true"
      inkscape:object-paths="true"
-     inkscape:object-nodes="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>
   <metadata
      id="metadata2985">
     <rdf:RDF>
@@ -193,43 +278,54 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none"
-       id="rect3924"
-       width="50.65456"
-       height="62.482525"
-       x="12.856487"
-       y="0.48895457" />
+       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"
+       x="13"
+       y="3" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 12.856487,0.48895457 0,62.48252643"
-       id="path3926"
-       inkscape:connector-curvature="0" />
-    <path
-       style="opacity:0.63876654;fill:#000000;fill-opacity:1;stroke:none"
-       d="m 30.471844,5.6253174 0.535494,33.0519766 22.609757,0 L 30.471844,5.6253174 z M 34.964045,20.375549 44.75169,33.69372 35.321041,33.92285 34.964045,20.375549 z m -24.573235,9.451605 -4.8491983,3.207818 0.2974968,23.829501 4.5517015,4.095696 6.098684,-0.200488 0.08925,-9.566171 44.59477,-2.921405 1.636233,-7.246231 -46.141754,-0.343694 0.118999,-10.855026 -6.396181,0 z"
-       id="path3010-7"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:url(#linearGradient3863);fill-opacity:1;stroke:#000000;stroke-width:1.16431034;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 6.7484353,28.04146 1.8898368,31.242417 2.1934992,55.07178 6.7484353,59.161894 12.821683,58.984063 13.125346,28.04146 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"
+       d="m 7,27 -4,4 0,24 4,4 4,0 0,-32 z"
        id="path3010"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccc" />
+    <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"
+       x="15"
+       y="5" />
     <path
-       style="fill:url(#linearGradient3861);fill-opacity:1;stroke:#000000;stroke-width:1.16431034;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 59.162002,39.234097 -1.641628,7.255521 -54.2816054,3.546854 0,-11.205391 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"
+       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" />
+    <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" />
+    <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" />
     <path
-       style="fill:#ffe400;fill-opacity:1;stroke:#000000;stroke-width:1.16431034;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 26.808896,3.8396874 0.555024,33.0451956 22.60454,0 L 26.808896,3.8396874 z m 4.490635,14.7446996 9.788573,13.322381 -9.435378,0.237054 -0.353195,-13.559435 z"
-       id="path3782"
-       inkscape:connector-curvature="0" />
+       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" />
     <path
-       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 12.856487,62.971481 50.65456,0"
-       id="path3928"
-       inkscape:connector-curvature="0" />
+       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" />
   </g>
 </svg>