diff --git a/src/Mod/Draft/Resources/icons/Draft_AutoGroup.svg b/src/Mod/Draft/Resources/icons/Draft_AutoGroup.svg
index 7fa1ddd70..987df22c1 100644
--- a/src/Mod/Draft/Resources/icons/Draft_AutoGroup.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_AutoGroup.svg
@@ -14,10 +14,21 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.92.0 r15299"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_AutoGroup.svg">
   <defs
      id="defs3614">
+    <linearGradient
+       id="linearGradient5034">
+      <stop
+         id="stop5036"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop5038"
+         offset="1.0000000"
+         style="stop-color:#d3d7cf;stop-opacity:1" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -326,17 +337,46 @@
        id="linearGradient3023"
        xlink:href="#linearGradient3895"
        inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient4608"
+    <linearGradient
+       gradientTransform="translate(-17,5)"
+       y2="31"
+       x2="53"
+       y1="37"
+       x1="29"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.7474974e-4,1.1562124,-1.3743496,4.6927601e-4,63.8109,7.049203)"
-       cx="3.7745965"
-       cy="43.717598"
-       fx="3.7745965"
-       fy="43.717598"
-       r="86.70845" />
+       id="linearGradient3023-3"
+       xlink:href="#linearGradient3895-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3895-5">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897-6" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899-2" />
+    </linearGradient>
+    <linearGradient
+       y2="31"
+       x2="53"
+       y1="37"
+       x1="29"
+       gradientTransform="translate(-17,4)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3978"
+       xlink:href="#linearGradient3895-5"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5034"
+       id="linearGradient5032"
+       x1="17"
+       y1="11"
+       x2="23"
+       y2="53"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -345,17 +385,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.2695983"
-     inkscape:cx="44.716174"
-     inkscape:cy="23.11306"
-     inkscape:current-layer="g4636"
+     inkscape:zoom="9.0297109"
+     inkscape:cx="24.948099"
+     inkscape:cy="39.946378"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1051"
+     inkscape:window-width="1600"
+     inkscape:window-height="873"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:snap-bbox="true">
     <inkscape:grid
@@ -371,13 +411,13 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#radialGradient4608);fill-opacity:1;fill-rule:nonzero;stroke:#707070;stroke-width:1.85646296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient5032);fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
        d="M 19.578125,8 5.4042969,8.0058594 C 5.1706901,8.005955 4.9823344,8.2113736 4.9824219,8.4667969 l 0.00391,7.9042971 c -2.596e-4,0.01067 -0.00391,0.02052 -0.00391,0.03125 L 5,55.617188 C 5.0003146,56.383475 5.677268,57.000287 6.5175781,57 L 57.5,56.982422 c 0.84031,-2.87e-4 1.517893,-0.618479 1.517578,-1.384766 L 59,16.382812 C 58.999685,15.616525 58.322732,14.999713 57.482422,15 H 25 L 20,8.4609375 C 19.999913,8.2055142 19.811732,7.9999044 19.578125,8 Z"
        id="rect15391"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccccccccccc" />
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.85646296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
        d="M 18.578125,10 H 7.421875 C 7.1882682,10.000096 6.9999125,10.205514 7,10.460938 L 7.00391,15.96875 7,16 v 38 c 0,1 0,1 1,1 h 48 c 1,0 1,0 1,-1 V 18 c 0,-1 0,-1 -1,-1 H 24 L 19,10.460938 C 18.999913,10.205514 18.811732,9.9999044 18.578125,10 Z"
        id="rect15391-2"
        inkscape:connector-curvature="0"
@@ -391,19 +431,19 @@
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
          sodipodi:nodetypes="cccccccc"
          id="path3343"
-         d="M 30,20 V 30 L 7,30 V 44 H 30 V 54 L 48,37 Z"
-         style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2"
-         d="M 32.006611,24.642998 32,32 H 9 V 42 H 32 L 31.9934,49.357002 45,37 Z"
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 30,19 0,10 -23,0 0,14 23,0 0,10 18,-17 z"
+         style="fill:url(#linearGradient3978);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:connector-curvature="0" />
     </g>
+    <path
+       inkscape:export-ydpi="4.1683898"
+       inkscape:export-xdpi="4.1683898"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+       sodipodi:nodetypes="cccccccc"
+       id="path3343-2"
+       d="M 50.357002,30.006611 43,30 43,7 33,7 33,30 25.642998,29.9934 38,43 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
   </g>
   <metadata
      id="metadata4251">
@@ -413,7 +453,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_AutoGroup_off.svg b/src/Mod/Draft/Resources/icons/Draft_AutoGroup_off.svg
index 76169e859..960768c4c 100644
--- a/src/Mod/Draft/Resources/icons/Draft_AutoGroup_off.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_AutoGroup_off.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.92.0 r15299"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_AutoGroup_off.svg">
   <defs
      id="defs3614">
@@ -23,11 +23,11 @@
       <stop
          id="stop4676"
          offset="0"
-         style="stop-color:#d95f57;stop-opacity:1" />
+         style="stop-color:#ef2929;stop-opacity:1" />
       <stop
          id="stop4678"
          offset="1"
-         style="stop-color:#390c0c;stop-opacity:1" />
+         style="stop-color:#a40000;stop-opacity:1" />
     </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
@@ -337,17 +337,46 @@
        id="linearGradient3023"
        xlink:href="#linearGradient3895"
        inkscape:collect="always" />
-    <radialGradient
+    <linearGradient
+       gradientTransform="translate(-17,5)"
+       y2="31"
+       x2="53"
+       y1="37"
+       x1="29"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3023-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="31"
+       x2="53"
+       y1="37"
+       x1="29"
+       gradientTransform="matrix(0,1,-1,0,70,-19)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3978"
+       xlink:href="#linearGradient3895-6"
+       inkscape:collect="always" />
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4680"
-       id="radialGradient4608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.7474974e-4,1.1562124,-1.3743496,4.6927601e-4,63.8109,7.049203)"
-       cx="3.7745965"
-       cy="43.717598"
-       fx="3.7745965"
-       fy="43.717598"
-       r="86.70845" />
+       id="linearGradient4505"
+       x1="21"
+       y1="10"
+       x2="41"
+       y2="54"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -356,17 +385,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4.6239102"
-     inkscape:cx="40.128646"
-     inkscape:cy="34.861394"
+     inkscape:zoom="9.0297108"
+     inkscape:cx="12.770237"
+     inkscape:cy="32.170282"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1051"
+     inkscape:window-width="1600"
+     inkscape:window-height="873"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:snap-bbox="true">
     <inkscape:grid
@@ -382,39 +411,35 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#radialGradient4608);fill-opacity:1;fill-rule:nonzero;stroke:#482626;stroke-width:1.85646296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient4505);fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
        d="M 19.578125,8 5.4042969,8.0058594 C 5.1706901,8.005955 4.9823344,8.2113736 4.9824219,8.4667969 l 0.00391,7.9042971 c -2.596e-4,0.01067 -0.00391,0.02052 -0.00391,0.03125 L 5,55.617188 C 5.0003146,56.383475 5.677268,57.000287 6.5175781,57 L 57.5,56.982422 c 0.84031,-2.87e-4 1.517893,-0.618479 1.517578,-1.384766 L 59,16.382812 C 58.999685,15.616525 58.322732,14.999713 57.482422,15 H 25 L 20,8.4609375 C 19.999913,8.2055142 19.811732,7.9999044 19.578125,8 Z"
        id="rect15391"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccccccccccc" />
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#fd8b88;stroke-width:1.85646296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
        d="M 18.578125,10 H 7.421875 C 7.1882682,10.000096 6.9999125,10.205514 7,10.460938 L 7.00391,15.96875 7,16 v 38 c 0,1 0,1 1,1 h 48 c 1,0 1,0 1,-1 V 18 c 0,-1 0,-1 -1,-1 H 24 L 19,10.460938 C 18.999913,10.205514 18.811732,9.9999044 18.578125,10 Z"
        id="rect15391-2"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccccccccccc" />
-    <g
-       id="g4636"
-       transform="rotate(90,38,36)">
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343"
-         d="M 30,20 V 30 L 7,30 V 44 H 30 V 54 L 48,37 Z"
-         style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:export-ydpi="4.1683898"
-         inkscape:export-xdpi="4.1683898"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
-         sodipodi:nodetypes="cccccccc"
-         id="path3343-2"
-         d="M 32.006611,24.642998 32,32 H 9 V 42 H 32 L 31.9934,49.357002 45,37 Z"
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:connector-curvature="0" />
-    </g>
+    <path
+       inkscape:export-ydpi="4.1683898"
+       inkscape:export-xdpi="4.1683898"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+       sodipodi:nodetypes="cccccccc"
+       id="path3343"
+       d="M 55,28 45,28 45,5 31,5 31,28 21,28 38,46 z"
+       style="fill:url(#linearGradient3978);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:export-ydpi="4.1683898"
+       inkscape:export-xdpi="4.1683898"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
+       sodipodi:nodetypes="cccccccc"
+       id="path3343-2"
+       d="M 50.357002,30.006611 43,30 43,7 33,7 33,30 25.642998,29.9934 38,43 z"
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
   </g>
   <metadata
      id="metadata4251">
@@ -424,7 +449,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_AutoGroup_on.svg b/src/Mod/Draft/Resources/icons/Draft_AutoGroup_on.svg
index ccd18bb84..cb20fb89d 100644
--- a/src/Mod/Draft/Resources/icons/Draft_AutoGroup_on.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_AutoGroup_on.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg3612"
    version="1.1"
-   inkscape:version="0.92.0 r15299"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Draft_AutoGroup_on.svg">
   <defs
      id="defs3614">
@@ -23,11 +23,11 @@
       <stop
          id="stop4676"
          offset="0"
-         style="stop-color:#78d957;stop-opacity:1" />
+         style="stop-color:#8ae234;stop-opacity:1" />
       <stop
          id="stop4678"
          offset="1"
-         style="stop-color:#0f390c;stop-opacity:1" />
+         style="stop-color:#4e9a06;stop-opacity:1" />
     </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
@@ -329,25 +329,23 @@
     </linearGradient>
     <linearGradient
        gradientTransform="translate(-17,5)"
-       y2="44"
-       x2="48"
-       y1="22"
-       x1="43"
+       y2="31"
+       x2="53"
+       y1="37"
+       x1="29"
        gradientUnits="userSpaceOnUse"
        id="linearGradient3023"
        xlink:href="#linearGradient3895"
        inkscape:collect="always" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient4680"
-       id="radialGradient4608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.7474974e-4,1.1562124,-1.3743496,4.6927601e-4,63.8109,7.049203)"
-       cx="3.7745965"
-       cy="43.717598"
-       fx="3.7745965"
-       fy="43.717598"
-       r="86.70845" />
+       id="linearGradient3961"
+       x1="26"
+       y1="18"
+       x2="36"
+       y2="54"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -356,17 +354,17 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4.6239102"
-     inkscape:cx="40.128646"
-     inkscape:cy="34.861394"
+     inkscape:zoom="6.3849698"
+     inkscape:cx="43.752091"
+     inkscape:cy="27.521206"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1051"
+     inkscape:window-width="1600"
+     inkscape:window-height="873"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:snap-bbox="true">
     <inkscape:grid
@@ -382,28 +380,28 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#radialGradient4608);fill-opacity:1;fill-rule:nonzero;stroke:#284826;stroke-width:1.85646296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:url(#linearGradient3961);fill-opacity:1;fill-rule:nonzero;stroke:#172a04;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
        d="M 19.578125,8 5.4042969,8.0058594 C 5.1706901,8.005955 4.9823344,8.2113736 4.9824219,8.4667969 l 0.00391,7.9042971 c -2.596e-4,0.01067 -0.00391,0.02052 -0.00391,0.03125 L 5,55.617188 C 5.0003146,56.383475 5.677268,57.000287 6.5175781,57 L 57.5,56.982422 c 0.84031,-2.87e-4 1.517893,-0.618479 1.517578,-1.384766 L 59,16.382812 C 58.999685,15.616525 58.322732,14.999713 57.482422,15 H 25 L 20,8.4609375 C 19.999913,8.2055142 19.811732,7.9999044 19.578125,8 Z"
        id="rect15391"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccccccccccc" />
     <path
-       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#a1fd88;stroke-width:1.85646296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
+       style="color:#000000;display:block;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
        d="M 18.578125,10 H 7.421875 C 7.1882682,10.000096 6.9999125,10.205514 7,10.460938 L 7.00391,15.96875 7,16 v 38 c 0,1 0,1 1,1 h 48 c 1,0 1,0 1,-1 V 18 c 0,-1 0,-1 -1,-1 H 24 L 19,10.460938 C 18.999913,10.205514 18.811732,9.9999044 18.578125,10 Z"
        id="rect15391-2"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccccccccccc" />
     <g
        id="g4636"
-       transform="rotate(90,38,36)">
+       transform="matrix(0,1,-1,0,75,-2)">
       <path
          inkscape:export-ydpi="4.1683898"
          inkscape:export-xdpi="4.1683898"
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
          sodipodi:nodetypes="cccccccc"
          id="path3343"
-         d="M 30,20 V 30 L 7,30 V 44 H 30 V 54 L 48,37 Z"
-         style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 30,20 V 30 L 7,30 V 44 H 30 V 54 L 48,37 z"
+         style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:connector-curvature="0" />
       <path
          inkscape:export-ydpi="4.1683898"
@@ -411,8 +409,8 @@
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/changeprop.png"
          sodipodi:nodetypes="cccccccc"
          id="path3343-2"
-         d="M 32.006611,24.642998 32,32 H 9 V 42 H 32 L 31.9934,49.357002 45,37 Z"
-         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 32.006611,24.642998 32,32 H 9 V 42 H 32 L 31.9934,49.357002 45,37 z"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
          inkscape:connector-curvature="0" />
     </g>
   </g>
@@ -424,7 +422,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
         <cc:license
            rdf:resource="" />
         <dc:date>Mon Oct 10 13:44:52 2011 +0000</dc:date>
diff --git a/src/Mod/Draft/Resources/icons/Draft_Clone.svg b/src/Mod/Draft/Resources/icons/Draft_Clone.svg
index fdb42798c..f5744e1d0 100644
--- a/src/Mod/Draft/Resources/icons/Draft_Clone.svg
+++ b/src/Mod/Draft/Resources/icons/Draft_Clone.svg
@@ -22,11 +22,11 @@
     <linearGradient
        id="linearGradient3797">
       <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
+         style="stop-color:#3465a4;stop-opacity:1"
          offset="0"
          id="stop3799" />
       <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:1"
          offset="1"
          id="stop3801" />
     </linearGradient>
@@ -90,9 +90,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="29.123869"
-     inkscape:cx="34.102465"
-     inkscape:cy="35.326422"
+     inkscape:zoom="6.7472475"
+     inkscape:cx="16.618343"
+     inkscape:cy="32.416634"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_New.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_New.svg
index 841a584b6..a6e5da62d 100644
--- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_New.svg
+++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_New.svg
@@ -1,94 +1,387 @@
 <?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="64" height="64" id="svg249" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Raytrace_New.svg" inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png" inkscape:export-xdpi="240.00000" inkscape:export-ydpi="240.00000" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
-  <defs id="defs3">
-    <linearGradient id="linearGradient5048">
-      <stop style="stop-color:black;stop-opacity:0;" offset="0" id="stop5050"/>
-      <stop id="stop5056" offset="0.5" style="stop-color:black;stop-opacity:1;"/>
-      <stop style="stop-color:black;stop-opacity:0;" offset="1" id="stop5052"/>
+
+<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="64"
+   height="64"
+   id="svg249"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Raytrace_New.svg"
+   inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
+   inkscape:export-xdpi="240.00000"
+   inkscape:export-ydpi="240.00000"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <defs
+     id="defs3">
+    <linearGradient
+       id="linearGradient5048">
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="0"
+         id="stop5050" />
+      <stop
+         id="stop5056"
+         offset="0.5"
+         style="stop-color:black;stop-opacity:1;" />
+      <stop
+         style="stop-color:black;stop-opacity:0;"
+         offset="1"
+         id="stop5052" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient4542">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop4544"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop4546"/>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4542">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4544" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4546" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4542" id="radialGradient4548" cx="24.306795" cy="42.07798" fx="24.306795" fy="42.07798" r="15.821514" gradientTransform="matrix(1,0,0,0.284916,0,30.08928)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient15662">
-      <stop style="stop-color:#ffffff;stop-opacity:1.0000000;" offset="0.0000000" id="stop15664"/>
-      <stop style="stop-color:#f8f8f8;stop-opacity:1.0000000;" offset="1.0000000" id="stop15666"/>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4542"
+       id="radialGradient4548"
+       cx="24.306795"
+       cy="42.07798"
+       fx="24.306795"
+       fy="42.07798"
+       r="15.821514"
+       gradientTransform="matrix(1,0,0,0.284916,0,30.08928)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient15662">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop15664" />
+      <stop
+         style="stop-color:#f8f8f8;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop15666" />
     </linearGradient>
-    <radialGradient gradientUnits="userSpaceOnUse" fy="64.567902" fx="20.892099" r="5.257" cy="64.567902" cx="20.892099" id="aigrd3">
-      <stop id="stop15573" style="stop-color:#F0F0F0" offset="0"/>
-      <stop id="stop15575" style="stop-color:#9a9a9a;stop-opacity:1.0000000;" offset="1.0000000"/>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       fy="64.567902"
+       fx="20.892099"
+       r="5.257"
+       cy="64.567902"
+       cx="20.892099"
+       id="aigrd3">
+      <stop
+         id="stop15573"
+         style="stop-color:#F0F0F0"
+         offset="0" />
+      <stop
+         id="stop15575"
+         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+         offset="1.0000000" />
     </radialGradient>
