diff --git a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Draft.svg b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Draft.svg
index 6881049b5..bc7a39bec 100644
--- a/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Draft.svg
+++ b/src/Mod/PartDesign/Gui/Resources/icons/PartDesign_Draft.svg
@@ -12,121 +12,130 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64px"
    height="64px"
-   id="svg6248"
+   id="svg3364"
    sodipodi:version="0.32"
    inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="PartDesign_Draft.svg"
+   sodipodi:docname="PartDesign_DraftAngle.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
-     id="defs6250">
+     id="defs3366">
     <linearGradient
-       id="linearGradient3253">
+       id="linearGradient3835">
       <stop
-         style="stop-color:#89d5f8;stop-opacity:1;"
+         id="stop3837"
          offset="0"
-         id="stop3255" />
+         style="stop-color:#637dca;stop-opacity:1;" />
       <stop
-         style="stop-color:#00899e;stop-opacity:1;"
+         id="stop3839"
          offset="1"
-         id="stop3257" />
+         style="stop-color:#9eaede;stop-opacity:1;" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3270"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7042649,0.00385085,-0.00331361,0.60601766,9.6623397,15.369034)"
-       cx="10.328116"
-       cy="25.129232"
-       fx="10.328116"
-       fy="25.129232"
-       r="27.986705" />
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6816">
+       id="linearGradient3827">
       <stop
          style="stop-color:#000000;stop-opacity:1;"
          offset="0"
-         id="stop6818" />
+         id="stop3829" />
       <stop
          style="stop-color:#000000;stop-opacity:0;"
          offset="1"
-         id="stop6820" />
+         id="stop3831" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient6781">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop6783" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop6785" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective6256" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6816"
-       id="radialGradient6822"
-       cx="33.369828"
-       cy="51.929391"
-       fx="33.369828"
-       fy="51.929391"
-       r="25.198714"
-       gradientTransform="matrix(1.1581633,0,0,0.6558985,-7.29237,16.126077)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3001"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7042649,0.00385085,-0.00331361,0.60601766,9.6623397,15.369034)"
-       cx="10.328116"
-       cy="25.129232"
-       fx="10.328116"
-       fy="25.129232"
-       r="27.986705" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="radialGradient2401"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.959337,0.05179994,0,0.7352325,-29.610908,-1.2314128)"
-       cx="51.105499"
-       cy="23.807407"
-       fx="51.105499"
-       fy="23.807407"
-       r="19.571428" />
     <linearGradient
        id="linearGradient3864">
       <stop
          id="stop3866"
          offset="0"
-         style="stop-color:#71b2f8;stop-opacity:1;" />
+         style="stop-color:#840000;stop-opacity:0.80392158;" />
       <stop
          id="stop3868"
          offset="1"
-         style="stop-color:#002795;stop-opacity:1;" />
+         style="stop-color:#ff2b1e;stop-opacity:0.80392158;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3593">
+      <stop
+         style="stop-color:#00aff9;stop-opacity:1;"
+         offset="0"
+         id="stop3595" />
+      <stop
+         style="stop-color:#001ccc;stop-opacity:1;"
+         offset="1"
+         id="stop3597" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="-24.909091 : 16.545455 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="116.36364 : 23.818182 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective3372" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="radialGradient2998"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6696601,0.63911498,-0.09121381,0.31244488,-540.88725,-258.46199)"
+       cx="342.58258"
+       cy="27.256668"
+       fx="342.58258"
+       fy="27.256668"
+       r="19.571428" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593-0"
+       id="radialGradient3004-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-320.59978,-6.63068)"
+       cx="330.63791"
+       cy="39.962704"
+       fx="330.63791"
+       fy="39.962704"
+       r="19.571428" />
+    <linearGradient
+       id="linearGradient3593-0">
+      <stop
+         style="stop-color:#c8e0f9;stop-opacity:1;"
+         offset="0"
+         id="stop3595-2" />
+      <stop
+         style="stop-color:#637dca;stop-opacity:1;"
+         offset="1"
+         id="stop3597-1" />
     </linearGradient>
     <radialGradient
        r="19.571428"
-       fy="23.807407"
-       fx="51.105499"
-       cy="23.807407"
-       cx="51.105499"
-       gradientTransform="matrix(0.49118054,0.02652157,0,0.37643904,3.0256395,-1.6501646)"
+       fy="39.962704"
+       fx="330.63791"
+       cy="39.962704"
+       cx="330.63791"
+       gradientTransform="matrix(-0.93227784,0,0,1.3554421,396.33347,-27.208207)"
        gradientUnits="userSpaceOnUse"
-       id="radialGradient3014"
-       xlink:href="#linearGradient3864"
+       id="radialGradient3036"
+       xlink:href="#linearGradient3593-0"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3593"
+       id="linearGradient3799"
+       x1="5.3636365"
+       y1="34"
+       x2="57"
+       y2="34"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2844364,0,0,1.2700541,-1.1984108,-15.131825)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3864"
+       id="linearGradient5146"
+       x1="48.272724"
+       y1="25.636364"
+       x2="16.090908"
+       y2="24.181818"
+       gradientUnits="userSpaceOnUse"
+       spreadMethod="pad"
+       gradientTransform="matrix(1.2080212,0,0,1.1944945,-0.12709377,-6.3964438)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -135,27 +144,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.75"
-     inkscape:cx="-27.261186"
-     inkscape:cy="15.840439"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="7.7781746"
+     inkscape:cx="31.234034"
+     inkscape:cy="25.130096"
+     inkscape:current-layer="g3780"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1400"
-     inkscape:window-height="963"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-width="1863"
+     inkscape:window-height="1056"
+     inkscape:window-x="57"
+     inkscape:window-y="24"
      inkscape:window-maximized="1" />
   <metadata