-    <radialGradient gradientUnits="userSpaceOnUse" fy="114.5684" fx="20.892099" r="5.256" cy="114.5684" cx="20.892099" id="aigrd2">
-      <stop id="stop15566" style="stop-color:#F0F0F0" offset="0"/>
-      <stop id="stop15568" style="stop-color:#9a9a9a;stop-opacity:1.0000000;" offset="1.0000000"/>
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       fy="114.5684"
+       fx="20.892099"
+       r="5.256"
+       cy="114.5684"
+       cx="20.892099"
+       id="aigrd2">
+      <stop
+         id="stop15566"
+         style="stop-color:#F0F0F0"
+         offset="0" />
+      <stop
+         id="stop15568"
+         style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+         offset="1.0000000" />
     </radialGradient>
-    <linearGradient id="linearGradient269">
-      <stop style="stop-color:#a3a3a3;stop-opacity:1.0000000;" offset="0.0000000" id="stop270"/>
-      <stop style="stop-color:#4c4c4c;stop-opacity:1.0000000;" offset="1.0000000" id="stop271"/>
+    <linearGradient
+       id="linearGradient269">
+      <stop
+         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop270" />
+      <stop
+         style="stop-color:#4c4c4c;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop271" />
     </linearGradient>
-    <linearGradient id="linearGradient259">
-      <stop style="stop-color:#fafafa;stop-opacity:1.0000000;" offset="0.0000000" id="stop260"/>
-      <stop style="stop-color:#bbbbbb;stop-opacity:1.0000000;" offset="1.0000000" id="stop261"/>
+    <linearGradient
+       id="linearGradient259">
+      <stop
+         style="stop-color:#fafafa;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop260" />
+      <stop
+         style="stop-color:#bbbbbb;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop261" />
     </linearGradient>
-    <linearGradient id="linearGradient12512">
-      <stop style="stop-color:#ffffff;stop-opacity:1.0000000;" offset="0.0000000" id="stop12513"/>
-      <stop style="stop-color:#fff520;stop-opacity:0.89108908;" offset="0.50000000" id="stop12517"/>
-      <stop style="stop-color:#fff300;stop-opacity:0.0000000;" offset="1.0000000" id="stop12514"/>
+    <linearGradient
+       id="linearGradient12512">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop12513" />
+      <stop
+         style="stop-color:#fff520;stop-opacity:0.89108908;"
+         offset="0.50000000"
+         id="stop12517" />
+      <stop
+         style="stop-color:#fff300;stop-opacity:0.0000000;"
+         offset="1.0000000"
+         id="stop12514" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient12512" id="radialGradient278" gradientUnits="userSpaceOnUse" cx="55" cy="125" fx="55" fy="125" r="14.375"/>
-    <linearGradient id="linearGradient3600-63">
-      <stop id="stop3602-9" offset="0" style="stop-color:#000117;stop-opacity:1;"/>
-      <stop id="stop3604-0" offset="1" style="stop-color:#4f82b9;stop-opacity:1;"/>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12512"
+       id="radialGradient278"
+       gradientUnits="userSpaceOnUse"
+       cx="55"
+       cy="125"
+       fx="55"
+       fy="125"
+       r="14.375" />
+    <linearGradient
+       id="linearGradient3600-63">
+      <stop
+         id="stop3602-9"
+         offset="0"
+         style="stop-color:#000117;stop-opacity:1;" />
+      <stop
+         id="stop3604-0"
+         offset="1"
+         style="stop-color:#4f82b9;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="10.397644" x2="14.872466" y1="47.692612" x1="51.037281" id="linearGradient3606-0" xlink:href="#linearGradient3600-63" inkscape:collect="always"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" id="perspective3679"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" id="perspective3656"/>
-    <linearGradient id="linearGradient3600-6">
-      <stop id="stop3602-5" offset="0" style="stop-color:#000117;stop-opacity:1;"/>
-      <stop id="stop3604-4" offset="1" style="stop-color:#4f82b9;stop-opacity:1;"/>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.397644"
+       x2="14.872466"
+       y1="47.692612"
+       x1="51.037281"
+       id="linearGradient3606-0"
+       xlink:href="#linearGradient3600-63"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3679" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3656" />
+    <linearGradient
+       id="linearGradient3600-6">
+      <stop
+         id="stop3602-5"
+         offset="0"
+         style="stop-color:#000117;stop-opacity:1;" />
+      <stop
+         id="stop3604-4"
+         offset="1"
+         style="stop-color:#4f82b9;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="10.397644" x2="14.872466" y1="47.692612" x1="51.037281" id="linearGradient3606-5" xlink:href="#linearGradient3600-6" inkscape:collect="always"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" id="perspective3618"/>
-    <inkscape:perspective id="perspective2824" inkscape:persp3d-origin="32 : 21.333333 : 1" inkscape:vp_z="64 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 32 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient id="linearGradient3600">
-      <stop id="stop3602" offset="0" style="stop-color:#000117;stop-opacity:1;"/>
-      <stop id="stop3604" offset="1" style="stop-color:#4f82b9;stop-opacity:1;"/>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.397644"
+       x2="14.872466"
+       y1="47.692612"
+       x1="51.037281"
+       id="linearGradient3606-5"
+       xlink:href="#linearGradient3600-6"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3618" />
+    <inkscape:perspective
+       id="perspective2824"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         id="stop3602"
+         offset="0"
+         style="stop-color:#000117;stop-opacity:1;" />
+      <stop
+         id="stop3604"
+         offset="1"
+         style="stop-color:#4f82b9;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3775-6" id="linearGradient3781-3" x1="10" y1="39.999996" x2="53" y2="25.999996" gradientUnits="userSpaceOnUse" gradientTransform="translate(-48,-1.1469727e-7)"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3775-6">
-      <stop style="stop-color:#d3d7cf;stop-opacity:1;" offset="0" id="stop3777-7"/>
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop3779-5"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3775-6"
+       id="linearGradient3781-3"
+       x1="10"
+       y1="39.999996"
+       x2="53"
+       y2="25.999996"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-48,-1.1469727e-7)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3775-6">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop3777-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3779-5" />
     </linearGradient>
-    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter3871" x="-0.45363569" width="1.9072714" y="-0.45363569" height="1.9072714">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="9.8975056" id="feGaussianBlur3873"/>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3871"
+       x="-0.45363569"
+       width="1.9072714"
+       y="-0.45363569"
+       height="1.9072714">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="9.8975056"
+         id="feGaussianBlur3873" />
     </filter>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-67" id="linearGradient3606-3" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-67">
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3602-53"/>
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3604-5"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-67"
+       id="linearGradient3606-3"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-67">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3602-53" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3604-5" />
     </linearGradient>
-    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter3889" x="-0.41508493" width="1.8301699" y="-0.42433488" height="1.8486696">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="3.1486191" id="feGaussianBlur3891"/>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3889"
+       x="-0.41508493"
+       width="1.8301699"
+       y="-0.42433488"
+       height="1.8486696">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.1486191"
+         id="feGaussianBlur3891" />
     </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3976"
+       id="radialGradient3982"
+       cx="10.691192"
+       cy="19.289801"
+       fx="10.691192"
+       fy="19.289801"
+       r="10.454545"
+       gradientTransform="matrix(1.5657532,0.0370859,-0.05881345,0.89447218,-5.0994254,1.9283753)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3976">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3978" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3980" />
+    </linearGradient>
+    <radialGradient
+       r="10.454545"
+       fy="19.289801"
+       fx="10.691192"
+       cy="19.289801"
+       cx="10.691192"
+       gradientTransform="matrix(1.5657532,0.0370859,-0.05881345,0.89447218,-5.0994254,1.9283753)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3999"
+       xlink:href="#linearGradient3976"
+       inkscape:collect="always" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="0.32941176" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="15.083348" inkscape:cx="4.4532431" inkscape:cy="31.54739" inkscape:current-layer="layer4" showgrid="true" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="800" inkscape:window-height="836" inkscape:window-x="0" inkscape:window-y="27" inkscape:showpageshadow="false" inkscape:window-maximized="0" inkscape:snap-bbox="true" inkscape:snap-nodes="false">
-    <inkscape:grid type="xygrid" id="grid3064" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="0.32941176"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.3387135"
+     inkscape:cx="15.551026"
+     inkscape:cy="35.917316"
+     inkscape:current-layer="layer4"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="800"
+     inkscape:window-height="836"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:showpageshadow="false"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3064"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata4">
+  <metadata
+     id="metadata4">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[agryson] Alexander Gryson</dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:source>http://agryson.net</dc:source>
-        <cc:license rdf:resource=""/>
+        <cc:license
+           rdf:resource="" />
         <dc:title>Raytrace_New</dc:title>
         <dc:date>2011-10-10</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
@@ -109,26 +402,118 @@
           </cc:Agent>
         </dc:contributor>
       </cc:Work>
-      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
-        <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction"/>
-        <cc:permits rdf:resource="http://web.resource.org/cc/Distribution"/>
-        <cc:requires rdf:resource="http://web.resource.org/cc/Notice"/>
-        <cc:requires rdf:resource="http://web.resource.org/cc/Attribution"/>
-        <cc:permits rdf:resource="http://web.resource.org/cc/DerivativeWorks"/>
-        <cc:requires rdf:resource="http://web.resource.org/cc/ShareAlike"/>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/2.0/">
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Reproduction" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/Distribution" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Notice" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/Attribution" />
+        <cc:permits
+           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://web.resource.org/cc/ShareAlike" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <g inkscape:label="Shadow" id="layer6" inkscape:groupmode="layer" transform="translate(0,16)"/>
-  <g id="layer1" inkscape:label="Base" inkscape:groupmode="layer" style="display:inline" transform="translate(0,16)"/>
-  <g inkscape:groupmode="layer" id="layer4" inkscape:label="new" style="display:inline" transform="translate(0,16)">
-    <rect style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="rect2987" width="45.999996" height="58.000004" x="-38.999996" y="2.9999962" transform="matrix(0,-1,1,0,0,0)"/>
-    <rect style="fill:url(#linearGradient3781-3);fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="rect2987-1" width="41.999996" height="54.000004" x="-36.999996" y="4.9999962" transform="matrix(0,-1,1,0,0,0)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:0.65625;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3871);enable-background:accumulate" id="path2826-8" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 c 0,14.459819 -11.721999,26.181818 -26.181818,26.181818 -14.459819,0 -26.181818,-11.721999 -26.181818,-26.181818 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z" transform="matrix(0.28724962,0,0,0.071811,28.139039,29.793613)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient3606-3);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.90911961;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 c 0,14.459819 -11.721999,26.181818 -26.181818,26.181818 -14.459819,0 -26.181818,-11.721999 -26.181818,-26.181818 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z" transform="matrix(0.6875,0,0,0.68748659,10.25,-5.8749437)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#729fcf;stroke-width:3.27275991;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826-4" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 c 0,14.459819 -11.721999,26.181818 -26.181818,26.181818 -14.459819,0 -26.181818,-11.721999 -26.181818,-26.181818 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z" transform="matrix(0.6111111,0,0,0.61109915,12.666667,-3.5555053)"/>
-    <path sodipodi:type="arc" style="opacity:0.84482757;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3889);enable-background:accumulate" id="path3608" sodipodi:cx="11.181818" sodipodi:cy="20.181818" sodipodi:rx="10.454545" sodipodi:ry="7.2727275" d="m 21.636363,20.181818 c 0,4.016616 -4.680659,7.272727 -10.454545,7.272727 -5.7738858,0 -10.45454501,-3.256111 -10.45454501,-7.272727 0,-4.016616 4.68065921,-7.272727 10.45454501,-7.272727 5.773886,0 10.454545,3.256111 10.454545,7.272727 z" transform="matrix(0.51320304,-0.44631287,0.42181381,0.54301001,10.427514,2.7227015)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#0b1521;stroke-width:2.90911961;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826-5" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 c 0,14.459819 -11.721999,26.181818 -26.181818,26.181818 -14.459819,0 -26.181818,-11.721999 -26.181818,-26.181818 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z" transform="matrix(0.6875,0,0,0.68748661,10.25,-5.8749438)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:url(#radialGradient278);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25000024;marker:none;visibility:visible;display:block" id="path12511" sodipodi:cx="55" sodipodi:cy="125" sodipodi:rx="14.375" sodipodi:ry="14.375" d="m 69.375,125 c 0,7.93909 -6.435907,14.375 -14.375,14.375 -7.939093,0 -14.375,-6.43591 -14.375,-14.375 0,-7.93909 6.435907,-14.375 14.375,-14.375 7.939093,0 14.375,6.43591 14.375,14.375 z" transform="matrix(1.0434783,0,0,1.0434783,-8.3913059,-131.43479)" inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/stock_new-16.png" inkscape:export-xdpi="33.852203" inkscape:export-ydpi="33.852203"/>
+  <g
+     inkscape:label="Shadow"
+     id="layer6"
+     inkscape:groupmode="layer"
+     transform="translate(0,16)" />
+  <g
+     id="layer1"
+     inkscape:label="Base"
+     inkscape:groupmode="layer"
+     style="display:inline"
+     transform="translate(0,16)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="new"
+     style="display:inline"
+     transform="translate(0,16)">
+    <rect
+       style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2987"
+       width="45.999996"
+       height="58.000004"
+       x="-38.999996"
+       y="2.9999962"
+       transform="matrix(0,-1,1,0,0,0)" />
+    <rect
+       style="fill:url(#linearGradient3781-3);fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect2987-1"
+       width="41.999996"
+       height="54.000004"
+       x="-36.999996"
+       y="4.9999962"
+       transform="matrix(0,-1,1,0,0,0)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#000000;fill-opacity:0.65625;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3871);enable-background:accumulate"
+       id="path2826-8"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 c 0,14.459819 -11.721999,26.181818 -26.181818,26.181818 -14.459819,0 -26.181818,-11.721999 -26.181818,-26.181818 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z"
+       transform="matrix(0.28724962,0,0,0.071811,28.139039,29.793613)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#linearGradient3606-3);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.90911961;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2826"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 c 0,14.459819 -11.721999,26.181818 -26.181818,26.181818 -14.459819,0 -26.181818,-11.721999 -26.181818,-26.181818 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z"
+       transform="matrix(0.6875,0,0,0.68748659,10.25,-5.8749437)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:3.27275991;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2826-4"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 c 0,14.459819 -11.721999,26.181818 -26.181818,26.181818 -14.459819,0 -26.181818,-11.721999 -26.181818,-26.181818 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z"
+       transform="matrix(0.6111111,0,0,0.61109915,12.666667,-3.5555053)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:none;stroke:#0b1521;stroke-width:2.90911961;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2826-5"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 c 0,14.459819 -11.721999,26.181818 -26.181818,26.181818 -14.459819,0 -26.181818,-11.721999 -26.181818,-26.181818 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z"
+       transform="matrix(0.6875,0,0,0.68748661,10.25,-5.8749438)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#radialGradient278);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25000024;marker:none;visibility:visible;display:block"
+       id="path12511"
+       sodipodi:cx="55"
+       sodipodi:cy="125"
+       sodipodi:rx="14.375"
+       sodipodi:ry="14.375"
+       d="m 69.375,125 c 0,7.93909 -6.435907,14.375 -14.375,14.375 -7.939093,0 -14.375,-6.43591 -14.375,-14.375 0,-7.93909 6.435907,-14.375 14.375,-14.375 7.939093,0 14.375,6.43591 14.375,14.375 z"
+       transform="matrix(1.0434783,0,0,1.0434783,-8.3913059,-131.43479)"
+       inkscape:export-filename="/home/jimmac/ximian_art/icons/nautilus/suse93/stock_new-16.png"
+       inkscape:export-xdpi="33.852203"
+       inkscape:export-ydpi="33.852203" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.84482757;color:#000000;fill:url(#radialGradient3999);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3608"
+       sodipodi:cx="11.181818"
+       sodipodi:cy="20.181818"
+       sodipodi:rx="15.936976"
+       sodipodi:ry="13.99132"
+       d="m 27.118794,20.181818 a 15.936976,13.99132 0 1 1 -31.8739524,0 15.936976,13.99132 0 1 1 31.8739524,0 z"
+       transform="matrix(0.55967544,-0.47172456,0.46001058,0.57392733,10.457961,2.6918413)" />
   </g>
 </svg>
diff --git a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Render.svg b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Render.svg
index cb69e2ed3..f96cc8944 100644
--- a/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Render.svg
+++ b/src/Mod/Raytracing/Gui/Resources/icons/Raytrace_Render.svg
@@ -1,96 +1,412 @@
 <?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="svg2383" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Raytrace_Render.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
-  <defs id="defs2385">
-    <linearGradient inkscape:collect="always" id="linearGradient4039">
-      <stop style="stop-color:#042a2a;stop-opacity:1" offset="0" id="stop4041"/>
-      <stop style="stop-color:#34e0e2;stop-opacity:1" offset="1" id="stop4043"/>
+
+<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="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Raytrace_Render.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <defs
+     id="defs2385">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4039">
+      <stop
+         style="stop-color:#042a2a;stop-opacity:1"
+         offset="0"
+         id="stop4041" />
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="1"
+         id="stop4043" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient4029">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop4031"/>
-      <stop style="stop-color:#8ae234;stop-opacity:1" offset="1" id="stop4033"/>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4029">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop4031" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop4033" />
     </linearGradient>
-    <linearGradient id="linearGradient3362">
-      <stop id="stop3364" offset="0" style="stop-color:#85ceff;stop-opacity:1;"/>
-      <stop id="stop3366" offset="1" style="stop-color:#004267;stop-opacity:1;"/>
+    <linearGradient
+       id="linearGradient3362">
+      <stop
+         id="stop3364"
+         offset="0"
+         style="stop-color:#85ceff;stop-opacity:1;" />
+      <stop
+         id="stop3366"
+         offset="1"
+         style="stop-color:#004267;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient id="linearGradient3193">
-      <stop id="stop3195" offset="0" style="stop-color:#030067;stop-opacity:1;"/>
-      <stop id="stop3197" offset="1" style="stop-color:#0063ff;stop-opacity:1;"/>
+    <linearGradient
+       id="linearGradient3193">
+      <stop
+         id="stop3195"
+         offset="0"
+         style="stop-color:#030067;stop-opacity:1;" />
+      <stop
+         id="stop3197"
+         offset="1"
+         style="stop-color:#0063ff;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient id="linearGradient3185">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3187"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3189"/>
+    <linearGradient
+       id="linearGradient3185">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3187" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3189" />
     </linearGradient>
-    <linearGradient id="linearGradient3175">
-      <stop style="stop-color:#ababab;stop-opacity:1;" offset="0" id="stop3177"/>
-      <stop style="stop-color:#53c0f4;stop-opacity:1;" offset="1" id="stop3179"/>
+    <linearGradient
+       id="linearGradient3175">
+      <stop
+         style="stop-color:#ababab;stop-opacity:1;"
+         offset="0"
+         id="stop3177" />
+      <stop
+         style="stop-color:#53c0f4;stop-opacity:1;"
+         offset="1"
+         id="stop3179" />
     </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="perspective2391"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3175" id="linearGradient3181" x1="52.736828" y1="49.86422" x2="17.93952" y2="9.8805466" gradientUnits="userSpaceOnUse" gradientTransform="translate(-1.6287944,-3.3426866)"/>
-    <linearGradient id="linearGradient3600-63">
-      <stop id="stop3602-9" offset="0" style="stop-color:#000117;stop-opacity:1;"/>
-      <stop id="stop3604-0" offset="1" style="stop-color:#4f82b9;stop-opacity:1;"/>
+    <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="perspective2391" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3175"
+       id="linearGradient3181"
+       x1="52.736828"
+       y1="49.86422"
+       x2="17.93952"
+       y2="9.8805466"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-1.6287944,-3.3426866)" />
+    <linearGradient
+       id="linearGradient3600-63">
+      <stop
+         id="stop3602-9"
+         offset="0"
+         style="stop-color:#000117;stop-opacity:1;" />
+      <stop
+         id="stop3604-0"
+         offset="1"
+         style="stop-color:#4f82b9;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="10.397644" x2="14.872466" y1="47.692612" x1="51.037281" id="linearGradient3606-0" xlink:href="#linearGradient3600-63" inkscape:collect="always"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" id="perspective3679"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" id="perspective3656"/>
-    <linearGradient id="linearGradient3600-6">
-      <stop id="stop3602-5" offset="0" style="stop-color:#000117;stop-opacity:1;"/>
-      <stop id="stop3604-4" offset="1" style="stop-color:#4f82b9;stop-opacity:1;"/>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.397644"
+       x2="14.872466"
+       y1="47.692612"
+       x1="51.037281"
+       id="linearGradient3606-0"
+       xlink:href="#linearGradient3600-63"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3679" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3656" />
+    <linearGradient
+       id="linearGradient3600-6">
+      <stop
+         id="stop3602-5"
+         offset="0"
+         style="stop-color:#000117;stop-opacity:1;" />
+      <stop
+         id="stop3604-4"
+         offset="1"
+         style="stop-color:#4f82b9;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="10.397644" x2="14.872466" y1="47.692612" x1="51.037281" id="linearGradient3606-5" xlink:href="#linearGradient3600-6" inkscape:collect="always"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="1 : 0.5 : 1" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" id="perspective3618"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="10.397644" x2="14.872466" y1="47.692612" x1="51.037281" id="linearGradient3606" xlink:href="#linearGradient3600" inkscape:collect="always"/>
-    <inkscape:perspective id="perspective2824" inkscape:persp3d-origin="32 : 21.333333 : 1" inkscape:vp_z="64 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 32 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient id="linearGradient3600">
-      <stop id="stop3602" offset="0" style="stop-color:#000117;stop-opacity:1;"/>
-      <stop id="stop3604" offset="1" style="stop-color:#4f82b9;stop-opacity:1;"/>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.397644"
+       x2="14.872466"
+       y1="47.692612"
+       x1="51.037281"
+       id="linearGradient3606-5"
+       xlink:href="#linearGradient3600-6"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       id="perspective3618" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.397644"
+       x2="14.872466"
+       y1="47.692612"
+       x1="51.037281"
+       id="linearGradient3606"
+       xlink:href="#linearGradient3600"
+       inkscape:collect="always" />
+    <inkscape:perspective
+       id="perspective2824"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         id="stop3602"
+         offset="0"
+         style="stop-color:#000117;stop-opacity:1;" />
+      <stop
+         id="stop3604"
+         offset="1"
+         style="stop-color:#4f82b9;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="10.397644" x2="14.872466" y1="47.692612" x1="51.037281" id="linearGradient3606-1" xlink:href="#linearGradient3600-0" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3600-0">
-      <stop id="stop3602-3" offset="0" style="stop-color:#000117;stop-opacity:1;"/>
-      <stop id="stop3604-9" offset="1" style="stop-color:#4f82b9;stop-opacity:1;"/>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="10.397644"
+       x2="14.872466"
+       y1="47.692612"
+       x1="51.037281"
+       id="linearGradient3606-1"
+       xlink:href="#linearGradient3600-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3600-0">
+      <stop
+         id="stop3602-3"
+         offset="0"
+         style="stop-color:#000117;stop-opacity:1;" />
+      <stop
+         id="stop3604-9"
+         offset="1"
+         style="stop-color:#4f82b9;stop-opacity:1;" />
     </linearGradient>
-    <linearGradient y2="10.397644" x2="14.872466" y1="47.692612" x1="51.037281" gradientUnits="userSpaceOnUse" id="linearGradient3086" xlink:href="#linearGradient3600-0" inkscape:collect="always" gradientTransform="matrix(0.96527774,0,0,0.96527774,-1.9240659,1.8600132)"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3175" id="linearGradient3893" x1="28.31279" y1="33.722973" x2="28.641449" y2="4.1530533" gradientUnits="userSpaceOnUse" gradientTransform="translate(66.071527,-1.4015617)"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-67" id="linearGradient3606-3" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-67">
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3602-53"/>
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3604-5"/>
+    <linearGradient
+       y2="10.397644"
+       x2="14.872466"
+       y1="47.692612"
+       x1="51.037281"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3086"
+       xlink:href="#linearGradient3600-0"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.96527774,0,0,0.96527774,-1.9240659,1.8600132)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3175"
+       id="linearGradient3893"
+       x1="28.31279"
+       y1="33.722973"
+       x2="28.641449"
+       y2="4.1530533"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(66.071527,-1.4015617)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-67"
+       id="linearGradient3606-3"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-67">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3602-53" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3604-5" />
     </linearGradient>
-    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter3889" x="-0.41508493" width="1.8301699" y="-0.42433488" height="1.8486696">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="3.1486191" id="feGaussianBlur3891"/>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3889"
+       x="-0.41508493"
+       width="1.8301699"
+       y="-0.42433488"
+       height="1.8486696">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.1486191"
+         id="feGaussianBlur3891" />
     </filter>
-    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter3889-6" x="-0.41508493" width="1.8301699" y="-0.42433488" height="1.8486696">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="3.1486191" id="feGaussianBlur3891-2"/>
-    </filter>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-67-1" id="linearGradient3606-3-9" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-67-1">
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3602-53-2"/>
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3604-5-7"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-67-1"
+       id="linearGradient3606-3-9"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-67-1">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3602-53-2" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3604-5-7" />
     </linearGradient>
-    <linearGradient y2="10.397644" x2="14.872466" y1="47.692612" x1="51.037281" gradientUnits="userSpaceOnUse" id="linearGradient3142" xlink:href="#linearGradient3600-67-1" inkscape:collect="always"/>
-    <filter color-interpolation-filters="sRGB" inkscape:collect="always" id="filter3889-0" x="-0.41508493" width="1.8301699" y="-0.42433488" height="1.8486696">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="3.1486191" id="feGaussianBlur3891-6"/>
-    </filter>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-67-6" id="linearGradient3606-3-2" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-67-6">
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3602-53-1"/>
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3604-5-8"/>
+    <linearGradient
+       y2="10.397644"
+       x2="14.872466"
+       y1="47.692612"
+       x1="51.037281"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3142"
+       xlink:href="#linearGradient3600-67-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-67-6"
+       id="linearGradient3606-3-2"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-67-6">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3602-53-1" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3604-5-8" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4029" id="linearGradient4035" x1="32" y1="34" x2="31" y2="30" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.96296297,0,0,1,1.1851852,0)"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient4039" id="linearGradient4045" x1="32" y1="28" x2="32" y2="2" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4029"
+       id="linearGradient4035"
+       x1="32"
+       y1="34"
+       x2="31"
+       y2="30"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96296297,0,0,1,1.1851852,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4039"
+       id="linearGradient4045"
+       x1="32"
+       y1="28"
+       x2="32"
+       y2="2"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3976"
+       id="radialGradient3982"
+       cx="10.691192"
+       cy="19.289801"
+       fx="10.691192"
+       fy="19.289801"
+       r="10.454545"
+       gradientTransform="matrix(1.5657532,0.0370859,-0.05881345,0.89447218,-5.0994254,1.9283753)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3976">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3978" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3980" />
+    </linearGradient>
+    <radialGradient
+       r="10.454545"
+       fy="19.289801"
+       fx="10.691192"
+       cy="19.289801"
+       cx="10.691192"
+       gradientTransform="matrix(1.5657532,0.0370859,-0.05881345,0.89447218,-5.0994254,1.9283753)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3999"
+       xlink:href="#linearGradient3976"
+       inkscape:collect="always" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="2.8852012" inkscape:cx="16.090581" inkscape:cy="37.131423" inkscape:current-layer="layer1" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="800" inkscape:window-height="837" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="0">
-    <inkscape:grid type="xygrid" id="grid3089" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.1453811"
+     inkscape:cx="-5.111927"
+     inkscape:cy="36.011819"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="800"
+     inkscape:window-height="836"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3089"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata2388">
+  <metadata
+     id="metadata2388">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>$committer</dc:title>
@@ -119,19 +435,95 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <rect style="fill:url(#linearGradient4045);fill-opacity:1;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0.59999999999999998" id="rect4037" width="58" height="29" x="3" y="3"/>
-    <rect style="color:#000000;fill:url(#linearGradient3893);fill-opacity:1;stroke:#000228;stroke-width:0.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="rect3885" width="55.797153" height="29.184225" x="68" y="2.815774"/>
-    <path style="fill:none;stroke:#0eda00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="m 67.74287,31.871434 55.92572,0.25713" id="path3895" inkscape:connector-curvature="0"/>
-    <path transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319442)" style="color:#000000;fill:url(#linearGradient3606-3);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 57.818182,30.363636 c -52.3636361,0 0,0 -52.363636,0 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z" id="path2826" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsc"/>
-    <path transform="matrix(1.03125,0,0,1.03125,-0.62500046,0.68750048)" style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1.93939412;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="m 57.818182,30.363636 c -52.3636361,0 0,0 -52.363636,0 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z" id="path2826-4" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsc"/>
-    <path sodipodi:type="arc" style="opacity:0.84482757;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3889);enable-background:accumulate" id="path3608" sodipodi:cx="11.181818" sodipodi:cy="20.181818" sodipodi:rx="10.454545" sodipodi:ry="7.2727275" d="m 21.636363,20.181818 a 10.454545,7.2727275 0 1 1 -20.90909001,0 10.454545,7.2727275 0 1 1 20.90909001,0 z" transform="matrix(0.85867478,-0.7467709,0.70576526,0.90856459,-4.8393203,9.0566188)"/>
-    <path transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.631944)" style="color:#000000;fill:none;stroke:#0b1521;stroke-width:1.80564261999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round" d="m 57.818182,30.363636 c -52.3636361,0 0,0 -52.363636,0 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z" id="path2826-5" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsc"/>
-    <path style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.00000023999999987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="M 61,32 C 3,32 61,32 3,32 3,48.016258 15.983742,61 32,61 48.016258,61 61,48.016258 61,32 z" id="path2826-7" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsc"/>
-    <path style="color:#000000;fill:none;stroke:#729fcf;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="M 59,32 C 5,32 59,32 5,32 5,46.911688 17.088311,59 32,59 46.911688,59 59,46.911688 59,32 z" id="path2826-4-92" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsc"/>
-    <path style="color:#000000;fill:none;stroke:#0b1521;stroke-width:2.00000023999999987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linejoin:round" d="M 61,32 C 3,32 61,32 3,32 3,48.016258 15.983742,61 32,61 48.016258,61 61,48.016258 61,32 z" id="path2826-5-2" inkscape:connector-curvature="0" sodipodi:nodetypes="ccsc"/>
-    <path style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" d="m 6,32 52,0" id="path3223" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
-    <path style="fill:none;stroke:url(#linearGradient4035);stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" d="m 6,32 52,0" id="path3223-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
-    <path style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" d="m 6,31 52,0" id="path3223-3-7" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="fill:url(#linearGradient4045);fill-opacity:1;stroke:#042a2a;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0.59999999999999998"
+       id="rect4037"
+       width="58"
+       height="29"
+       x="3"
+       y="3" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient3893);fill-opacity:1;stroke:#000228;stroke-width:0.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="rect3885"
+       width="55.797153"
+       height="29.184225"
+       x="68"
+       y="2.815774" />
+    <path
+       style="fill:none;stroke:#0eda00;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 67.74287,31.871434 55.92572,0.25713"
+       id="path3895"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319442)"
+       style="color:#000000;fill:url(#linearGradient3606-3);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 57.818182,30.363636 c -52.3636361,0 0,0 -52.363636,0 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z"
+       id="path2826"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsc" />
+    <path
+       transform="matrix(1.03125,0,0,1.03125,-0.62500046,0.68750048)"
+       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1.93939412;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 57.818182,30.363636 c -52.3636361,0 0,0 -52.363636,0 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z"
+       id="path2826-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsc" />
+    <path
+       transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.631944)"
+       style="color:#000000;fill:none;stroke:#0b1521;stroke-width:1.80564261999999998;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:round"
+       d="m 57.818182,30.363636 c -52.3636361,0 0,0 -52.363636,0 0,-14.459819 11.721999,-26.181818 26.181818,-26.181818 14.459819,0 26.181818,11.721999 26.181818,26.181818 z"
+       id="path2826-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsc" />
+    <path
+       style="color:#000000;fill:none;stroke:#0b1521;stroke-width:2.00000023999999987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linejoin:round"
+       d="M 61,32 C 3,32 61,32 3,32 3,48.016258 15.983742,61 32,61 48.016258,61 61,48.016258 61,32 z"
+       id="path2826-5-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsc" />
+    <path
+       style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2.00000023999999987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 61,32 C 3,32 61,32 3,32 3,48.016258 15.983742,61 32,61 48.016258,61 61,48.016258 61,32 z"
+       id="path2826-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.84482757;color:#000000;fill:url(#radialGradient3999);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3608"
+       sodipodi:cx="11.181818"
+       sodipodi:cy="20.181818"
+       sodipodi:rx="15.936976"
+       sodipodi:ry="13.99132"
+       d="m 27.118794,20.181818 a 15.936976,13.99132 0 1 1 -31.8739524,0 15.936976,13.99132 0 1 1 31.8739524,0 z"
+       transform="matrix(0.96671212,-0.81479696,0.79456372,0.99132903,-5.8453393,10.104089)" />
+    <path
+       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:2.00000024;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 59,32 C 5,32 59,32 5,32 5,46.911688 17.088311,59 32,59 46.911688,59 59,46.911688 59,32 z"
+       id="path2826-4-92"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccsc" />
+    <path
+       style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6,32 52,0"
+       id="path3223"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:url(#linearGradient4035);stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6,32 52,0"
+       id="path3223-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 6,31 52,0"
+       id="path3223-3-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg b/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg
index cad3ec758..0d9c78ef3 100644
--- a/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg
+++ b/src/Mod/Raytracing/Gui/Resources/icons/RaytracingWorkbench.svg
@@ -1,52 +1,225 @@
 <?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="svg2816" version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="preferences-raytracing.svg">
-  <defs id="defs2818">
-    <linearGradient id="linearGradient3600">
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3602"/>
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3604"/>
+
+<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="svg2816"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="RaytracingWorkbench.svg">
+  <defs
+     id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3976">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3978" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3980" />
     </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="perspective2824"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600" id="linearGradient3606" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <inkscape:perspective id="perspective3618" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-6" id="linearGradient3606-5" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-6">
-      <stop style="stop-color:#000117;stop-opacity:1;" offset="0" id="stop3602-5"/>
-      <stop style="stop-color:#4f82b9;stop-opacity:1;" offset="1" id="stop3604-4"/>
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3604" />
     </linearGradient>
-    <inkscape:perspective id="perspective3656" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective3679" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-63" id="linearGradient3606-0" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-63">
-      <stop style="stop-color:#000117;stop-opacity:1;" offset="0" id="stop3602-9"/>
-      <stop style="stop-color:#4f82b9;stop-opacity:1;" offset="1" id="stop3604-0"/>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient3606"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective3618"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-6"
+       id="linearGradient3606-5"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-6">
+      <stop
+         style="stop-color:#000117;stop-opacity:1;"
+         offset="0"
+         id="stop3602-5" />
+      <stop
+         style="stop-color:#4f82b9;stop-opacity:1;"
+         offset="1"
+         id="stop3604-4" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-7" id="linearGradient3606-1" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-7">
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3602-4"/>
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3604-09"/>
+    <inkscape:perspective
+       id="perspective3656"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3679"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-63"
+       id="linearGradient3606-0"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-63">
+      <stop
+         style="stop-color:#000117;stop-opacity:1;"
+         offset="0"
+         id="stop3602-9" />
+      <stop
+         style="stop-color:#4f82b9;stop-opacity:1;"
+         offset="1"
+         id="stop3604-0" />
     </linearGradient>
-    <filter inkscape:collect="always" id="filter3871" x="-0.45363568" width="1.9072714" y="-0.45363568" height="1.9072714">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="9.8975056" id="feGaussianBlur3873"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-7"
+       id="linearGradient3606-1"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-7">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3602-4" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3604-09" />
+    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter3871"
+       x="-0.45363568"
+       width="1.9072714"
+       y="-0.45363568"
+       height="1.9072714">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="9.8975056"
+         id="feGaussianBlur3873" />
     </filter>
-    <filter inkscape:collect="always" id="filter3889" x="-0.41508493" width="1.8301699" y="-0.42433487" height="1.8486697">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="3.1486191" id="feGaussianBlur3891"/>
-    </filter>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-8" id="linearGradient3606-8" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-8">
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3602-2"/>
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3604-45"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-8"
+       id="linearGradient3606-8"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-8">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3602-2" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3604-45" />
     </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3976"
+       id="radialGradient3982"
+       cx="10.691192"
+       cy="19.289801"
+       fx="10.691192"
+       fy="19.289801"
+       r="10.454545"
+       gradientTransform="matrix(1.5657532,0.0370859,-0.05881345,0.89447218,-5.0994254,1.9283753)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7.7781746" inkscape:cx="28.135702" inkscape:cy="27.247296" inkscape:current-layer="layer1" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1057" 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="grid3875" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.3702827"
+     inkscape:cx="21.866468"
+     inkscape:cy="15.81839"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="873"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3875"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata2821">
+  <metadata
+     id="metadata2821">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>$committer</dc:title>
@@ -75,11 +248,59 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <path sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:0.65625;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3871);enable-background:accumulate" id="path2826-8" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(0.48061681,0,0,0.1201542,24.795032,54.351681)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient3606);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319444)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1.93939412;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826-4" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(1.03125,0,0,1.03125,-0.62500048,0.68750024)"/>
-    <path sodipodi:type="arc" style="opacity:0.84482756999999986;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter3889)" id="path3608" sodipodi:cx="11.181818" sodipodi:cy="20.181818" sodipodi:rx="10.454545" sodipodi:ry="7.2727275" d="m 21.636363,20.181818 a 10.454545,7.2727275 0 1 1 -20.90909001,0 10.454545,7.2727275 0 1 1 20.90909001,0 z" transform="matrix(0.85867478,-0.7467709,0.70576526,0.90856459,-4.8393203,9.0566186)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826-5" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319442)"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#000000;fill-opacity:0.65625;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3871);enable-background:accumulate"
+       id="path2826-8"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z"
+       transform="matrix(0.48061681,0,0,0.1201542,24.795032,54.351681)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#linearGradient3606);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2826"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z"
+       transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319444)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1.93939412;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2826-4"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z"
+       transform="matrix(1.03125,0,0,1.03125,-0.62500048,0.68750024)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.84482756999999986;color:#000000;fill:url(#radialGradient3982);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3608"
+       sodipodi:cx="11.181818"
+       sodipodi:cy="20.181818"
+       sodipodi:rx="15.936976"
+       sodipodi:ry="13.99132"
+       d="m 27.118794,20.181818 a 15.936976,13.99132 0 1 1 -31.8739524,0 15.936976,13.99132 0 1 1 31.8739524,0 z"
+       transform="matrix(0.96671212,-0.81479696,0.79456372,0.99132903,-5.8453394,10.104089)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2826-5"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z"
+       transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319442)" />
   </g>
 </svg>