-     id="metadata6253">
+     id="metadata3369">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -163,42 +172,45 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#004c5b;stroke-width:1.55625713;stroke-linecap:butt;stroke-linejoin:bevel;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.533642,17.931517 22.395694,3.403529 -8.446083,9.750292 -25.126976,-5.385773 z"
-       id="rect6771"
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#004c5b;stroke-width:1.55625713;stroke-linecap:butt;stroke-linejoin:bevel;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 38.420609,34.888993 50.701813,21.843033 50.008925,44.585365 38.813336,61.128889 38.420609,34.888993 z"
-       id="rect6769"
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:url(#radialGradient3270);fill-opacity:1;fill-rule:nonzero;stroke:#004c5b;stroke-width:1.55625713;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:transform-center-y="-5.8501894"
-       d="m 17.493795,25.695593 24.366231,4.528434 -3.141818,30.856678 -25.64176,-7.661626 z"
-       id="rect6767"
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:none;stroke:#004c5b;stroke-width:1.55592;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3.11184002, 1.55592001;stroke-dashoffset:1.86710402;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 28.716852,18.171239 0.403958,22.286309 20.774276,4.150749"
-       id="path6789"
-       sodipodi:nodetypes="ccc"
-       inkscape:connector-curvature="0" />
-    <path
-       style="color:#000000;fill:url(#radialGradient3001);fill-opacity:1;fill-rule:nonzero;stroke:#004c5b;stroke-width:1.55625713;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3.1125143, 1.55625715;stroke-dashoffset:1.08938001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 28.917868,40.441665 13.608082,52.828457"
-       id="path6791"
-       sodipodi:nodetypes="cc"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="rect3638"
-       d="m 32.818182,1.7572252 -7.734867,7.0728351 5.350741,0.2889167 0,7.189009 5.526841,0.298425 0,-7.189011 4.592151,0.247957 -7.734866,-7.9081318 z"
-       style="fill:url(#radialGradient3014);fill-opacity:1;fill-rule:evenodd;stroke:#000137;stroke-width:1.12639999;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:nodetypes="cccccccc" />
+    <g
+       id="g3780"
+       transform="matrix(0.82780005,0,0,0.83717425,-0.2499405,9.0601524)">
+      <path
+         style="fill:url(#linearGradient3799);fill-opacity:1;stroke:#000137;stroke-width:2.40247756;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 8.1568387,44.30919 38.639959,59.794495 68.861758,45.599851 70.730028,5.6508767 37.801749,-3.5858797 21.877105,0.78915639 C 16.678792,17.415402 14.11849,24.973181 8.1568387,44.30919 z"
+         id="path3783"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         style="fill:none;stroke:#000137;stroke-width:2.40247755999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:0.5"
+         d="M 22.033841,1.002891 21.636481,39.344 50.87597,53.542806"
+         id="path3801"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccc" />
+      <path
+         style="opacity:0.5;fill:none;stroke:#000e38;stroke-width:2.4024775;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 21.755681,39.253777 8.3348853,44.271426"
+         id="path3804-0"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:url(#linearGradient5146);fill-opacity:1;stroke:#000137;stroke-width:2.4024775;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 8.2192342,44.315275 38.639404,59.843705 52.257099,12.932649 21.836927,0.87911367 z"
+         id="path3841"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#000e38;stroke-width:2.4024775;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 70.573479,5.7920307 51.936227,13.035783"
+         id="path3804"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#000e38;stroke-width:2.40247755999999990;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;opacity:0.5"
+         d="m 52.070209,13.209252 -0.79959,40.793483"
+         id="path3804-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg
index 4f624f6c3..26b81e1e6 100644
--- a/src/Mod/PartDesign/WizardShaft/WizardShaft.svg
+++ b/src/Mod/PartDesign/WizardShaft/WizardShaft.svg
@@ -516,6 +516,15 @@
        x2="13.874617"
        y2="43.090275"
        gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3937"
+       id="linearGradient3882"
+       x1="-13.22155"
+       y1="54.813248"
+       x2="-13.508098"
+       y2="40.945572"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -525,8 +534,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="7.9999996"
-     inkscape:cx="36.702399"
-     inkscape:cy="28.247095"
+     inkscape:cx="21.190358"
+     inkscape:cy="23.779747"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -558,7 +567,7 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g3081">
+       id="g3884">
       <path
          transform="matrix(1.0895226,-0.72891705,0.72727205,1.091987,23.576251,-35.797469)"
          d="m -1.5700722,48.122238 a 11.543545,16.777716 0 1 1 -23.0870898,0 11.543545,16.777716 0 1 1 23.0870898,0 z"
@@ -611,6 +620,16 @@
          id="path3815-2"
          style="fill:#ffc700;fill-opacity:1;fill-rule:evenodd;stroke:#5e3800;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          sodipodi:type="arc" />
+      <path
+         transform="matrix(0.3792391,-0.25314756,0.25314756,0.3792391,8.8844614,24.305486)"
+         d="m -2.2841215,48.122238 a 10.829495,16.777716 0 1 1 -21.6589905,0 10.829495,16.777716 0 1 1 21.6589905,0 z"
+         sodipodi:ry="16.777716"
+         sodipodi:rx="10.829495"
+         sodipodi:cy="48.122238"
+         sodipodi:cx="-13.113617"
+         id="path3815-2-2"
+         style="fill:url(#linearGradient3882);fill-opacity:1;fill-rule:evenodd;stroke:#5e3800;stroke-width:4.38628149;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
     </g>
   </g>
 </svg>