diff --git a/src/Mod/Raytracing/Gui/Resources/icons/preferences-raytracing.svg b/src/Mod/Raytracing/Gui/Resources/icons/preferences-raytracing.svg
index 6d36825d9..48e092663 100644
--- a/src/Mod/Raytracing/Gui/Resources/icons/preferences-raytracing.svg
+++ b/src/Mod/Raytracing/Gui/Resources/icons/preferences-raytracing.svg
@@ -1,52 +1,248 @@
 <?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="svg2816" version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="preferences-raytracing.svg">
-  <defs id="defs2818">
-    <linearGradient id="linearGradient3600">
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3602"/>
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3604"/>
+
+<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="svg2816"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="preferences-raytracing.svg">
+  <defs
+     id="defs2818">
+    <linearGradient
+       id="linearGradient3600">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3602" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3604" />
     </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="perspective2824"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600" id="linearGradient3606" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <inkscape:perspective id="perspective3618" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-6" id="linearGradient3606-5" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-6">
-      <stop style="stop-color:#000117;stop-opacity:1;" offset="0" id="stop3602-5"/>
-      <stop style="stop-color:#4f82b9;stop-opacity:1;" offset="1" id="stop3604-4"/>
+    <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="perspective2824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600"
+       id="linearGradient3606"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective3618"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-6"
+       id="linearGradient3606-5"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-6">
+      <stop
+         style="stop-color:#000117;stop-opacity:1;"
+         offset="0"
+         id="stop3602-5" />
+      <stop
+         style="stop-color:#4f82b9;stop-opacity:1;"
+         offset="1"
+         id="stop3604-4" />
     </linearGradient>
-    <inkscape:perspective id="perspective3656" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective3679" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-63" id="linearGradient3606-0" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-63">
-      <stop style="stop-color:#000117;stop-opacity:1;" offset="0" id="stop3602-9"/>
-      <stop style="stop-color:#4f82b9;stop-opacity:1;" offset="1" id="stop3604-0"/>
+    <inkscape:perspective
+       id="perspective3656"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3679"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-63"
+       id="linearGradient3606-0"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-63">
+      <stop
+         style="stop-color:#000117;stop-opacity:1;"
+         offset="0"
+         id="stop3602-9" />
+      <stop
+         style="stop-color:#4f82b9;stop-opacity:1;"
+         offset="1"
+         id="stop3604-0" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-7" id="linearGradient3606-1" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-7">
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3602-4"/>
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3604-09"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-7"
+       id="linearGradient3606-1"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-7">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3602-4" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3604-09" />
     </linearGradient>
-    <filter inkscape:collect="always" id="filter3871" x="-0.45363568" width="1.9072714" y="-0.45363568" height="1.9072714">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="9.8975056" id="feGaussianBlur3873"/>
+    <filter
+       inkscape:collect="always"
+       id="filter3871"
+       x="-0.45363568"
+       width="1.9072714"
+       y="-0.45363568"
+       height="1.9072714">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="9.8975056"
+         id="feGaussianBlur3873" />
     </filter>
-    <filter inkscape:collect="always" id="filter3889" x="-0.41508493" width="1.8301699" y="-0.42433487" height="1.8486697">
-      <feGaussianBlur inkscape:collect="always" stdDeviation="3.1486191" id="feGaussianBlur3891"/>
+    <filter
+       inkscape:collect="always"
+       id="filter3889"
+       x="-0.41508493"
+       width="1.8301699"
+       y="-0.42433487"
+       height="1.8486697">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="3.1486191"
+         id="feGaussianBlur3891" />
     </filter>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3600-8" id="linearGradient3606-8" x1="51.037281" y1="47.692612" x2="14.872466" y2="10.397644" gradientUnits="userSpaceOnUse"/>
-    <linearGradient id="linearGradient3600-8">
-      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3602-2"/>
-      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3604-45"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3600-8"
+       id="linearGradient3606-8"
+       x1="51.037281"
+       y1="47.692612"
+       x2="14.872466"
+       y2="10.397644"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3600-8">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3602-2" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3604-45" />
     </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3976"
+       id="radialGradient3982"
+       cx="10.691192"
+       cy="19.289801"
+       fx="10.691192"
+       fy="19.289801"
+       r="10.454545"
+       gradientTransform="matrix(1.5657532,0.0370859,-0.05881345,0.89447218,-5.0994254,1.9283753)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3976">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3978" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3980" />
+    </linearGradient>
+    <radialGradient
+       r="10.454545"
+       fy="19.289801"
+       fx="10.691192"
+       cy="19.289801"
+       cx="10.691192"
+       gradientTransform="matrix(1.5657532,0.0370859,-0.05881345,0.89447218,-5.0994254,1.9283753)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3999"
+       xlink:href="#linearGradient3976"
+       inkscape:collect="always" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7.7781746" inkscape:cx="28.135702" inkscape:cy="27.247296" inkscape:current-layer="layer1" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1057" 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="grid3875" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="10.740565"
+     inkscape:cx="21.173743"
+     inkscape:cy="40.498319"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="873"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3875"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata2821">
+  <metadata
+     id="metadata2821">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>$committer</dc:title>
@@ -75,11 +271,59 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <path sodipodi:type="arc" style="color:#000000;fill:#000000;fill-opacity:0.65625;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3871);enable-background:accumulate" id="path2826-8" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(0.48061681,0,0,0.1201542,24.795032,54.351681)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:url(#linearGradient3606);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319444)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1.93939412;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826-4" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(1.03125,0,0,1.03125,-0.62500048,0.68750024)"/>
-    <path sodipodi:type="arc" style="opacity:0.84482756999999986;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter3889)" id="path3608" sodipodi:cx="11.181818" sodipodi:cy="20.181818" sodipodi:rx="10.454545" sodipodi:ry="7.2727275" d="m 21.636363,20.181818 a 10.454545,7.2727275 0 1 1 -20.90909001,0 10.454545,7.2727275 0 1 1 20.90909001,0 z" transform="matrix(0.85867478,-0.7467709,0.70576526,0.90856459,-4.8393203,9.0566186)"/>
-    <path sodipodi:type="arc" style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path2826-5" sodipodi:cx="31.636364" sodipodi:cy="30.363636" sodipodi:rx="26.181818" sodipodi:ry="26.181818" d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z" transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319442)"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#000000;fill-opacity:0.65625;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3871);enable-background:accumulate"
+       id="path2826-8"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z"
+       transform="matrix(0.48061681,0,0,0.1201542,24.795032,54.351681)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#linearGradient3606);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2826"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z"
+       transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319444)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:none;stroke:#729fcf;stroke-width:1.93939412;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2826-4"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z"
+       transform="matrix(1.03125,0,0,1.03125,-0.62500048,0.68750024)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:1.80564272000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2826-5"
+       sodipodi:cx="31.636364"
+       sodipodi:cy="30.363636"
+       sodipodi:rx="26.181818"
+       sodipodi:ry="26.181818"
+       d="m 57.818182,30.363636 a 26.181818,26.181818 0 1 1 -52.363636,0 26.181818,26.181818 0 1 1 52.363636,0 z"
+       transform="matrix(1.1076389,0,0,1.1076389,-3.0416672,-1.6319442)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.84482757;color:#000000;fill:url(#radialGradient3999);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path3608"
+       sodipodi:cx="11.181818"
+       sodipodi:cy="20.181818"
+       sodipodi:rx="15.936976"
+       sodipodi:ry="13.99132"
+       d="m 27.118794,20.181818 a 15.936976,13.99132 0 1 1 -31.8739524,0 15.936976,13.99132 0 1 1 31.8739524,0 z"
+       transform="matrix(0.96671212,-0.81479696,0.79456372,0.99132903,-5.8453394,10.104089)" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg b/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg
index 248712849..b84b01837 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg
@@ -1,38 +1,118 @@
 <?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="svg5821" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Sketch.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45">
-  <defs id="defs5823">
-    <linearGradient inkscape:collect="always" id="linearGradient3776">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3778"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3780"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg5821"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="SketcherWorkbench.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs5823">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6349">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6351" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6353" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3768">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772"/>
+    <linearGradient
+       id="linearGradient3377">
+      <stop
+         style="stop-color:#0019a3;stop-opacity:1;"
+         offset="0"
+         id="stop3379" />
+      <stop
+         style="stop-color:#0069ff;stop-opacity:1;"
+         offset="1"
+         id="stop3381" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient6349">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6351"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop6353"/>
-    </linearGradient>
-    <linearGradient id="linearGradient3377">
-      <stop style="stop-color:#0019a3;stop-opacity:1;" offset="0" id="stop3379"/>
-      <stop style="stop-color:#0069ff;stop-opacity:1;" offset="1" id="stop3381"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective5829"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" 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="#linearGradient3768" id="linearGradient3774" x1="1178.153" y1="1453.8708" x2="1105.0463" y2="1059.0945" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3776" id="linearGradient3782" x1="33.052631" y1="73.676765" x2="23.483253" y2="19.131313" gradientUnits="userSpaceOnUse"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3377"
+       id="linearGradient3383"
+       x1="901.1875"
+       y1="1190.875"
+       x2="1267.9062"
+       y2="1190.875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective5829" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6349"
+       id="radialGradient6355"
+       cx="1103.6399"
+       cy="1424.4465"
+       fx="1103.6399"
+       fy="1424.4465"
+       r="194.40614"
+       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
+       gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7.2080078" inkscape:cx="-40.143761" inkscape:cy="31.572323" inkscape:current-layer="g3360" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-bbox="false" inkscape:snap-nodes="true">
-    <inkscape:grid type="xygrid" id="grid2997" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="19.413946"
+     inkscape:cx="34.073937"
+     inkscape:cy="31.897146"
+     inkscape:current-layer="g3360"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="873"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata5826">
+  <metadata
+     id="metadata5826">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[triplus]</dc:title>
@@ -61,15 +141,50 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g3360" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png" inkscape:export-xdpi="3.2478156" inkscape:export-ydpi="3.2478156" transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <rect style="color:#000000;fill:none;stroke:#280000;stroke-width:58.48538971;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-36" width="270.49493" height="241.25221" x="914.96875" y="1168.7546"/>
-      <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#280000;stroke-width:7.86527967;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-7" 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.6396543,0,0,7.2375671,925.64233,920.63035)"/>
-      <rect style="color:#000000;fill:none;stroke:url(#linearGradient3774);stroke-width:29.24269462999999900;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="270.49493" height="241.25221" x="914.96875" y="1168.7546"/>
-      <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:url(#linearGradient3782);stroke-width:3.93264051000000010;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.6396539,0,0,7.237567,925.64233,920.63035)"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 1024.6288,1285.7254 -73.10668,0 36.55337,-58.4854 z" id="path3012" inkscape:connector-curvature="0"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 951.52212,1314.968 73.10668,0 -36.55331,58.4854 z" id="path3014" inkscape:connector-curvature="0"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 1173.2557,1098.7783 -63.3122,36.5534 2.4134,-68.9265 z" id="path3012-5" inkscape:connector-curvature="0"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g3360"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
+       inkscape:export-xdpi="3.2478156"
+       inkscape:export-ydpi="3.2478156"
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+      <rect
+         style="color:#000000;fill:none;stroke:#a40000;stroke-width:43.86403656000000240;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-36"
+         width="277.8056"
+         height="248.5629"
+         x="907.65808"
+         y="1168.7546" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#a40000;stroke-width:5.89896058999999973;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-7"
+         sodipodi:cx="30.181818"
+         sodipodi:cy="33.272728"
+         sodipodi:rx="18.181818"
+         sodipodi:ry="18.181818"
+         d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+         transform="matrix(7.6396543,0,0,7.2375671,932.95299,913.31967)" />
+      <rect
+         style="color:#000000;fill:none;stroke:#ef2929;stroke-width:14.62134743000000014;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.5629"
+         x="907.65808"
+         y="1168.7546" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#ef2929;stroke-width:1.96632027999999992;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 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+         transform="matrix(7.6396539,0,0,7.237567,932.95301,913.31967)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_All.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_All.svg
index 188f5b4af..c27ffc051 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_All.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_All.svg
@@ -1,58 +1,250 @@
 <?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="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Ellipse_All.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
-  <defs id="defs2920">
-    <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"/>
+
+<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="svg2918"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Ellipse_All.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5">
+  <defs
+     id="defs2920">
+    <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>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2926" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" 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-3" id="radialGradient3960" 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="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-7" id="radialGradient5352" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-7">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-18"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-52"/>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3958"
+       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-3"
+       id="radialGradient3960"
+       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="radialGradient4043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144-7"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-18" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-52" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3888-7" id="linearGradient3901-1" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3888-7">
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="0" id="stop3890-4"/>
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop3892-0"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3888-7"
+       id="linearGradient3901-1"
+       gradientUnits="userSpaceOnUse"
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888-7">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3890-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3892-0" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3880-4" id="linearGradient3903-9" gradientUnits="userSpaceOnUse" x1="29.993565" y1="54.846851" x2="36.094769" y2="20.854424"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3880-4">
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3882-8"/>
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="1" id="stop3884-8"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3880-4"
+       id="linearGradient3903-9"
+       gradientUnits="userSpaceOnUse"
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3882-8" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3884-8" />
     </linearGradient>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" inkscape:collect="always" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"/>
-    <linearGradient id="linearGradient3836-0-7-7">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5"/>
-      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3"/>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
     </linearGradient>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" gradientUnits="userSpaceOnUse" id="linearGradient3962" xlink:href="#linearGradient3836-0-7-7-5" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3836-0-7-7-5">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5-3"/>
-      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3-5"/>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3962"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
     </linearGradient>
-    <linearGradient id="linearGradient3836-0-7-7-2">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0"/>
+    <linearGradient
+       id="linearGradient3836-0-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8.7173008" inkscape:cx="-1.9193805" inkscape:cy="44.520847" inkscape:current-layer="g3896" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" inkscape:snap-bbox="true" inkscape:snap-nodes="false">
-    <inkscape:grid type="xygrid" id="grid3016" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.7430632"
+     inkscape:cx="-22.911025"
+     inkscape:cy="31.197658"
+     inkscape:current-layer="g4470-2"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata2923">
+  <metadata
+     id="metadata2923">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
@@ -81,39 +273,172 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g id="g3800-6" transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
-        <g transform="translate(-10.941933,-540.84412)" id="g3778-7">
-          <g id="g3780-2">
-            <g inkscape:export-ydpi="7.2934141" inkscape:export-xdpi="7.2934141" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" id="g3784-5"/>
-            <g inkscape:export-ydpi="7.2934141" inkscape:export-xdpi="7.2934141" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" id="g3790-2"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4470"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+       inkscape:export-xdpi="6.7850704"
+       inkscape:export-ydpi="6.7850704"
+       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g
+         id="g3800-6"
+         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+        <g
+           transform="translate(-10.941933,-540.84412)"
+           id="g3778-7">
+          <g
+             id="g3780-2">
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
+               id="g3784-5" />
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
+               id="g3790-2" />
           </g>
         </g>
       </g>
-      <g transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)" id="g3019">
-        <g id="g3021" transform="translate(-10.941933,-540.84412)">
-          <g id="g3023">
-            <g id="g3025" transform="matrix(-0.9996843,0.02512527,-0.02512527,-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"/>
-            <g id="g3027" transform="matrix(-0.9992315,0.03919708,-0.03919708,-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"/>
+      <g
+         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
+         id="g3019">
+        <g
+           id="g3021"
+           transform="translate(-10.941933,-540.84412)">
+          <g
+             id="g3023">
+            <g
+               id="g3025"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-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" />
+            <g
+               id="g3027"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-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" />
           </g>
         </g>
       </g>
-      <g id="g4470-2" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="translate(-493.0338,-13.695763)">
-        <g id="g3896" transform="translate(493.03404,13.695735)">
-          <path transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)" d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z" sodipodi:ry="17.926489" sodipodi:rx="35.852978" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074" style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
-          <path transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)" d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z" sodipodi:ry="17.926489" sodipodi:rx="35.852978" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074-3" style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
-          <path transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)" d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z" sodipodi:ry="17.078087" sodipodi:rx="36.772079" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074-3-6" style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <g
+         id="g4470-2"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="6.7850704"
+         inkscape:export-ydpi="6.7850704"
+         transform="translate(-493.0338,-13.695763)">
+        <g
+           id="g3896"
+           transform="translate(493.03404,13.695735)">
+          <path
+             transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)"
+             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
+             sodipodi:ry="17.926489"
+             sodipodi:rx="35.852978"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074"
+             style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)"
+             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
+             sodipodi:ry="17.926489"
+             sodipodi:rx="35.852978"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074-3"
+             style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)"
+             d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z"
+             sodipodi:ry="17.078087"
+             sodipodi:rx="36.772079"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074-3-6"
+             style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
         </g>
-        <rect style="fill:#8ae234;fill-opacity:1;stroke:#204a87;stroke-width:13.69538403;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" id="rect3118-1" width="246.87076" height="24.284021" x="1883.1063" y="-1144.2454" transform="matrix(0.70710688,0.70710668,-0.70710688,0.70710668,0,0)"/>
-        <rect style="fill:#8ae234;fill-opacity:1;stroke:#204a87;stroke-width:13.69538403;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" id="rect3118-5" width="456.41742" height="27.78755" x="903.89514" y="1992.6482" transform="matrix(0.70710668,-0.70710688,0.70710668,0.70710688,0,0)"/>
-        <g transform="matrix(4.5913999,0,0,4.591325,2232.5385,640.93267)" id="g3797-9-4-5">
-          <path inkscape:connector-curvature="0" style="fill:#729fcf;stroke:#204a87;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4250-71-8-6" d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z"/>
-          <path inkscape:connector-curvature="0" style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#8ae234;stroke-width:2.9828577;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4250-7-3-8-2" d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z"/>
+        <g
+           id="g3217">
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3037-36"
+             d="M 2294.682,693.64582 2143.8571,542.99659"
+             style="fill:none;stroke:#0b1521;stroke-width:54.78153992;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3037-3-7"
+             d="M 2294.682,693.64582 2143.8571,542.9966"
+             style="fill:none;stroke:#3465a4;stroke-width:27.39076996;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3037-3-6-5"
+             d="M 2298.6531,689.08892 2148.9073,537.64164"
+             style="fill:none;stroke:#729fcf;stroke-width:13.69538498;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
-        <g transform="matrix(4.5913999,0,0,4.591325,2383.1877,490.2835)" id="g3797-9-4-5-6">
-          <path inkscape:connector-curvature="0" style="fill:#729fcf;stroke:#204a87;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4250-71-8-6-2" d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z"/>
-          <path inkscape:connector-curvature="0" style="fill:url(#linearGradient3962);fill-opacity:1;stroke:#8ae234;stroke-width:2.9828577;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4250-7-3-8-2-9" d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z"/>
+        <g
+           id="g3174"
+           transform="matrix(1.1663232,0,0,1.2222049,-599.64255,-162.50398)">
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3037"
+             d="M 2287.8343,762.12275 2546.1632,515.60582"
+             style="fill:none;stroke:#0b1521;stroke-width:45.88309479;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3037-3"
+             d="M 2287.8343,762.12275 2546.1632,515.60583"
+             style="fill:none;stroke:#3465a4;stroke-width:22.94154739;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3037-3-6"
+             d="M 2286.2092,754.91791 2541.6504,510.16473"
+             style="fill:none;stroke:#729fcf;stroke-width:11.4707737;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+        <g
+           transform="matrix(4.5913999,0,0,4.591325,2232.5385,640.93267)"
+           id="g3797-9-4-5">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#729fcf;stroke:#204a87;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-8-6"
+             d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:2.98285769999999983;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-8-2"
+             d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z" />
+        </g>
+        <g
+           transform="matrix(4.5913999,0,0,4.591325,2383.1877,490.2835)"
+           id="g3797-9-4-5-6">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#729fcf;stroke:#204a87;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-8-6-2"
+             d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3962);fill-opacity:1;stroke:#729fcf;stroke-width:2.98285769999999983;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-8-2-9"
+             d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus1.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus1.svg
index c6cf29d51..c1ead81b5 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus1.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus1.svg
@@ -1,58 +1,250 @@
 <?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="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Ellipse_All.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
-  <defs id="defs2920">
-    <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"/>
+
+<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="svg2918"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Ellipse_Focus1.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5">
+  <defs
+     id="defs2920">
+    <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>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2926" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" 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-3" id="radialGradient3960" 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="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-7" id="radialGradient5352" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-7">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-18"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-52"/>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3958"
+       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-3"
+       id="radialGradient3960"
+       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="radialGradient4043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144-7"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-18" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-52" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3888-7" id="linearGradient3901-1" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3888-7">
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="0" id="stop3890-4"/>
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop3892-0"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3888-7"
+       id="linearGradient3901-1"
+       gradientUnits="userSpaceOnUse"
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888-7">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3890-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3892-0" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3880-4" id="linearGradient3903-9" gradientUnits="userSpaceOnUse" x1="29.993565" y1="54.846851" x2="36.094769" y2="20.854424"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3880-4">
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3882-8"/>
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="1" id="stop3884-8"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3880-4"
+       id="linearGradient3903-9"
+       gradientUnits="userSpaceOnUse"
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3882-8" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3884-8" />
     </linearGradient>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" inkscape:collect="always" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"/>
-    <linearGradient id="linearGradient3836-0-7-7">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5"/>
-      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3"/>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
     </linearGradient>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" gradientUnits="userSpaceOnUse" id="linearGradient3962" xlink:href="#linearGradient3836-0-7-7-5" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3836-0-7-7-5">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5-3"/>
-      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3-5"/>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3962"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
     </linearGradient>
-    <linearGradient id="linearGradient3836-0-7-7-2">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0"/>
+    <linearGradient
+       id="linearGradient3836-0-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8.7173008" inkscape:cx="-1.9193805" inkscape:cy="44.520847" inkscape:current-layer="g4470-2" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" inkscape:snap-bbox="true" inkscape:snap-nodes="false">
-    <inkscape:grid type="xygrid" id="grid3016" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.848863"
+     inkscape:cx="36.682103"
+     inkscape:cy="37.168183"
+     inkscape:current-layer="g3797-9-4-5-6"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata2923">
+  <metadata
+     id="metadata2923">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
@@ -81,33 +273,115 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g id="g3800-6" transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
-        <g transform="translate(-10.941933,-540.84412)" id="g3778-7">
-          <g id="g3780-2">
-            <g inkscape:export-ydpi="7.2934141" inkscape:export-xdpi="7.2934141" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" id="g3784-5"/>
-            <g inkscape:export-ydpi="7.2934141" inkscape:export-xdpi="7.2934141" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" id="g3790-2"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4470"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+       inkscape:export-xdpi="6.7850704"
+       inkscape:export-ydpi="6.7850704"
+       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g
+         id="g3800-6"
+         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+        <g
+           transform="translate(-10.941933,-540.84412)"
+           id="g3778-7">
+          <g
+             id="g3780-2">
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
+               id="g3784-5" />
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
+               id="g3790-2" />
           </g>
         </g>
       </g>
-      <g transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)" id="g3019">
-        <g id="g3021" transform="translate(-10.941933,-540.84412)">
-          <g id="g3023">
-            <g id="g3025" transform="matrix(-0.9996843,0.02512527,-0.02512527,-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"/>
-            <g id="g3027" transform="matrix(-0.9992315,0.03919708,-0.03919708,-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"/>
+      <g
+         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
+         id="g3019">
+        <g
+           id="g3021"
+           transform="translate(-10.941933,-540.84412)">
+          <g
+             id="g3023">
+            <g
+               id="g3025"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-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" />
+            <g
+               id="g3027"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-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" />
           </g>
         </g>
       </g>
-      <g id="g4470-2" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="translate(-493.0338,-13.695763)">
-        <g id="g3896" transform="translate(493.03404,13.695735)">
-          <path transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)" d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z" sodipodi:ry="17.926489" sodipodi:rx="35.852978" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074" style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
-          <path transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)" d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z" sodipodi:ry="17.926489" sodipodi:rx="35.852978" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074-3" style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
-          <path transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)" d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z" sodipodi:ry="17.078087" sodipodi:rx="36.772079" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074-3-6" style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <g
+         id="g4470-2"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="6.7850704"
+         inkscape:export-ydpi="6.7850704"
+         transform="translate(-493.0338,-13.695763)">
+        <g
+           id="g3896"
+           transform="translate(493.03404,13.695735)">
+          <path
+             transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)"
+             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
+             sodipodi:ry="17.926489"
+             sodipodi:rx="35.852978"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074"
+             style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)"
+             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
+             sodipodi:ry="17.926489"
+             sodipodi:rx="35.852978"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074-3"
+             style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)"
+             d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z"
+             sodipodi:ry="17.078087"
+             sodipodi:rx="36.772079"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074-3-6"
+             style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
         </g>
-        <g transform="matrix(4.5913999,0,0,4.591325,2383.1877,490.2835)" id="g3797-9-4-5-6">
-          <path inkscape:connector-curvature="0" style="fill:#729fcf;stroke:#204a87;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4250-71-8-6-2" d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z"/>
-          <path inkscape:connector-curvature="0" style="fill:url(#linearGradient3962);fill-opacity:1;stroke:#8ae234;stroke-width:2.9828577;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4250-7-3-8-2-9" d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z"/>
+        <g
+           transform="matrix(4.5913999,0,0,4.591325,2383.1877,490.2835)"
+           id="g3797-9-4-5-6">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#729fcf;stroke:#0b1521;stroke-width:2.98285841999999990;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-8-6-2"
+             d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3962);fill-opacity:1;stroke:#729fcf;stroke-width:2.98285769999999983;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-8-2-9"
+             d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus2.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus2.svg
index 1b2a7e190..343706a70 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus2.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus2.svg
@@ -1,58 +1,250 @@
 <?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="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Ellipse_Focus1.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
-  <defs id="defs2920">
-    <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"/>
+
+<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="svg2918"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Ellipse_Focus2.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5">
+  <defs
+     id="defs2920">
+    <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>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2926" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" 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-3" id="radialGradient3960" 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="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-7" id="radialGradient5352" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-7">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-18"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-52"/>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3958"
+       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-3"
+       id="radialGradient3960"
+       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="radialGradient4043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144-7"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-18" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-52" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3888-7" id="linearGradient3901-1" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3888-7">
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="0" id="stop3890-4"/>
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop3892-0"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3888-7"
+       id="linearGradient3901-1"
+       gradientUnits="userSpaceOnUse"
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888-7">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3890-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3892-0" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3880-4" id="linearGradient3903-9" gradientUnits="userSpaceOnUse" x1="29.993565" y1="54.846851" x2="36.094769" y2="20.854424"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3880-4">
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3882-8"/>
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="1" id="stop3884-8"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3880-4"
+       id="linearGradient3903-9"
+       gradientUnits="userSpaceOnUse"
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3882-8" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3884-8" />
     </linearGradient>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" inkscape:collect="always" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"/>
-    <linearGradient id="linearGradient3836-0-7-7">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5"/>
-      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3"/>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
     </linearGradient>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" gradientUnits="userSpaceOnUse" id="linearGradient3962" xlink:href="#linearGradient3836-0-7-7-5" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3836-0-7-7-5">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5-3"/>
-      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3-5"/>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3962"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
     </linearGradient>
-    <linearGradient id="linearGradient3836-0-7-7-2">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0"/>
+    <linearGradient
+       id="linearGradient3836-0-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8.7173008" inkscape:cx="-1.9193805" inkscape:cy="44.520847" inkscape:current-layer="g4470-2" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" inkscape:snap-bbox="true" inkscape:snap-nodes="false">
-    <inkscape:grid type="xygrid" id="grid3016" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4280539"
+     inkscape:cx="188.70296"
+     inkscape:cy="111.27543"
+     inkscape:current-layer="g3797-9-4-5"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata2923">
+  <metadata
+     id="metadata2923">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
@@ -81,33 +273,115 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g id="g3800-6" transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
-        <g transform="translate(-10.941933,-540.84412)" id="g3778-7">
-          <g id="g3780-2">
-            <g inkscape:export-ydpi="7.2934141" inkscape:export-xdpi="7.2934141" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" id="g3784-5"/>
-            <g inkscape:export-ydpi="7.2934141" inkscape:export-xdpi="7.2934141" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" id="g3790-2"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4470"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+       inkscape:export-xdpi="6.7850704"
+       inkscape:export-ydpi="6.7850704"
+       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g
+         id="g3800-6"
+         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+        <g
+           transform="translate(-10.941933,-540.84412)"
+           id="g3778-7">
+          <g
+             id="g3780-2">
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
+               id="g3784-5" />
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
+               id="g3790-2" />
           </g>
         </g>
       </g>
-      <g transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)" id="g3019">
-        <g id="g3021" transform="translate(-10.941933,-540.84412)">
-          <g id="g3023">
-            <g id="g3025" transform="matrix(-0.9996843,0.02512527,-0.02512527,-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"/>
-            <g id="g3027" transform="matrix(-0.9992315,0.03919708,-0.03919708,-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"/>
+      <g
+         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
+         id="g3019">
+        <g
+           id="g3021"
+           transform="translate(-10.941933,-540.84412)">
+          <g
+             id="g3023">
+            <g
+               id="g3025"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-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" />
+            <g
+               id="g3027"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-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" />
           </g>
         </g>
       </g>
-      <g id="g4470-2" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="translate(-493.0338,-13.695763)">
-        <g id="g3896" transform="translate(493.03404,13.695735)">
-          <path transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)" d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z" sodipodi:ry="17.926489" sodipodi:rx="35.852978" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074" style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
-          <path transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)" d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z" sodipodi:ry="17.926489" sodipodi:rx="35.852978" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074-3" style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
-          <path transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)" d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z" sodipodi:ry="17.078087" sodipodi:rx="36.772079" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074-3-6" style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <g
+         id="g4470-2"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="6.7850704"
+         inkscape:export-ydpi="6.7850704"
+         transform="translate(-493.0338,-13.695763)">
+        <g
+           id="g3896"
+           transform="translate(493.03404,13.695735)">
+          <path
+             transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)"
+             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
+             sodipodi:ry="17.926489"
+             sodipodi:rx="35.852978"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074"
+             style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)"
+             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
+             sodipodi:ry="17.926489"
+             sodipodi:rx="35.852978"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074-3"
+             style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)"
+             d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z"
+             sodipodi:ry="17.078087"
+             sodipodi:rx="36.772079"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074-3-6"
+             style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
         </g>
-        <g transform="matrix(4.5913999,0,0,4.591325,2232.5385,640.93267)" id="g3797-9-4-5">
-          <path inkscape:connector-curvature="0" style="fill:#729fcf;stroke:#204a87;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4250-71-8-6" d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z"/>
-          <path inkscape:connector-curvature="0" style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#8ae234;stroke-width:2.9828577;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4250-7-3-8-2" d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z"/>
+        <g
+           transform="matrix(4.5913999,0,0,4.591325,2232.5385,640.93267)"
+           id="g3797-9-4-5">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#729fcf;stroke:#0b1521;stroke-width:2.98285841999999990;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-8-6"
+             d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:2.98285769999999983;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-8-2"
+             d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MajorAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MajorAxis.svg
index b13701fbe..827f1e88c 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MajorAxis.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MajorAxis.svg
@@ -1,58 +1,250 @@
 <?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="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Ellipse_Focus2.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
-  <defs id="defs2920">
-    <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"/>
+
+<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="svg2918"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Ellipse_MajorAxis.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5">
+  <defs
+     id="defs2920">
+    <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>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2926" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" 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-3" id="radialGradient3960" 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="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-7" id="radialGradient5352" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-7">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-18"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-52"/>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3958"
+       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-3"
+       id="radialGradient3960"
+       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="radialGradient4043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144-7"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-18" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-52" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3888-7" id="linearGradient3901-1" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3888-7">
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="0" id="stop3890-4"/>
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop3892-0"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3888-7"
+       id="linearGradient3901-1"
+       gradientUnits="userSpaceOnUse"
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888-7">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3890-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3892-0" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3880-4" id="linearGradient3903-9" gradientUnits="userSpaceOnUse" x1="29.993565" y1="54.846851" x2="36.094769" y2="20.854424"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3880-4">
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3882-8"/>
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="1" id="stop3884-8"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3880-4"
+       id="linearGradient3903-9"
+       gradientUnits="userSpaceOnUse"
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3882-8" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3884-8" />
     </linearGradient>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" inkscape:collect="always" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"/>
-    <linearGradient id="linearGradient3836-0-7-7">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5"/>
-      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3"/>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
     </linearGradient>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" gradientUnits="userSpaceOnUse" id="linearGradient3962" xlink:href="#linearGradient3836-0-7-7-5" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3836-0-7-7-5">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5-3"/>
-      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3-5"/>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3962"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
     </linearGradient>
-    <linearGradient id="linearGradient3836-0-7-7-2">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0"/>
+    <linearGradient
+       id="linearGradient3836-0-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8.7173008" inkscape:cx="-1.9193805" inkscape:cy="44.520847" inkscape:current-layer="g4470-2" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" inkscape:snap-bbox="true" inkscape:snap-nodes="false">
-    <inkscape:grid type="xygrid" id="grid3016" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="9.8109197"
+     inkscape:cx="12.676309"
+     inkscape:cy="31.733621"
+     inkscape:current-layer="g4470-2"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata2923">
+  <metadata
+     id="metadata2923">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
@@ -81,31 +273,124 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g id="g3800-6" transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
-        <g transform="translate(-10.941933,-540.84412)" id="g3778-7">
-          <g id="g3780-2">
-            <g inkscape:export-ydpi="7.2934141" inkscape:export-xdpi="7.2934141" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" id="g3784-5"/>
-            <g inkscape:export-ydpi="7.2934141" inkscape:export-xdpi="7.2934141" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" id="g3790-2"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4470"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+       inkscape:export-xdpi="6.7850704"
+       inkscape:export-ydpi="6.7850704"
+       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g
+         id="g3800-6"
+         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+        <g
+           transform="translate(-10.941933,-540.84412)"
+           id="g3778-7">
+          <g
+             id="g3780-2">
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
+               id="g3784-5" />
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
+               id="g3790-2" />
           </g>
         </g>
       </g>
-      <g transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)" id="g3019">
-        <g id="g3021" transform="translate(-10.941933,-540.84412)">
-          <g id="g3023">
-            <g id="g3025" transform="matrix(-0.9996843,0.02512527,-0.02512527,-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"/>
-            <g id="g3027" transform="matrix(-0.9992315,0.03919708,-0.03919708,-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"/>
+      <g
+         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
+         id="g3019">
+        <g
+           id="g3021"
+           transform="translate(-10.941933,-540.84412)">
+          <g
+             id="g3023">
+            <g
+               id="g3025"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-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" />
+            <g
+               id="g3027"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-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" />
           </g>
         </g>
       </g>
-      <g id="g4470-2" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="translate(-493.0338,-13.695763)">
-        <g id="g3896" transform="translate(493.03404,13.695735)">
-          <path transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)" d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z" sodipodi:ry="17.926489" sodipodi:rx="35.852978" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074" style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
-          <path transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)" d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z" sodipodi:ry="17.926489" sodipodi:rx="35.852978" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074-3" style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
-          <path transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)" d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z" sodipodi:ry="17.078087" sodipodi:rx="36.772079" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074-3-6" style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <g
+         id="g4470-2"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="6.7850704"
+         inkscape:export-ydpi="6.7850704"
+         transform="translate(-493.0338,-13.695763)">
+        <g
+           id="g3896"
+           transform="translate(493.03404,13.695735)">
+          <path
+             transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)"
+             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
+             sodipodi:ry="17.926489"
+             sodipodi:rx="35.852978"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074"
+             style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)"
+             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
+             sodipodi:ry="17.926489"
+             sodipodi:rx="35.852978"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074-3"
+             style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)"
+             d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z"
+             sodipodi:ry="17.078087"
+             sodipodi:rx="36.772079"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074-3-6"
+             style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g3174"
+           transform="matrix(1.1663232,0,0,1.2222049,-599.51733,-162.65672)">
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3037"
+             d="M 2287.8343,762.12275 2546.1632,515.60582"
+             style="fill:none;stroke:#0b1521;stroke-width:45.88309479;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3037-3"
+             d="M 2287.8343,762.12275 2546.1632,515.60583"
+             style="fill:none;stroke:#3465a4;stroke-width:22.94154739;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3037-3-6"
+             d="M 2286.2092,754.91791 2541.6504,510.16473"
+             style="fill:none;stroke:#729fcf;stroke-width:11.4707737;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
-        <rect style="fill:#8ae234;fill-opacity:1;stroke:#204a87;stroke-width:13.69538403;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" id="rect3118-5" width="456.41742" height="27.78755" x="903.89514" y="1992.6482" transform="matrix(0.70710668,-0.70710688,0.70710668,0.70710688,0,0)"/>
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MinorAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MinorAxis.svg
index abf52f0c0..f023466f2 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MinorAxis.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MinorAxis.svg
@@ -1,58 +1,250 @@
 <?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="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Ellipse_MajorAxis.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
-  <defs id="defs2920">
-    <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"/>
+
+<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="svg2918"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Ellipse_MinorAxis.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5">
+  <defs
+     id="defs2920">
+    <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>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2926" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-3">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" 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-3" id="radialGradient3960" 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="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-7" id="radialGradient5352" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-7">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-18"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-52"/>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3958"
+       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-3"
+       id="radialGradient3960"
+       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="radialGradient4043"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144-7"
+       id="radialGradient5352"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146-18" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148-52" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3888-7" id="linearGradient3901-1" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3888-7">
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="0" id="stop3890-4"/>
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop3892-0"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3888-7"
+       id="linearGradient3901-1"
+       gradientUnits="userSpaceOnUse"
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888-7">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3890-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3892-0" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3880-4" id="linearGradient3903-9" gradientUnits="userSpaceOnUse" x1="29.993565" y1="54.846851" x2="36.094769" y2="20.854424"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3880-4">
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3882-8"/>
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="1" id="stop3884-8"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3880-4"
+       id="linearGradient3903-9"
+       gradientUnits="userSpaceOnUse"
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3882-8" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3884-8" />
     </linearGradient>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" inkscape:collect="always" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"/>
-    <linearGradient id="linearGradient3836-0-7-7">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5"/>
-      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3"/>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
     </linearGradient>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" gradientUnits="userSpaceOnUse" id="linearGradient3962" xlink:href="#linearGradient3836-0-7-7-5" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3836-0-7-7-5">
-      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5-3"/>
-      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3-5"/>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3962"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
     </linearGradient>
-    <linearGradient id="linearGradient3836-0-7-7-2">
-      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0"/>
+    <linearGradient
+       id="linearGradient3836-0-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8.7173008" inkscape:cx="-1.9193805" inkscape:cy="44.520847" inkscape:current-layer="g4470-2" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" inkscape:snap-bbox="true" inkscape:snap-nodes="false">
-    <inkscape:grid type="xygrid" id="grid3016" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="13.874735"
+     inkscape:cx="40.297497"
+     inkscape:cy="31.347204"
+     inkscape:current-layer="g4470-2"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata2923">
+  <metadata
+     id="metadata2923">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
@@ -81,31 +273,120 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g id="g3800-6" transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
-        <g transform="translate(-10.941933,-540.84412)" id="g3778-7">
-          <g id="g3780-2">
-            <g inkscape:export-ydpi="7.2934141" inkscape:export-xdpi="7.2934141" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" id="g3784-5"/>
-            <g inkscape:export-ydpi="7.2934141" inkscape:export-xdpi="7.2934141" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" id="g3790-2"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4470"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+       inkscape:export-xdpi="6.7850704"
+       inkscape:export-ydpi="6.7850704"
+       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g
+         id="g3800-6"
+         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+        <g
+           transform="translate(-10.941933,-540.84412)"
+           id="g3778-7">
+          <g
+             id="g3780-2">
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
+               id="g3784-5" />
+            <g
+               inkscape:export-ydpi="7.2934141"
+               inkscape:export-xdpi="7.2934141"
+               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
+               id="g3790-2" />
           </g>
         </g>
       </g>
-      <g transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)" id="g3019">
-        <g id="g3021" transform="translate(-10.941933,-540.84412)">
-          <g id="g3023">
-            <g id="g3025" transform="matrix(-0.9996843,0.02512527,-0.02512527,-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"/>
-            <g id="g3027" transform="matrix(-0.9992315,0.03919708,-0.03919708,-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"/>
+      <g
+         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
+         id="g3019">
+        <g
+           id="g3021"
+           transform="translate(-10.941933,-540.84412)">
+          <g
+             id="g3023">
+            <g
+               id="g3025"
+               transform="matrix(-0.9996843,0.02512527,-0.02512527,-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" />
+            <g
+               id="g3027"
+               transform="matrix(-0.9992315,0.03919708,-0.03919708,-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" />
           </g>
         </g>
       </g>
-      <g id="g4470-2" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="translate(-493.0338,-13.695763)">
-        <g id="g3896" transform="translate(493.03404,13.695735)">
-          <path transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)" d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z" sodipodi:ry="17.926489" sodipodi:rx="35.852978" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074" style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
-          <path transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)" d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z" sodipodi:ry="17.926489" sodipodi:rx="35.852978" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074-3" style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
-          <path transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)" d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z" sodipodi:ry="17.078087" sodipodi:rx="36.772079" sodipodi:cy="38.286438" sodipodi:cx="32.608364" id="path3074-3-6" style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="arc"/>
+      <g
+         id="g4470-2"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="6.7850704"
+         inkscape:export-ydpi="6.7850704"
+         transform="translate(-493.0338,-13.695763)">
+        <g
+           id="g3896"
+           transform="translate(493.03404,13.695735)">
+          <path
+             transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)"
+             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
+             sodipodi:ry="17.926489"
+             sodipodi:rx="35.852978"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074"
+             style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)"
+             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
+             sodipodi:ry="17.926489"
+             sodipodi:rx="35.852978"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074-3"
+             style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
+          <path
+             transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)"
+             d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z"
+             sodipodi:ry="17.078087"
+             sodipodi:rx="36.772079"
+             sodipodi:cy="38.286438"
+             sodipodi:cx="32.608364"
+             id="path3074-3-6"
+             style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+             sodipodi:type="arc" />
         </g>
-        <rect style="fill:#8ae234;fill-opacity:1;stroke:#204a87;stroke-width:13.69538403;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" id="rect3118-1" width="246.87076" height="24.284021" x="1883.1063" y="-1144.2454" transform="matrix(0.70710688,0.70710668,-0.70710688,0.70710668,0,0)"/>
+        <path
+           style="fill:none;stroke:#0b1521;stroke-width:54.78153992;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 2294.682,693.64582 2143.8571,542.99659"
+           id="path3037"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#3465a4;stroke-width:27.39076996;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 2294.682,693.64582 2143.8571,542.9966"
+           id="path3037-3"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;stroke:#729fcf;stroke-width:13.69538498;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 2298.6531,689.08892 2148.9073,537.64164"
+           id="path3037-3-6"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg
index 58aedb937..0173c765f 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg
@@ -1,44 +1,188 @@
 <?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="svg5821" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_MergeSketch.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45">
-  <defs id="defs5823">
-    <marker inkscape:stockid="Arrow2Mend" orient="auto" refY="0.0" refX="0.0" id="Arrow2Mend" style="overflow:visible;">
-      <path id="path4003" style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;" d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z " transform="scale(0.6) rotate(180) translate(0,0)"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg5821"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_MergeSketch.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs5823">
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow2Mend"
+       style="overflow:visible;">
+      <path
+         id="path4003"
+         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+         transform="scale(0.6) rotate(180) translate(0,0)" />
     </marker>
-    <marker inkscape:stockid="Arrow1Mend" orient="auto" refY="0.0" refX="0.0" id="Arrow1Mend" style="overflow:visible;">
-      <path id="path3985" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;" transform="scale(0.4) rotate(180) translate(10,0)"/>
+    <marker
+       inkscape:stockid="Arrow1Mend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Mend"
+       style="overflow:visible;">
+      <path
+         id="path3985"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
-    <linearGradient inkscape:collect="always" id="linearGradient6349">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6351"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop6353"/>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6349">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6351" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6353" />
     </linearGradient>
-    <linearGradient id="linearGradient3377">
-      <stop style="stop-color:#0019a3;stop-opacity:1;" offset="0" id="stop3379"/>
-      <stop style="stop-color:#0069ff;stop-opacity:1;" offset="1" id="stop3381"/>
+    <linearGradient
+       id="linearGradient3377">
+      <stop
+         style="stop-color:#0019a3;stop-opacity:1;"
+         offset="0"
+         id="stop3379" />
+      <stop
+         style="stop-color:#0069ff;stop-opacity:1;"
+         offset="1"
+         id="stop3381" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective5829"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" 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="#linearGradient3768" id="linearGradient3774" x1="1178.153" y1="1453.8708" x2="1105.0463" y2="1059.0945" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3768">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3377"
+       id="linearGradient3383"
+       x1="901.1875"
+       y1="1190.875"
+       x2="1267.9062"
+       y2="1190.875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective5829" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6349"
+       id="radialGradient6355"
+       cx="1103.6399"
+       cy="1424.4465"
+       fx="1103.6399"
+       fy="1424.4465"
+       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="#linearGradient3768"
+       id="linearGradient3774"
+       x1="1178.153"
+       y1="1453.8708"
+       x2="1105.0463"
+       y2="1059.0945"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3768">
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1"
+         offset="0"
+         id="stop3770" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3772" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3768-5" id="linearGradient3054-3" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.69497956,0,0,0.78924205,-531.38841,136.64219)" x1="1178.153" y1="1453.8708" x2="1105.0463" y2="1059.0945"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3768-5">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770-6"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772-2"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3768-5"
+       id="linearGradient3054-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.69497956,0,0,0.78924205,-531.38841,136.64219)"
+       x1="1178.153"
+       y1="1453.8708"
+       x2="1105.0463"
+       y2="1059.0945" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3768-5">
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1"
+         offset="0"
+         id="stop3770-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3772-2" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="6.1640625" inkscape:cx="18.60986" inkscape:cy="51.647207" inkscape:current-layer="g3047" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1137" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:snap-nodes="true">
-    <inkscape:grid type="xygrid" id="grid3045" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0391464"
+     inkscape:cx="17.793844"
+     inkscape:cy="52.547104"
+     inkscape:current-layer="g3047"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3045"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata5826">
+  <metadata
+     id="metadata5826">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
@@ -67,60 +211,160 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g3360" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png" inkscape:export-xdpi="3.2478156" inkscape:export-ydpi="3.2478156" transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <g id="g3765" transform="translate(584.85388,0)">
-        <rect y="1316.9672" x="1010.6287" height="119.62317" width="139.40201" id="rect3860" style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:14.85358047;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-        <path transform="matrix(3.8144828,0,0,3.6149859,1026.5802,1189.457)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" sodipodi:ry="18.181818" sodipodi:rx="18.181818" sodipodi:cy="33.272728" sodipodi:cx="30.181818" id="path3862" style="color:#000000;fill:none;stroke:#ff1e00;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" sodipodi:type="arc"/>
-        <path inkscape:transform-center-y="-0.61637387" transform="matrix(2.1664228,0,0,2.2386861,1076.2945,1314.2871)" d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.5707963" sodipodi:arg1="0.52359878" sodipodi:r2="3.8833756" sodipodi:r1="8.051487" sodipodi:cy="20.181818" sodipodi:cx="-16.727274" sodipodi:sides="3" id="path3888" style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star"/>
-        <path inkscape:transform-center-y="4.5061953" transform="matrix(2.1664228,0,0,-2.2386861,1076.2945,1434.9197)" d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.5707963" sodipodi:arg1="0.52359878" sodipodi:r2="3.8833756" sodipodi:r1="8.051487" sodipodi:cy="20.181818" sodipodi:cx="-16.727274" sodipodi:sides="3" id="path3888-9" style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star"/>
-        <path inkscape:transform-center-x="1.9947136" inkscape:transform-center-y="-3.0423375" transform="matrix(1.7423908,-1.2200925,1.4037856,1.8005101,1121.2232,1222.3125)" d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.5707963" sodipodi:arg1="0.52359878" sodipodi:r2="3.8833756" sodipodi:r1="8.051487" sodipodi:cy="20.181818" sodipodi:cx="-16.727274" sodipodi:sides="3" id="path3888-97" style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star"/>
-      </g>
-      <g id="g3772" transform="matrix(0.81534896,0,0,0.80276295,651.50537,5.5090201)">
-        <rect style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:14.85358047;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="rect3774" width="139.40201" height="119.62317" x="1010.6287" y="1316.9672"/>
-        <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#ff1e00;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" id="path3776" sodipodi:cx="30.181818" sodipodi:cy="33.272728" sodipodi:rx="18.181818" sodipodi:ry="18.181818" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" transform="matrix(3.8144828,0,0,3.6149859,1026.5802,1189.457)"/>
-        <path sodipodi:type="star" style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path3778" sodipodi:sides="3" sodipodi:cx="-16.727274" sodipodi:cy="20.181818" sodipodi:r1="8.051487" sodipodi:r2="3.8833756" sodipodi:arg1="0.52359878" sodipodi:arg2="1.5707963" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z" transform="matrix(2.1664228,0,0,2.2386861,1076.2945,1314.2871)" inkscape:transform-center-y="-0.61637387"/>
-        <path sodipodi:type="star" style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path3780" sodipodi:sides="3" sodipodi:cx="-16.727274" sodipodi:cy="20.181818" sodipodi:r1="8.051487" sodipodi:r2="3.8833756" sodipodi:arg1="0.52359878" sodipodi:arg2="1.5707963" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z" transform="matrix(2.1664228,0,0,-2.2386861,1076.2945,1434.9197)" inkscape:transform-center-y="4.5061953"/>
-        <path sodipodi:type="star" style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="path3782" sodipodi:sides="3" sodipodi:cx="-16.727274" sodipodi:cy="20.181818" sodipodi:r1="8.051487" sodipodi:r2="3.8833756" sodipodi:arg1="0.52359878" sodipodi:arg2="1.5707963" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z" transform="matrix(1.7423908,-1.2200925,1.4037856,1.8005101,1121.2232,1222.3125)" inkscape:transform-center-y="-3.0423375" inkscape:transform-center-x="1.9947136"/>
-      </g>
-      <g transform="matrix(0.84841984,0,0,0.83711094,878.06417,-38.155576)" id="g3784">
-        <rect y="1316.9672" x="1010.6287" height="119.62317" width="139.40201" id="rect3786" style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:14.85358047;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-        <path transform="matrix(3.8144828,0,0,3.6149859,1026.5802,1189.457)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" sodipodi:ry="18.181818" sodipodi:rx="18.181818" sodipodi:cy="33.272728" sodipodi:cx="30.181818" id="path3788" style="color:#000000;fill:none;stroke:#ff1e00;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" sodipodi:type="arc"/>
-        <path inkscape:transform-center-y="-0.61637387" transform="matrix(2.1664228,0,0,2.2386861,1076.2945,1314.2871)" d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.5707963" sodipodi:arg1="0.52359878" sodipodi:r2="3.8833756" sodipodi:r1="8.051487" sodipodi:cy="20.181818" sodipodi:cx="-16.727274" sodipodi:sides="3" id="path3790" style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star"/>
-        <path inkscape:transform-center-y="4.5061953" transform="matrix(2.1664228,0,0,-2.2386861,1076.2945,1434.9197)" d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.5707963" sodipodi:arg1="0.52359878" sodipodi:r2="3.8833756" sodipodi:r1="8.051487" sodipodi:cy="20.181818" sodipodi:cx="-16.727274" sodipodi:sides="3" id="path3792" style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star"/>
-        <path inkscape:transform-center-x="1.9947136" inkscape:transform-center-y="-3.0423375" transform="matrix(1.7423908,-1.2200925,1.4037856,1.8005101,1121.2232,1222.3125)" d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.5707963" sodipodi:arg1="0.52359878" sodipodi:r2="3.8833756" sodipodi:r1="8.051487" sodipodi:cy="20.181818" sodipodi:cx="-16.727274" sodipodi:sides="3" id="path3794" style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star"/>
-      </g>
-      <path style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.31067371px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1477.307,1187.6104 c -4.7057,36.7263 14.1393,76.0492 72.3469,95.4743 l -7.1161,17.1972 43.2896,-18.3833 -16.6042,-37.9525 -8.8951,18.3833 c -42.9544,-11.6634 -55.6917,-27.2559 -56.9288,-75.905 z" id="path3796" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc"/>
-      <path sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" id="path3798" d="m 1880.7564,1182.7467 c -1.0435,29.8776 10.796,63.977 -34.3644,88.1214 l -10.9973,-15.0146 -6.7821,46.5395 41.055,5.5296 -11.0865,-17.1511 c 46.6273,-27.9935 55.3853,-56.9439 48.1787,-108.2411 z" style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.31067371px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"/>
-      <g id="g3047" transform="matrix(0.62222324,0,0,0.61432167,842.63789,423.10469)">
-        <rect y="1059.0725" x="104.49656" height="190.40639" width="187.98843" id="rect3860-3" style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.94758606000000611;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-        <path transform="matrix(5.1840059,0,0,5.236176,135.76185,896.75102)" 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" sodipodi:ry="18.181818" sodipodi:rx="18.181818" sodipodi:cy="33.272728" sodipodi:cx="30.181818" id="path3862-6" style="color:#000000;fill:none;stroke:#a40000;stroke-width:13.61751175000000025;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" sodipodi:type="arc"/>
-        <rect y="1059.0725" x="104.49656" height="190.40639" width="187.98842" id="rect3860-3-9" style="color:#000000;fill:none;stroke:#ef2929;stroke-width:23.64919498000000075;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-        <path transform="matrix(5.1840059,0,0,5.236176,135.76186,896.75101)" 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" sodipodi:ry="18.181818" sodipodi:rx="18.181818" sodipodi:cy="33.272728" sodipodi:cx="30.181818" id="path3862-6-1" style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917054999999969;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" sodipodi:type="arc"/>
-        <path inkscape:connector-curvature="0" id="path3012" d="m 189.35265,1136.9335 -73.10681,0 36.5535,-58.4854 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:23.64919472;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <path inkscape:connector-curvature="0" id="path3014" d="m 116.24584,1166.1761 73.10681,0 -36.55331,58.4854 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:23.64919472;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <path inkscape:connector-curvature="0" id="path3012-5" d="m 327.73283,1045.0069 -70.49567,37.8664 2.68723,-71.4025 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:23.64919472;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <rect y="1059.0726" x="456.97491" height="190.40639" width="187.98842" id="rect3860-3-2" style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-        <path transform="matrix(5.1840059,0,0,5.236176,488.24021,896.75107)" 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" sodipodi:ry="18.181818" sodipodi:rx="18.181818" sodipodi:cy="33.272728" sodipodi:cx="30.181818" id="path3862-6-6" style="color:#000000;fill:none;stroke:#a40000;stroke-width:13.61751175;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" sodipodi:type="arc"/>
-        <rect y="1059.0726" x="456.97491" height="190.40639" width="187.9884" id="rect3860-3-9-1" style="color:#000000;fill:none;stroke:#ef2929;stroke-width:23.64919472000000056;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-        <path transform="matrix(5.1840059,0,0,5.236176,488.24022,896.75106)" 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" sodipodi:ry="18.181818" sodipodi:rx="18.181818" sodipodi:cy="33.272728" sodipodi:cx="30.181818" id="path3862-6-1-8" style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917074000000031;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" sodipodi:type="arc"/>
-        <path inkscape:connector-curvature="0" id="path3012-7" d="m 541.83099,1136.9336 -73.1068,0 36.5535,-58.4854 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:23.64919472;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <path inkscape:connector-curvature="0" id="path3014-9" d="m 468.72419,1166.1762 73.1068,0 -36.5533,58.4854 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:23.64919472;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <path inkscape:connector-curvature="0" id="path3012-5-2" d="m 680.21117,1045.007 -70.49567,37.8664 2.68724,-71.4025 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:23.64919472;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <rect y="1427.9849" x="268.98648" height="190.40639" width="187.98842" id="rect3860-3-8" style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.94758606000000611;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-        <path transform="matrix(5.1840059,0,0,5.236176,300.25178,1265.6633)" 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" sodipodi:ry="18.181818" sodipodi:rx="18.181818" sodipodi:cy="33.272728" sodipodi:cx="30.181818" id="path3862-6-9" style="color:#000000;fill:none;stroke:#a40000;stroke-width:13.61751175000000025;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" sodipodi:type="arc"/>
-        <rect y="1427.9849" x="268.98648" height="190.40639" width="187.9884" id="rect3860-3-9-7" style="color:#000000;fill:none;stroke:#ef2929;stroke-width:23.64919472000000056;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-        <path transform="matrix(5.1840059,0,0,5.236176,300.25179,1265.6633)" 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" sodipodi:ry="18.181818" sodipodi:rx="18.181818" sodipodi:cy="33.272728" sodipodi:cx="30.181818" id="path3862-6-1-3" style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917074000000031;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" sodipodi:type="arc"/>
-        <path inkscape:connector-curvature="0" id="path3012-6" d="m 353.84255,1505.8458 -73.1068,0 36.5535,-58.4854 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:23.64919472;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <path inkscape:connector-curvature="0" id="path3014-1" d="m 280.73575,1535.0884 73.1068,0 -36.55329,58.4854 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:23.64919472;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <path inkscape:connector-curvature="0" id="path3012-5-29" d="m 492.22273,1413.9192 -70.49567,37.8664 2.68724,-71.4025 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:23.64919472;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <path style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;marker-end:none" d="m 6.9999999,35.000001 c 0,6 0.9999999,8 7.0000001,8" id="path3202" inkscape:connector-curvature="0" transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)" sodipodi:nodetypes="cc"/>
-        <path inkscape:connector-curvature="0" id="path3012-6-3" d="m 198.49078,1475.5865 0,-95.2032 70.49567,47.6016 z" style="fill:#d3d7cf;stroke:#2e3436;stroke-width:23.64919280999999884;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <path style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" d="m 6.9999999,35.000001 c 0,6 0.9999999,8 7.0000001,8" id="path4804" inkscape:connector-curvature="0" transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)" sodipodi:nodetypes="cc"/>
-        <g id="g4830" transform="matrix(-1,0,0,1,1430.918,-11.900422)">
-          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path3202-1" d="m 715.459,1344.6821 c 0,71.4024 11.74928,95.2032 82.24495,95.2032" style="fill:none;stroke:#2e3436;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;marker-end:none"/>
-          <path style="fill:#d3d7cf;stroke:#2e3436;stroke-width:23.64919281;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 785.95466,1487.4869 0,-95.2032 70.49566,47.6016 z" id="path3012-6-3-9" inkscape:connector-curvature="0"/>
-          <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4804-4" d="m 715.459,1344.6821 c 0,71.4024 11.74928,95.2032 82.24495,95.2032" style="fill:none;stroke:#d3d7cf;stroke-width:23.64919472;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g3360"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
+       inkscape:export-xdpi="3.2478156"
+       inkscape:export-ydpi="3.2478156"
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+      <g
+         id="g3047"
+         transform="matrix(0.62222324,0,0,0.61432167,842.63789,423.10469)">
+        <rect
+           y="1059.0725"
+           x="104.49656"
+           height="190.40639"
+           width="187.98843"
+           id="rect3860-3"
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.94758606000000611;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           transform="matrix(5.1840059,0,0,5.236176,135.76185,896.75102)"
+           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+           sodipodi:ry="18.181818"
+           sodipodi:rx="18.181818"
+           sodipodi:cy="33.272728"
+           sodipodi:cx="30.181818"
+           id="path3862-6"
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:13.61751175000000025;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"
+           sodipodi:type="arc" />
+        <rect
+           y="1059.0725"
+           x="104.49656"
+           height="190.40639"
+           width="187.98842"
+           id="rect3860-3-9"
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:23.64919498000000075;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           transform="matrix(5.1840059,0,0,5.236176,135.76186,896.75101)"
+           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+           sodipodi:ry="18.181818"
+           sodipodi:rx="18.181818"
+           sodipodi:cy="33.272728"
+           sodipodi:cx="30.181818"
+           id="path3862-6-1"
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917054999999969;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"
+           sodipodi:type="arc" />
+        <rect
+           y="1059.0726"
+           x="456.97491"
+           height="190.40639"
+           width="187.98842"
+           id="rect3860-3-2"
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           transform="matrix(5.1840059,0,0,5.236176,488.24021,896.75107)"
+           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+           sodipodi:ry="18.181818"
+           sodipodi:rx="18.181818"
+           sodipodi:cy="33.272728"
+           sodipodi:cx="30.181818"
+           id="path3862-6-6"
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:13.61751175;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"
+           sodipodi:type="arc" />
+        <rect
+           y="1059.0726"
+           x="456.97491"
+           height="190.40639"
+           width="187.9884"
+           id="rect3860-3-9-1"
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:23.64919472000000056;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           transform="matrix(5.1840059,0,0,5.236176,488.24022,896.75106)"
+           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+           sodipodi:ry="18.181818"
+           sodipodi:rx="18.181818"
+           sodipodi:cy="33.272728"
+           sodipodi:cx="30.181818"
+           id="path3862-6-1-8"
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917074000000031;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"
+           sodipodi:type="arc" />
+        <rect
+           y="1427.9849"
+           x="268.98648"
+           height="190.40639"
+           width="187.98842"
+           id="rect3860-3-8"
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.94758606000000611;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           transform="matrix(5.1840059,0,0,5.236176,300.25178,1265.6633)"
+           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+           sodipodi:ry="18.181818"
+           sodipodi:rx="18.181818"
+           sodipodi:cy="33.272728"
+           sodipodi:cx="30.181818"
+           id="path3862-6-9"
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:13.61751175000000025;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"
+           sodipodi:type="arc" />
+        <rect
+           y="1427.9849"
+           x="268.98648"
+           height="190.40639"
+           width="187.9884"
+           id="rect3860-3-9-7"
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:23.64919472000000056;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           transform="matrix(5.1840059,0,0,5.236176,300.25179,1265.6633)"
+           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+           sodipodi:ry="18.181818"
+           sodipodi:rx="18.181818"
+           sodipodi:cy="33.272728"
+           sodipodi:cx="30.181818"
+           id="path3862-6-1-3"
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917074000000031;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"
+           sodipodi:type="arc" />
+        <path
+           style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;marker-end:none"
+           d="m 6.9999999,35.000001 c 0,6 0.9999999,8 7.0000001,8"
+           id="path3202"
+           inkscape:connector-curvature="0"
+           transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3012-6-3"
+           d="m 198.49078,1475.5865 0,-95.2032 70.49567,47.6016 z"
+           style="fill:#d3d7cf;stroke:#2e3436;stroke-width:23.64919280999999884;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 6.9999999,35.000001 c 0,6 0.9999999,8 7.0000001,8"
+           id="path4804"
+           inkscape:connector-curvature="0"
+           transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)"
+           sodipodi:nodetypes="cc" />
+        <g
+           id="g4830"
+           transform="matrix(-1,0,0,1,1430.918,-11.900422)">
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3202-1"
+             d="m 715.459,1344.6821 c 0,71.4024 11.74928,95.2032 82.24495,95.2032"
+             style="fill:none;stroke:#2e3436;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;marker-end:none" />
+          <path
+             style="fill:#d3d7cf;stroke:#2e3436;stroke-width:23.64919281;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             d="m 785.95466,1487.4869 0,-95.2032 70.49566,47.6016 z"
+             id="path3012-6-3-9"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4804-4"
+             d="m 715.459,1344.6821 c 0,71.4024 11.74928,95.2032 82.24495,95.2032"
+             style="fill:none;stroke:#d3d7cf;stroke-width:23.64919472;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MirrorSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MirrorSketch.svg
index b39d946aa..b08d6d329 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MirrorSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MirrorSketch.svg
@@ -1,53 +1,140 @@
 <?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="svg5821" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_MirrorSketch.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45">
-  <defs id="defs5823">
-    <linearGradient inkscape:collect="always" id="linearGradient6349">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6351"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop6353"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg5821"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_MirrorSketch.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs5823">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6349">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6351" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6353" />
     </linearGradient>
-    <linearGradient id="linearGradient3377">
-      <stop style="stop-color:#0019a3;stop-opacity:1;" offset="0" id="stop3379"/>
-      <stop style="stop-color:#0069ff;stop-opacity:1;" offset="1" id="stop3381"/>
+    <linearGradient
+       id="linearGradient3377">
+      <stop
+         style="stop-color:#0019a3;stop-opacity:1;"
+         offset="0"
+         id="stop3379" />
+      <stop
+         style="stop-color:#0069ff;stop-opacity:1;"
+         offset="1"
+         id="stop3381" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective5829"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" r="194.40614" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" gradientUnits="userSpaceOnUse"/>
-    <linearGradient gradientTransform="matrix(0.75675671,0,0,0.48485171,259.11334,485.1103)" inkscape:collect="always" xlink:href="#linearGradient3768" id="linearGradient3774" x1="1214.4453" y1="1450.2174" x2="1156.4822" y2="1074.9359" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3768">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3377"
+       id="linearGradient3383"
+       x1="901.1875"
+       y1="1190.875"
+       x2="1267.9062"
+       y2="1190.875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective5829" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6349"
+       id="radialGradient6355"
+       cx="1103.6399"
+       cy="1424.4465"
+       fx="1103.6399"
+       fy="1424.4465"
+       r="194.40614"
+       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientTransform="matrix(1,0,0,0.5757573,-365.5337,605.49565)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient3768-4"
+       id="linearGradient3774-9"
+       x1="1178.153"
+       y1="1453.8708"
+       x2="1105.0463"
+       y2="1059.0945"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3768-4">
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1"
+         offset="0"
+         id="stop3770-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3772-8" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3776" id="linearGradient3782" x1="30.18182" y1="58.727276" x2="20.264463" y2="9.6363649" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3776">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3778"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3780"/>
-    </linearGradient>
-    <linearGradient gradientTransform="matrix(1,0,0,0.5757573,-365.5337,605.49565)" inkscape:collect="always" xlink:href="#linearGradient3768-4" id="linearGradient3774-9" x1="1178.153" y1="1453.8708" x2="1105.0463" y2="1059.0945" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3768-4">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770-8"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772-8"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3776-76">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3778-1"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3780-4"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3768-3">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770-2"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772-2"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3768-3" id="linearGradient3196" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.75675671,0,0,0.48485113,-179.52708,762.91656)" x1="1156.4822" y1="1074.9358" x2="1079.1979" y2="1450.2173"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3776-76" id="linearGradient3198" gradientUnits="userSpaceOnUse" x1="20.264463" y1="9.6363602" x2="7.0413232" y2="60.545452"/>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="12.546875" inkscape:cx="34.472788" inkscape:cy="28.954075" inkscape:current-layer="g3360" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-bbox="false" inkscape:snap-nodes="true">
-    <inkscape:grid type="xygrid" id="grid3040" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16.036414"
+     inkscape:cx="34.190727"
+     inkscape:cy="32.208332"
+     inkscape:current-layer="g3187"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="873"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3040"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata5826">
+  <metadata
+     id="metadata5826">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
@@ -76,26 +163,101 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g3360" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png" inkscape:export-xdpi="3.2478156" inkscape:export-ydpi="3.2478156" transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <rect style="color:#000000;fill:none;stroke:#a40000;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-36" width="204.69887" height="116.97069" x="951.52222" y="1051.7839"/>
-      <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#a40000;stroke-width:10.40140914999999900;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-7" 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.4229577,0,0,4.0208706,1044.6602,961.86255)"/>
-      <rect style="color:#000000;fill:none;stroke:url(#linearGradient3774);stroke-width:14.62134361;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="204.69887" height="116.97153" x="951.52222" y="1051.7831"/>
-      <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:url(#linearGradient3782);stroke-width:3.46713686;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.4229575,0,0,4.0208705,1044.6602,961.86255)"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 980.7648,1124.8905 43.8641,0 -21.932,29.2427 z" id="path3014" inkscape:connector-curvature="0"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 980.7648,1095.6479 43.8641,0 -21.932,-29.2428 z" id="path3014-1" inkscape:connector-curvature="0"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 1216.8477,1102.5913 -31.0166,-31.0166 36.1861,-5.1695 z" id="path3014-5" inkscape:connector-curvature="0"/>
-      <g id="g3187" transform="matrix(1,0,0,-1,438.64043,2717.6642)">
-        <rect y="1329.5896" x="512.88171" height="116.97055" width="204.69887" id="rect3860-36-1" style="color:#000000;fill:none;stroke:#a40000;stroke-width:43.86404037;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-        <path transform="matrix(4.4229577,0,0,4.0208706,606.01966,1239.6681)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" sodipodi:ry="18.181818" sodipodi:rx="18.181818" sodipodi:cy="33.272728" sodipodi:cx="30.181818" id="path3862-7-6" style="color:#000000;fill:none;stroke:#a40000;stroke-width:10.40140914999999900;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" sodipodi:type="arc"/>
-        <rect y="1329.5887" x="512.88171" height="116.97141" width="204.69887" id="rect3860-3-8" style="color:#000000;fill:none;stroke:url(#linearGradient3196);stroke-width:14.62134361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"/>
-        <path transform="matrix(4.4229575,0,0,4.0208705,606.01966,1239.6681)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" sodipodi:ry="18.181818" sodipodi:rx="18.181818" sodipodi:cy="33.272728" sodipodi:cx="30.181818" id="path3862-6-5" style="color:#000000;fill:none;stroke:url(#linearGradient3198);stroke-width:3.46713686;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" sodipodi:type="arc"/>
-        <path inkscape:connector-curvature="0" id="path3014-7" d="m 542.12439,1402.696 43.86404,0 -21.93201,29.2428 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <path inkscape:connector-curvature="0" id="path3014-1-6" d="m 542.12439,1373.4535 43.86404,0 -21.93201,-29.2428 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
-        <path inkscape:connector-curvature="0" id="path3014-5-1" d="m 778.20716,1380.3969 -31.0166,-31.0166 36.1861,-5.1695 z" style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g3360"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
+       inkscape:export-xdpi="3.2478156"
+       inkscape:export-ydpi="3.2478156"
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+      <rect
+         style="color:#000000;fill:none;stroke:#a40000;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-36"
+         width="204.69887"
+         height="116.97069"
+         x="951.52222"
+         y="1051.7839" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#a40000;stroke-width:10.40140914999999900;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-7"
+         sodipodi:cx="30.181818"
+         sodipodi:cy="33.272728"
+         sodipodi:rx="18.181818"
+         sodipodi:ry="18.181818"
+         d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+         transform="matrix(4.4229577,0,0,4.0208706,1044.6602,961.86255)" />
+      <rect
+         style="color:#000000;fill:none;stroke:#ef2929;stroke-width:14.62134361000000027;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="204.69887"
+         height="116.97153"
+         x="951.52222"
+         y="1051.7831" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:#ef2929;stroke-width:3.46713686000000010;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 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+         transform="matrix(4.4229575,0,0,4.0208705,1044.6602,961.86255)" />
+      <g
+         id="g3187"
+         transform="matrix(1,0,0,-1,438.64043,2717.6642)">
+        <rect
+           y="1329.5896"
+           x="512.88171"
+           height="116.97055"
+           width="204.69887"
+           id="rect3860-36-1"
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:43.86404037;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           transform="matrix(4.4229577,0,0,4.0208706,606.01966,1239.6681)"
+           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+           sodipodi:ry="18.181818"
+           sodipodi:rx="18.181818"
+           sodipodi:cy="33.272728"
+           sodipodi:cx="30.181818"
+           id="path3862-7-6"
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:10.40140914999999900;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"
+           sodipodi:type="arc" />
+        <rect
+           y="1329.5887"
+           x="512.88171"
+           height="116.97141"
+           width="204.69887"
+           id="rect3860-3-8"
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:14.62134361000000027;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path
+           transform="matrix(4.4229575,0,0,4.0208705,606.01966,1239.6681)"
+           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+           sodipodi:ry="18.181818"
+           sodipodi:rx="18.181818"
+           sodipodi:cy="33.272728"
+           sodipodi:cx="30.181818"
+           id="path3862-6-5"
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:3.46713686000000010;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"
+           sodipodi:type="arc" />
       </g>
-      <path style="fill:none;stroke:#204a87;stroke-width:5.99999996000000020;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:5.99999996000000020, 11.99999993000000000;stroke-dashoffset:2.99999998000000010" d="M 4.9999998,32 58.999999,32" id="path3200" inkscape:connector-curvature="0" transform="matrix(7.3106737,0,0,7.3106737,871.10471,985.98778)" sodipodi:nodetypes="cc"/>
-      <path style="fill:none;stroke:#729fcf;stroke-width:14.62134731;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:43.86404164999999700, 87.72808336999997900;stroke-dashoffset:21.93202082000000200" d="m 907.65808,1219.9293 394.77632,0" id="path3200-8" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
+      <path
+         style="fill:none;stroke:#204a87;stroke-width:5.99999996000000020;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:5.99999996000000020, 11.99999993000000000;stroke-dashoffset:2.99999998000000010"
+         d="M 4.9999998,32 58.999999,32"
+         id="path3200"
+         inkscape:connector-curvature="0"
+         transform="matrix(7.3106737,0,0,7.3106737,871.10471,985.98778)"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:14.62134731;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:43.86404164999999700, 87.72808336999997900;stroke-dashoffset:21.93202082000000200"
+         d="m 907.65808,1219.9293 394.77632,0"
+         id="path3200-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_NewSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_NewSketch.svg
index 2406b6fe7..4d0faa56c 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_NewSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_NewSketch.svg
@@ -1,49 +1,214 @@
 <?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="svg5821" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="SketcherWorkbench.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45">
-  <defs id="defs5823">
-    <linearGradient inkscape:collect="always" id="linearGradient3776">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3778"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3780"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg5821"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_NewSketch.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs5823">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3776">
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1"
+         offset="0"
+         id="stop3778" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3780" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3768">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772"/>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3768">
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1"
+         offset="0"
+         id="stop3770" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3772" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient6349">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6351"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop6353"/>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6349">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6351" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6353" />
     </linearGradient>
-    <linearGradient id="linearGradient3377">
-      <stop style="stop-color:#0019a3;stop-opacity:1;" offset="0" id="stop3379"/>
-      <stop style="stop-color:#0069ff;stop-opacity:1;" offset="1" id="stop3381"/>
+    <linearGradient
+       id="linearGradient3377">
+      <stop
+         style="stop-color:#0019a3;stop-opacity:1;"
+         offset="0"
+         id="stop3379" />
+      <stop
+         style="stop-color:#0069ff;stop-opacity:1;"
+         offset="1"
+         id="stop3381" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective5829"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" 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="#linearGradient3768" id="linearGradient3774" x1="1178.153" y1="1453.8708" x2="1105.0463" y2="1059.0945" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3776" id="linearGradient3782" x1="33.052631" y1="73.676765" x2="23.483253" y2="19.131313" gradientUnits="userSpaceOnUse"/>
-    <linearGradient gradientTransform="matrix(7.3106737,0,0,7.3106737,841.86203,1044.4732)" inkscape:collect="always" xlink:href="#linearGradient3874" id="linearGradient3880" x1="56" y1="47" x2="53" y2="39" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3874">
-      <stop style="stop-color:#555753;stop-opacity:1" offset="0" id="stop3876"/>
-      <stop style="stop-color:#babdb6;stop-opacity:1" offset="1" id="stop3878"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3377"
+       id="linearGradient3383"
+       x1="901.1875"
+       y1="1190.875"
+       x2="1267.9062"
+       y2="1190.875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective5829" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6349"
+       id="radialGradient6355"
+       cx="1103.6399"
+       cy="1424.4465"
+       fx="1103.6399"
+       fy="1424.4465"
+       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="#linearGradient3768"
+       id="linearGradient3774"
+       x1="1178.153"
+       y1="1453.8708"
+       x2="1105.0463"
+       y2="1059.0945"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3776"
+       id="linearGradient3782"
+       x1="33.052631"
+       y1="73.676765"
+       x2="23.483253"
+       y2="19.131313"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientTransform="matrix(7.3106737,0,0,7.3106737,841.86203,1044.4732)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient3874"
+       id="linearGradient3880"
+       x1="56"
+       y1="47"
+       x2="53"
+       y2="39"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3874">
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="0"
+         id="stop3876" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop3878" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3866" id="linearGradient3872" x1="35" y1="53" x2="24" y2="9" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3866">
-      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="0" id="stop3868"/>
-      <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop3870"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3866"
+       id="linearGradient3872"
+       x1="35"
+       y1="53"
+       x2="24"
+       y2="9"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3866">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3868" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3870" />
     </linearGradient>
-    <linearGradient gradientTransform="matrix(0,7.3106737,7.3106737,0,900.34735,985.98777)" y2="20.000008" x2="6.000001" y1="38.000008" x1="58" gradientUnits="userSpaceOnUse" id="linearGradient3127" xlink:href="#linearGradient3866" inkscape:collect="always"/>
+    <linearGradient
+       gradientTransform="matrix(0,7.3106737,7.3106737,0,900.34735,985.98777)"
+       y2="20.000008"
+       x2="6.000001"
+       y1="38.000008"
+       x1="58"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3127"
+       xlink:href="#linearGradient3866"
+       inkscape:collect="always" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="10.193662" inkscape:cx="2.6848879" inkscape:cy="35.21332" inkscape:current-layer="g3360" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-bbox="false" inkscape:snap-nodes="true">
-    <inkscape:grid type="xygrid" id="grid2997" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.0380069"
+     inkscape:cx="19.154263"
+     inkscape:cy="32.756262"
+     inkscape:current-layer="g3360"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="873"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata5826">
+  <metadata
+     id="metadata5826">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
@@ -72,18 +237,63 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g3360" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png" inkscape:export-xdpi="3.2478156" inkscape:export-ydpi="3.2478156" transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <path d="m 922.27941,1007.9198 365.53359,0 0,350.9123 -73.1067,73.1069 -292.42689,0 z" id="rect3005" style="color:#000000;fill:url(#linearGradient3127);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;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" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
-      <path style="fill:none;stroke:#ffffff;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1273.1917,1022.5412 -336.29092,0 0,394.7763 271.22592,0 65.065,-66.5271 z" id="path3096" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccc"/>
-      <path d="m 1287.8132,1358.8322 c 0,-7.3107 -29.2428,-29.2427 -58.4855,-29.2427 0,0 14.6213,73.1067 -14.6214,102.3494 z" id="path3778" style="color:#000000;fill:url(#linearGradient3880);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:14.26466179;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="cccc"/>
-      <path style="fill:none;stroke:#babdb6;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 1229.9528,1396.295 48.6777,-47.1803" id="path3125" inkscape:connector-curvature="0" sodipodi:nodetypes="cc"/>
-      <path d="m 1287.8132,1358.8322 c 0,-7.3107 -29.2428,-29.2427 -58.4855,-29.2427 0,0 14.6213,73.1067 -14.6214,102.3494 z" id="path3778-3" style="color:#000000;fill:none;stroke:#3f3f3f;stroke-width:14.26466179;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="cccc"/>
-      <rect style="color:#000000;fill:none;stroke:url(#linearGradient3774);stroke-width:29.24269676;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="190.077" height="190.07753" x="958.83331" y="1190.6866"/>
-      <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:url(#linearGradient3782);stroke-width:5.53487444;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(5.4281292,0,0,5.1424383,996.04635,999.19155)"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 1053.8716,1271.1041 -73.1068,0 36.5535,-58.4854 z" id="path3012" inkscape:connector-curvature="0"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 980.7648,1300.3467 73.1068,0 -36.5533,58.4854 z" id="path3014" inkscape:connector-curvature="0"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 1187.8771,1128.021 -63.3122,36.5534 2.4134,-68.9265 z" id="path3012-5" inkscape:connector-curvature="0"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g3360"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
+       inkscape:export-xdpi="3.2478156"
+       inkscape:export-ydpi="3.2478156"
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+      <path
+         d="m 922.27941,1007.9198 365.53359,0 0,350.9123 -73.1067,73.1069 -292.42689,0 z"
+         id="rect3005"
+         style="color:#000000;fill:url(#linearGradient3127);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;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"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1273.1917,1022.5412 -336.29092,0 0,394.7763 271.22592,0 65.065,-66.5271 z"
+         id="path3096"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         d="m 1287.8132,1358.8322 c 0,-7.3107 -29.2428,-29.2427 -58.4855,-29.2427 0,0 14.6213,73.1067 -14.6214,102.3494 z"
+         id="path3778"
+         style="color:#000000;fill:url(#linearGradient3880);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:14.26466179;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="cccc" />
+      <path
+         style="fill:none;stroke:#babdb6;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1229.9528,1396.295 48.6777,-47.1803"
+         id="path3125"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         d="m 1287.8132,1358.8322 c 0,-7.3107 -29.2428,-29.2427 -58.4855,-29.2427 0,0 14.6213,73.1067 -14.6214,102.3494 z"
+         id="path3778-3"
+         style="color:#000000;fill:none;stroke:#3f3f3f;stroke-width:14.26466179;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="cccc" />
+      <rect
+         style="color:#000000;fill:none;stroke:url(#linearGradient3774);stroke-width:29.24269676;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="190.077"
+         height="190.07753"
+         x="958.83331"
+         y="1190.6866" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:none;stroke:url(#linearGradient3782);stroke-width:5.53487444;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 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+         transform="matrix(5.4281292,0,0,5.1424383,996.04635,999.19155)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg
index 7e14b9f1e..fe307e0f4 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg
@@ -1,38 +1,139 @@
 <?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="svg5821" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Sketch.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1" inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png" inkscape:export-xdpi="45" inkscape:export-ydpi="45">
-  <defs id="defs5823">
-    <linearGradient inkscape:collect="always" id="linearGradient3776">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3778"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3780"/>
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg5821"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Sketch.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs5823">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6349">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop6351" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop6353" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient3768">
-      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770"/>
-      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772"/>
+    <linearGradient
+       id="linearGradient3377">
+      <stop
+         style="stop-color:#0019a3;stop-opacity:1;"
+         offset="0"
+         id="stop3379" />
+      <stop
+         style="stop-color:#0069ff;stop-opacity:1;"
+         offset="1"
+         id="stop3381" />
     </linearGradient>
-    <linearGradient inkscape:collect="always" id="linearGradient6349">
-      <stop style="stop-color:#000000;stop-opacity:1;" offset="0" id="stop6351"/>
-      <stop style="stop-color:#000000;stop-opacity:0;" offset="1" id="stop6353"/>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3377"
+       id="linearGradient3383"
+       x1="901.1875"
+       y1="1190.875"
+       x2="1267.9062"
+       y2="1190.875"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective5829" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6349"
+       id="radialGradient6355"
+       cx="1103.6399"
+       cy="1424.4465"
+       fx="1103.6399"
+       fy="1424.4465"
+       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="#linearGradient3776"
+       id="linearGradient3782"
+       x1="33.052631"
+       y1="73.676765"
+       x2="23.483253"
+       y2="19.131313"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3776">
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1"
+         offset="0"
+         id="stop3778" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3780" />
     </linearGradient>
-    <linearGradient id="linearGradient3377">
-      <stop style="stop-color:#0019a3;stop-opacity:1;" offset="0" id="stop3379"/>
-      <stop style="stop-color:#0069ff;stop-opacity:1;" offset="1" id="stop3381"/>
-    </linearGradient>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective5829"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" 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="#linearGradient3768" id="linearGradient3774" x1="1178.153" y1="1453.8708" x2="1105.0463" y2="1059.0945" gradientUnits="userSpaceOnUse"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3776" id="linearGradient3782" x1="33.052631" y1="73.676765" x2="23.483253" y2="19.131313" gradientUnits="userSpaceOnUse"/>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7.2080078" inkscape:cx="-40.143761" inkscape:cy="31.572323" inkscape:current-layer="g3360" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-bbox="false" inkscape:snap-nodes="true">
-    <inkscape:grid type="xygrid" id="grid2997" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="17.990838"
+     inkscape:cx="-4.9094178"
+     inkscape:cy="23.134328"
+     inkscape:current-layer="g3360-3"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="873"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
-  <metadata id="metadata5826">
+  <metadata
+     id="metadata5826">
     <rdf:RDF>
-      <cc:Work rdf:about="">
+      <cc:Work
+         rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
@@ -61,15 +162,57 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g3360" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png" inkscape:export-xdpi="3.2478156" inkscape:export-ydpi="3.2478156" transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <rect style="color:#000000;fill:none;stroke:#280000;stroke-width:58.48538971;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-36" width="270.49493" height="241.25221" x="914.96875" y="1168.7546"/>
-      <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:#280000;stroke-width:7.86527967;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-7" 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.6396543,0,0,7.2375671,925.64233,920.63035)"/>
-      <rect style="color:#000000;fill:none;stroke:url(#linearGradient3774);stroke-width:29.24269462999999900;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="270.49493" height="241.25221" x="914.96875" y="1168.7546"/>
-      <path sodipodi:type="arc" style="color:#000000;fill:none;stroke:url(#linearGradient3782);stroke-width:3.93264051000000010;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.6396539,0,0,7.237567,925.64233,920.63035)"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 1024.6288,1285.7254 -73.10668,0 36.55337,-58.4854 z" id="path3012" inkscape:connector-curvature="0"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 951.52212,1314.968 73.10668,0 -36.55331,58.4854 z" id="path3014" inkscape:connector-curvature="0"/>
-      <path style="fill:#ffffff;stroke:#2e3436;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 1173.2557,1098.7783 -63.3122,36.5534 2.4134,-68.9265 z" id="path3012-5" inkscape:connector-curvature="0"/>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g3360"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
+       inkscape:export-xdpi="3.2478156"
+       inkscape:export-ydpi="3.2478156"
+       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+      <g
+         id="g3360-3"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
+         inkscape:export-xdpi="3.2478156"
+         inkscape:export-ydpi="3.2478156"
+         transform="translate(-2.96179e-7,2.9614273e-6)">
+        <rect
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:43.86403656000000240;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-36"
+           width="277.8056"
+           height="248.5629"
+           x="907.65808"
+           y="1168.7546" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:none;stroke:#a40000;stroke-width:5.89896058999999973;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-7"
+           sodipodi:cx="30.181818"
+           sodipodi:cy="33.272728"
+           sodipodi:rx="18.181818"
+           sodipodi:ry="18.181818"
+           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+           transform="matrix(7.6396543,0,0,7.2375671,932.95299,913.31967)" />
+        <rect
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:14.62134743000000014;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.5629"
+           x="907.65808"
+           y="1168.7546" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:1.96632027999999992;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 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
+           transform="matrix(7.6396539,0,0,7.237567,932.95301,913.31967)" />
+      </g>
     </g>
   </g>
 </svg>