diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Concentric.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Concentric.svg
index 3b08248dc5..0333e223b9 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Concentric.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Concentric.svg
@@ -14,10 +14,22 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_PointOnArc.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Concentric.svg">
   <defs
      id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3902">
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="0"
+         id="stop3904" />
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="1"
+         id="stop3906" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3602">
       <stop
@@ -398,14 +410,6 @@
          offset="1"
          id="stop3606-1-8" />
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter8482">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0126406"
-         id="feGaussianBlur8484" />
-    </filter>
     <inkscape:perspective
        id="perspective8519"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -463,6 +467,15 @@
          stdDeviation="1.1126875"
          id="feGaussianBlur8657" />
     </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3902"
+       id="linearGradient3908"
+       x1="35.599998"
+       y1="60.799999"
+       x2="28.4"
+       y2="2"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -471,18 +484,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="60.909282"
-     inkscape:cy="14.52597"
+     inkscape:zoom="1.4899542"
+     inkscape:cx="22.114385"
+     inkscape:cy="20.775187"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="800"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3058"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -491,7 +514,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -500,19 +523,64 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.58999999;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.05088496;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8655);enable-background:accumulate"
-       d="m 35.25,5.96875 c -16.17099,0 -29.28125,13.11026 -29.28125,29.28125 0,16.17099 13.11026,29.28125 29.28125,29.28125 16.17099,0 29.28125,-13.11026 29.28125,-29.28125 C 64.53125,19.07901 51.42099,5.96875 35.25,5.96875 z m 0,7.96875 c 11.768812,0 21.3125,9.543688 21.3125,21.3125 0,11.768812 -9.543688,21.3125 -21.3125,21.3125 -11.768812,0 -21.3125,-9.543688 -21.3125,-21.3125 0,-11.768812 9.543688,-21.3125 21.3125,-21.3125 z m 0,6.78125 c -8.033632,0 -14.53125,6.497618 -14.53125,14.53125 0,8.033632 6.497618,14.5625 14.53125,14.5625 8.033632,0 14.5625,-6.528868 14.5625,-14.5625 0,-8.033632 -6.528868,-14.53125 -14.5625,-14.53125 z m 0,6.75 c 4.298451,0 7.78125,3.482799 7.78125,7.78125 0,4.298451 -3.482799,7.78125 -7.78125,7.78125 -4.298451,0 -7.78125,-3.482799 -7.78125,-7.78125 0,-4.298451 3.482799,-7.78125 7.78125,-7.78125 z"
-       id="path8507-6"
-       transform="matrix(0.93885161,0,0,0.93885161,0.10927569,0.11883012)" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:9.23076916;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.86666667,0,0,0.86666667,4.266667,4.2666666)" />
     <path
-       style="color:#000000;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.92547667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 30.240545,2.9060458 c -15.18216,0 -27.4907492,12.3085892 -27.4907492,27.4907492 0,15.18216 12.3085892,27.490748 27.4907492,27.490748 15.18216,0 27.490748,-12.308588 27.490748,-27.490748 0,-15.18216 -12.308588,-27.4907492 -27.490748,-27.4907492 z m 0,7.4814742 c 11.049168,0 20.009275,8.960106 20.009275,20.009275 0,11.049168 -8.960107,20.009275 -20.009275,20.009275 -11.049169,0 -20.009275,-8.960107 -20.009275,-20.009275 0,-11.049169 8.960106,-20.009275 20.009275,-20.009275 z"
-       id="path8507" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:4.61538458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060-3"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.86666667,0,0,0.86666667,4.266667,4.2666666)" />
     <path
-       style="color:#000000;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.92547667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 30.240545,16.754107 c -7.542389,0 -13.642688,6.100299 -13.642688,13.642688 0,7.542388 6.100299,13.672026 13.642688,13.672026 7.542388,0 13.672026,-6.129638 13.672026,-13.672026 0,-7.542389 -6.129638,-13.642688 -13.672026,-13.642688 z m 0,6.337248 c 4.035607,0 7.305439,3.269832 7.305439,7.30544 0,4.035607 -3.269832,7.305439 -7.305439,7.305439 -4.035608,0 -7.30544,-3.269832 -7.30544,-7.305439 0,-4.035608 3.269832,-7.30544 7.30544,-7.30544 z"
-       id="path8507-8-8" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.22222209;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060-3-7"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.9,0,0,0.9,3.2,3.1999999)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:19.99999809;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060-0"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.40000002,0,0,0.40000001,19.2,19.2)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:9.99999905;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060-3-76"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.40000002,0,0,0.4,19.2,19.2)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:4.61538458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060-3-7-0"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.43333334,0,0,0.43333333,18.133333,18.133334)" />
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Axis_Angle.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Axis_Angle.svg
index 4a6bbb9dfd..b902ad6953 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Axis_Angle.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Axis_Angle.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Constraint_Ellipse_Axis_Angle_2.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Ellipse_Axis_Angle.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -249,18 +249,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="1.6285932"
+     inkscape:cx="-1.4846304"
+     inkscape:cy="-3.089705"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="800"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3023"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -269,7 +279,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -278,28 +288,95 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.11680126;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 36.249151,31.088221 -3.211991,2.855325 c 2.415194,1.70172 7.154457,6.313762 8.380752,9.202239 1.166362,2.747303 1.10917,9.703261 0.753743,12.491791 l 4.015088,0.07672 C 46.664099,52.153607 46.975671,44.880505 45.48603,41.37174 43.960443,37.77827 39.235857,33.228057 36.249151,31.088221 z"
-       id="path7694"
-       sodipodi:nodetypes="ccsccsc" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:5.45939016;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3874"
+       sodipodi:cx="17.593874"
+       sodipodi:cy="134.81316"
+       sodipodi:rx="28.797932"
+       sodipodi:ry="28.797932"
+       d="m 37.957086,114.44994 a 28.797932,28.797932 0 0 1 8.429825,19.8323"
+       transform="matrix(1.4653651,0,0,1.4653651,-19.781449,-139.35101)"
+       sodipodi:start="5.4977871"
+       sodipodi:end="6.2647485"
+       sodipodi:open="true" />
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 2.155846,1.893604 4.673485,4.230758 5.78125,5.75 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-11.752658 9.528592,-21.28125 21.28125,-21.28125 z"
-       id="rect7798-0"
+       style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,58 6,58 58,6"
+       id="path3068"
        inkscape:connector-curvature="0"
-       transform="matrix(0.78445012,-0.1249655,-0.24781384,0.77143027,16.702206,9.2798028)"
-       sodipodi:nodetypes="ssssssccssss" />
+       sodipodi:nodetypes="ccc" />
     <path
+       style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,58 6,58 58,6"
+       id="path3068-7"
        inkscape:connector-curvature="0"
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.70799148;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 7.7823909,61.224347 C 11.430107,61.160109 60.225862,61.033618 60.225862,61.033618 L 60.262376,55.783529 9.6187253,56.302842 60.404832,8.657558 57.909985,2.9957233 c 0,0 -50.2471707,47.0495917 -52.4030534,50.1519137 -2.1558819,3.102323 -1.4091904,8.141599 2.2754593,8.07671 z"
-       id="path7596"
-       sodipodi:nodetypes="zccccczz" />
+       sodipodi:nodetypes="ccc" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.59598494;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 40.575757,7.26311 C 28.118138,9.2476501 14.819329,20.79605 10.883871,33.046905 6.9484125,45.29776 13.861977,53.62626 26.319599,51.641722 38.777217,49.657181 52.076025,38.108783 56.011483,25.857926 59.946941,13.607071 53.033378,5.2785706 40.575757,7.26311 z m -1.855563,5.776265 C 47.939567,11.570697 53.050202,17.72728 50.13773,26.793634 47.22526,35.859991 37.394533,44.396781 28.175162,45.865455 18.955787,47.334135 13.845153,41.177552 16.757624,32.111198 19.670095,23.04484 29.50082,14.508051 38.720194,13.039375 z"
-       id="path7752"
-       inkscape:connector-curvature="0" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:2.72969508;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3874-3"
+       sodipodi:cx="17.593874"
+       sodipodi:cy="134.81316"
+       sodipodi:rx="28.797932"
+       sodipodi:ry="28.797932"
+       d="m 37.957086,114.44994 a 28.797932,28.797932 0 0 1 8.426307,19.66719"
+       transform="matrix(1.4653651,0,0,1.4653651,-19.781449,-139.35101)"
+       sodipodi:start="5.4977871"
+       sodipodi:end="6.2590135"
+       sodipodi:open="true" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 58.299779,57.10253 -52.7736777,0 L 57.526101,5.102533"
+       id="path3068-7-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:1.36484754;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3874-3-5"
+       sodipodi:cx="17.593874"
+       sodipodi:cy="134.81316"
+       sodipodi:rx="28.797932"
+       sodipodi:ry="28.797932"
+       d="m 37.957086,114.44994 a 28.797932,28.797932 0 0 1 8.43472,20.36322"
+       transform="matrix(1.4653651,0,0,1.4653651,-18.980933,-140.55049)"
+       sodipodi:start="5.4977871"
+       sodipodi:end="6.2831853"
+       sodipodi:open="true" />
+    <g
+       id="g3063"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,48.727922,-27.154329)">
+      <path
+         transform="matrix(0.94545455,0,0,0.94117647,-79.672727,0.82352941)"
+         d="M 61,31 C 61,40.388841 48.687831,48 33.5,48 18.312169,48 6,40.388841 6,31 6,21.611159 18.312169,14 33.5,14 48.687831,14 61,21.611159 61,31 z"
+         sodipodi:ry="17"
+         sodipodi:rx="27.5"
+         sodipodi:cy="31"
+         sodipodi:cx="33.5"
+         id="path3025"
+         style="fill:none;stroke:#280000;stroke-width:8.48074722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.94545455,0,0,0.94117647,-79.672727,0.82352933)"
+         d="M 61,31 C 61,40.388841 48.687831,48 33.5,48 18.312169,48 6,40.388841 6,31 6,21.611159 18.312169,14 33.5,14 48.687831,14 61,21.611159 61,31 z"
+         sodipodi:ry="17"
+         sodipodi:rx="27.5"
+         sodipodi:cy="31"
+         sodipodi:cx="33.5"
+         id="path3025-3"
+         style="fill:none;stroke:#cc0000;stroke-width:4.24037361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.98181818,0,0,1,-80.890909,-1.0000001)"
+         d="M 61,31 C 61,40.388841 48.687831,48 33.5,48 18.312169,48 6,40.388841 6,31 6,21.611159 18.312169,14 33.5,14 48.687831,14 61,21.611159 61,31 z"
+         sodipodi:ry="17"
+         sodipodi:rx="27.5"
+         sodipodi:cy="31"
+         sodipodi:cx="33.5"
+         id="path3025-3-6"
+         style="fill:none;stroke:#ef2929;stroke-width:2.01843357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Major_Radius.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Major_Radius.svg
index ebc40747d6..444064a2d5 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Major_Radius.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Major_Radius.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Constraint_Ellipse_Radii.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Ellipse_Major_Radius.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -249,18 +249,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.625"
-     inkscape:cx="14.086957"
-     inkscape:cy="32"
+     inkscape:zoom="3.2226987"
+     inkscape:cx="45.604266"
+     inkscape:cy="23.535217"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="800"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3022"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -269,7 +280,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -278,25 +289,50 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 l -15.625,14.78125 c -0.04225,0.03999 -0.02598,0.127036 0.03125,0.1875 l 5.375,5.6875 c 0.05723,0.06046 0.145252,0.07124 0.1875,0.03125 l 15.8125,-14.9375 c 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-11.752658 9.528592,-21.28125 21.28125,-21.28125 z"
-       id="rect7798-0"
-       inkscape:connector-curvature="0"
-       transform="matrix(0.91159808,-0.1398222,-0.28798086,0.86314283,12.139183,9.8981286)" />
-    <rect
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.86850429;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect7798"
-       width="5.491189"
-       height="27.168495"
-       x="41.950008"
-       y="-30.970327"
-       rx="0.10148261"
-       ry="0.11610209"
-       transform="matrix(0.6183025,0.78594021,-0.77781653,0.62849141,0,0)" />
-    <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.8198719;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 39.882288,7.6416786 C 25.40547,9.8621533 9.9511168,22.783501 5.3777791,36.490816 0.80444038,50.19813 8.8385936,59.516776 23.315413,57.296303 37.79223,55.075827 53.246583,42.154481 57.819922,28.447165 62.393259,14.739851 54.359107,5.4212045 39.882288,7.6416786 z m -2.156324,6.4629834 c 10.7137,-1.643283 16.652695,5.245233 13.268154,15.389454 C 47.609579,39.638339 36.185434,49.190037 25.471736,50.833318 14.758035,52.476602 8.8190406,45.588086 12.203582,35.443865 15.588122,25.299641 27.012265,15.747944 37.725964,14.104662 z"
-       id="path7752"
+       style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 31.973909,32.845958 18,-18"
+       id="path3037"
        inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:8.48074722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
+    <path
+       style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 31.973909,32.845958 18,-18"
+       id="path3037-3"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:4.24037361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.01843357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3-6"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.69425029,-0.69425029,0.70710678,0.70710678,-13.613718,33.773098)" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 31.155576,32.29303 49.642159,13.784337"
+       id="path3037-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Minor_Radius.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Minor_Radius.svg
index a5947cb53b..122df30c6f 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Minor_Radius.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Minor_Radius.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_Ellipse_Minor_Radius.svg">
   <defs
      id="defs2818">
@@ -249,18 +249,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.625"
-     inkscape:cx="14.086957"
-     inkscape:cy="32"
+     inkscape:zoom="7.992758"
+     inkscape:cx="32.630246"
+     inkscape:cy="36.967623"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     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="grid3039"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -278,26 +289,52 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 2.045927,1.483847 4.43426,3.574126 5.78125,5.75 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-2.938164 3.810882,-10.858133 4.887823,-13.404156 4.564351,5.272483 11.799799,12.093093 16.497503,16.526853 0.962807,-0.962808 3.982642,-4.067633 5.114818,-4.832538 C 33.175915,26.227773 28.888797,21.454696 23.860444,15.865693 26.406467,14.788752 31.350101,13.73465 34.288266,13.73465 z"
-       id="rect7798-0"
+       style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 31.973909,32.845958 -11,-11"
+       id="path3037"
        inkscape:connector-curvature="0"
-       transform="matrix(0.91159808,-0.1398222,-0.28798086,0.86314283,12.139183,9.8981286)"
-       sodipodi:nodetypes="ssssssccsssccccs" />
-    <rect
-       transform="matrix(0.79585521,-0.60548698,0.61580618,0.78789768,0,0)"
-       ry="0.11610209"
-       rx="0.10148261"
-       y="27.662737"
-       x="2.3411238"
-       height="18.406088"
-       width="6.1525884"
-       id="rect3022"
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.86850429;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       sodipodi:nodetypes="cc" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.8198719;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 39.882288,7.6416786 C 25.40547,9.8621533 9.9511168,22.783501 5.3777791,36.490816 0.80444038,50.19813 8.8385936,59.516776 23.315413,57.296303 37.79223,55.075827 53.246583,42.154481 57.819922,28.447165 62.393259,14.739851 54.359107,5.4212045 39.882288,7.6416786 z m -2.156324,6.4629834 c 10.7137,-1.643283 16.652695,5.245233 13.268154,15.389454 C 47.609579,39.638339 36.185434,49.190037 25.471736,50.833318 14.758035,52.476602 8.8190406,45.588086 12.203582,35.443865 15.588122,25.299641 27.012265,15.747944 37.725964,14.104662 z"
-       id="path7752"
-       inkscape:connector-curvature="0" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:8.48074722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
+    <path
+       style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 31.973909,32.845958 -11,-11"
+       id="path3037-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:4.24037361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.01843357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3-6"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.69425029,-0.69425029,0.70710678,0.70710678,-13.613718,33.773098)" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 32.770125,32.182445 -12,-12"
+       id="path3037-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Radii.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Radii.svg
index 9a94b57436..e00115776a 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Radii.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Radii.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_Ellipse_Radii.svg">
   <defs
      id="defs2818">
@@ -249,18 +249,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.625"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="5.6517334"
+     inkscape:cx="-32.278845"
+     inkscape:cy="24.487225"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     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="grid3051"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -278,35 +289,68 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 l -15.625,14.78125 c -0.04225,0.03999 -0.02598,0.127036 0.03125,0.1875 l 5.375,5.6875 c 0.05723,0.06046 0.145252,0.07124 0.1875,0.03125 l 15.8125,-14.9375 c 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-11.752658 9.528592,-21.28125 21.28125,-21.28125 z"
-       id="rect7798-0"
+       style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 31.973902,32.845958 -11,-11"
+       id="path3037-36"
        inkscape:connector-curvature="0"
-       transform="matrix(0.91159808,-0.1398222,-0.28798086,0.86314283,12.139183,9.8981286)" />
-    <rect
-       transform="matrix(0.79585521,-0.60548698,0.61580618,0.78789768,0,0)"
-       ry="0.11610209"
-       rx="0.10148261"
-       y="27.662737"
-       x="2.3411238"
-       height="18.406088"
-       width="6.1525884"
-       id="rect3022"
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.86850429;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.86850429;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect7798"
-       width="5.491189"
-       height="27.168495"
-       x="41.950008"
-       y="-30.970327"
-       rx="0.10148261"
-       ry="0.11610209"
-       transform="matrix(0.6183025,0.78594021,-0.77781653,0.62849141,0,0)" />
+       sodipodi:nodetypes="cc" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.8198719;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 39.882288,7.6416786 C 25.40547,9.8621533 9.9511168,22.783501 5.3777791,36.490816 0.80444038,50.19813 8.8385936,59.516776 23.315413,57.296303 37.79223,55.075827 53.246583,42.154481 57.819922,28.447165 62.393259,14.739851 54.359107,5.4212045 39.882288,7.6416786 z m -2.156324,6.4629834 c 10.7137,-1.643283 16.652695,5.245233 13.268154,15.389454 C 47.609579,39.638339 36.185434,49.190037 25.471736,50.833318 14.758035,52.476602 8.8190406,45.588086 12.203582,35.443865 15.588122,25.299641 27.012265,15.747944 37.725964,14.104662 z"
-       id="path7752"
+       style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 31.973902,32.845958 18,-18"
+       id="path3037"
        inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:8.48074722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462908,34.201144)" />
+    <path
+       style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 31.973902,32.845958 18,-18"
+       id="path3037-3"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:4.24037361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462908,34.201144)" />
+    <path
+       style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 31.973902,32.845958 -11,-11"
+       id="path3037-3-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.01843357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3-6"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.69425029,-0.69425029,0.70710678,0.70710678,-13.613718,33.773098)" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 32.015723,31.385959 49.642152,13.784337"
+       id="path3037-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 31.972996,31.408062 20.770118,20.182445"
+       id="path3037-3-6-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_EqualLength.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_EqualLength.svg
index 37711708ef..b4dce74a00 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_EqualLength.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_EqualLength.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_LineLength.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_EqualLength.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -289,14 +289,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter8219">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0168915"
-         id="feGaussianBlur8221" />
-    </filter>
     <inkscape:perspective
        id="perspective8233"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -318,14 +310,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter8294">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.75257812"
-         id="feGaussianBlur8296" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -334,18 +318,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="38.057041"
-     inkscape:cy="16.03577"
+     inkscape:zoom="3.4244234"
+     inkscape:cx="1.4967823"
+     inkscape:cy="64.566978"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3035"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -354,7 +346,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -362,29 +354,41 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.64629388;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8294);enable-background:accumulate"
-       d="m 15.373764,14.948539 c -0.08746,0 -0.15625,0.03638 -0.15625,0.09375 l 0,12.875 c 0,0.05737 0.06879,0.09375 0.15625,0.09375 l 37.84375,0 c 0.08746,0 0.15625,-0.03638 0.15625,-0.09375 l 0,-12.875 c 0,-0.05737 -0.06879,-0.09375 -0.15625,-0.09375 l -37.84375,0 z m 0,28 c -0.08746,0 -0.15625,0.03638 -0.15625,0.09375 l 0,12.875 c 0,0.05737 0.06879,0.09375 0.15625,0.09375 l 37.84375,0 c 0.08746,0 0.15625,-0.03638 0.15625,-0.09375 l 0,-12.875 c 0,-0.05737 -0.06879,-0.09375 -0.15625,-0.09375 l -37.84375,0 z"
-       id="rect8223-2" />
     <rect
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.64629388;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect8223"
-       width="38.183765"
-       height="13.081475"
-       x="12.727922"
-       y="10.966991"
-       rx="0.1578715"
-       ry="0.10354951" />
+       width="38"
+       height="12"
+       x="13"
+       y="15"
+       rx="0"
+       ry="0" />
     <rect
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.64629388;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect8223-7"
-       width="38.183765"
-       height="13.081475"
-       x="12.727922"
-       y="38.966995"
-       rx="0.1578715"
-       ry="0.10354951" />
+       style="color:#000000;fill:none;stroke:#ef2929;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect8223-3"
+       width="34"
+       height="8"
+       x="15"
+       y="17"
+       rx="0"
+       ry="0" />
+    <rect
+       style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:1.99999988000000006;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect8223-5"
+       width="38"
+       height="12"
+       x="13"
+       y="37"
+       rx="0"
+       ry="0" />
+    <rect
+       style="color:#000000;fill:none;stroke:#ef2929;stroke-width:1.99999988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect8223-3-3"
+       width="34"
+       height="8"
+       x="15"
+       y="39"
+       rx="0"
+       ry="0" />
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_ExternalAngle.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_ExternalAngle.svg
index ae49a4df9b..1579031486 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_ExternalAngle.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_ExternalAngle.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_InternalAngle.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_ExternalAngle.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -212,14 +212,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter7748">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0302126"
-         id="feGaussianBlur7750" />
-    </filter>
     <inkscape:perspective
        id="perspective2858"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -257,9 +249,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="13.348479"
-     inkscape:cy="30.388888"
+     inkscape:zoom="4.625"
+     inkscape:cx="-3.2229298"
+     inkscape:cy="13.241445"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -267,8 +259,17 @@
      inkscape:window-width="1280"
      inkscape:window-height="758"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3041"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -277,7 +278,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -286,19 +287,61 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70294045999999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter3695);opacity:0.59"
-       d="m 27.585389,12.742929 c -12.300591,0 -22.25,9.949409 -22.25,22.25 0,12.300592 9.949409,22.28125 22.25,22.28125 7.267072,0 13.716093,-3.484681 17.78125,-8.875 7.642407,3.706108 16.46875,8 16.46875,8 l 0,-7.125 -28.90625,-14 28.90625,-14 0,-7.34375 c 0,0 -8.783493,4.242798 -16.34375,7.875 -4.050665,-5.497031 -10.548957,-9.0625 -17.90625,-9.0625 z m 0,5.71875 c 5.072731,0 9.643258,2.25989 12.6875,5.84375 -7.88447,3.790059 -15.077622,7.239897 -16.5625,7.96875 -3.418041,1.67775 -3.514087,3.88024 -0.1875,5.53125 1.426667,0.708065 8.684771,4.224914 16.59375,8.0625 -3.041044,3.489863 -7.543059,5.6875 -12.53125,5.6875 -9.146899,0 -16.5625,-7.4156 -16.5625,-16.5625 0,-9.146899 7.415601,-16.53125 16.5625,-16.53125 z"
-       id="path2848-9" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:9.97334862;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="m 57.980762,47 a 30,30 0 1 1 0,-30.000001"
+       transform="matrix(0.80213781,0,0,0.80213781,4.33159,6.3957244)"
+       sodipodi:start="0.52359878"
+       sodipodi:end="5.7595865"
+       sodipodi:open="true" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.70294046;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 25.004727,8.935249 c -12.300591,0 -22.2636163,9.963025 -22.2636163,22.263616 0,12.300592 9.9630253,22.291942 22.2636163,22.291942 8.707032,0 16.252677,-5.005307 19.912624,-12.293142 l -5.126863,-2.492619 c -2.738671,5.380106 -8.338557,9.064068 -14.785761,9.064068 -9.146899,0 -16.5702488,-7.423349 -16.5702488,-16.570249 0,-9.146899 7.4233498,-16.541923 16.5702488,-16.541923 6.333112,0 11.85538,3.535387 14.644134,8.75249 L 44.7474,20.916813 C 41.034634,13.79535 33.595402,8.935249 25.004727,8.935249 z"
-       id="path2848" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:4.99959469;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060-3"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="m 57.980762,47 a 30,30 0 1 1 0,-30.000001"
+       transform="matrix(0.80006489,0,0,0.80006489,4.46011,6.5242457)"
+       sodipodi:start="0.52359878"
+       sodipodi:end="5.7595865"
+       sodipodi:open="true" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.70294046;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 20.930604,34.007784 c 3.293241,1.634459 38.315558,18.60406 38.315558,18.60406 l 0,-7.124221 -28.911863,-14.01218 28.911863,-14.012182 0,-7.324135 c 0,0 -34.70886,16.661938 -38.126902,18.339686 -3.418041,1.67775 -3.515243,3.877962 -0.188656,5.528972 z"
-       id="path7596"
-       sodipodi:nodetypes="cccccczz" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.39999986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060-3-7"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="m 57.980762,47 a 30,30 0 1 1 0,-30.000001"
+       transform="matrix(0.83333334,0,0,0.83333333,3.39357,5.4577088)"
+       sodipodi:start="0.52359878"
+       sodipodi:end="5.7595865"
+       sodipodi:open="true" />
+    <path
+       style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,16 30.06024,32.124375 58,46"
+       id="path3064"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,16 30.06024,32.124375 58,46"
+       id="path3064-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,15 29.96024,30.924375 58.540541,45.175676"
+       id="path3064-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Horizontal.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Horizontal.svg
index 5fed847668..488aaef0ab 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Horizontal.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Horizontal.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_PointOnLine.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Horizontal.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -179,18 +179,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter5705"
-       x="-0.026442636"
-       width="1.0528853"
-       y="-0.1534773"
-       height="1.3069546">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.60904607"
-         id="feGaussianBlur5707" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -199,18 +187,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890872"
-     inkscape:cx="24.347885"
-     inkscape:cy="28.552115"
+     inkscape:zoom="3.5928376"
+     inkscape:cx="-6.5442257"
+     inkscape:cy="80.367938"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3013"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -219,7 +217,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -228,26 +226,24 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19132471;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5705);enable-background:accumulate"
-       id="rect3770-3"
-       width="55.271896"
-       height="9.484437"
-       x="6.934855"
-       y="30.505665"
-       rx="0.15028238"
-       ry="0.10500604"
-       transform="matrix(0.99999974,7.1888592e-4,-7.1888592e-4,0.99999974,0,0)" />
-    <rect
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2.00000023999999987;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="rect3770"
-       width="55.271896"
-       height="9.484437"
-       x="4.5278773"
-       y="27.329168"
-       rx="0.15028238"
-       ry="0.10500604"
-       transform="matrix(0.99999974,7.1888592e-4,-7.1888592e-4,0.99999974,0,0)" />
+       width="57.992863"
+       height="9.9582825"
+       x="3.0265496"
+       y="26.997831"
+       rx="0"
+       ry="0"
+       transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)" />
+    <rect
+       style="color:#000000;fill:none;stroke:#ef2929;stroke-width:2.00000021000000006;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3770-3"
+       width="53.993343"
+       height="5.9749722"
+       x="5.0389857"
+       y="28.997681"
+       rx="0"
+       ry="0"
+       transform="matrix(0.99999989,4.636052e-4,-0.00111473,0.99999938,0,0)" />
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance.svg
index 09d7c022ff..0c2a069eec 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_HorizontalDistance.svg">
   <defs
      id="defs2818">
@@ -186,14 +186,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter3692">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.77667049"
-         id="feGaussianBlur3694" />
-    </filter>
     <filter
        inkscape:collect="always"
        id="filter3651">
@@ -210,18 +202,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890872"
-     inkscape:cx="38.180853"
-     inkscape:cy="20.314835"
+     inkscape:zoom="7.1604066"
+     inkscape:cx="34.982144"
+     inkscape:cy="26.600654"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="688"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -239,14 +239,16 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       id="path2845"
-       d="m 9.2298766,21.579936 c -0.080714,-1.77e-4 -0.1567867,0.137412 -0.1568273,0.309354 l 0,27.403601 c -4.05e-5,0.171941 0.076113,0.309177 0.1568273,0.309354 l 6.1631444,0.02578 0,-11.189297 c 3.2e-5,-0.118391 0.03042,-0.206358 0.0941,-0.206236 l 40.775434,0.07734 c 0.06368,1.22e-4 0.09413,0.08785 0.0941,0.206236 l 0,11.189298 6.163145,0.02578 c 0.08071,1.77e-4 0.156787,-0.137412 0.156827,-0.309354 l 0,-27.403601 c 4e-5,-0.171941 -0.07611,-0.309177 -0.156827,-0.309354 l -6.163145,-0.02578 0,11.189297 c -3.2e-5,0.118391 -0.03042,0.206358 -0.0941,0.206236 L 15.487121,33.00125 c -0.06368,-1.22e-4 -0.09413,-0.08784 -0.0941,-0.206236 l 0,-11.189298 -6.1631444,-0.02578 z"
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19099998;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3651);enable-background:accumulate" />
+       style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 3,17 8,0 0,12 42,0 0,-12 8,0 0,32 -8,0 0,-12 -42,0 0,12 -8,0 z"
+       id="path3018"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.191;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 5.4956671,18.018147 c -0.080714,-1.77e-4 -0.1567867,0.137412 -0.1568273,0.309354 l 0,27.403601 c -4.05e-5,0.171941 0.076113,0.309177 0.1568273,0.309354 l 6.1631449,0.02578 0,-11.189297 c 3.2e-5,-0.118391 0.03042,-0.206358 0.0941,-0.206236 l 40.775434,0.07734 c 0.06368,1.22e-4 0.09413,0.08785 0.0941,0.206236 l 0,11.189298 6.163145,0.02578 c 0.08071,1.77e-4 0.156787,-0.137412 0.156827,-0.309354 l 0,-27.403601 c 4e-5,-0.171941 -0.07611,-0.309177 -0.156827,-0.309354 l -6.163145,-0.02578 0,11.189297 c -3.2e-5,0.118391 -0.03042,0.206358 -0.0941,0.206236 l -40.775434,-0.07734 c -0.06368,-1.22e-4 -0.09413,-0.08784 -0.0941,-0.206236 l 0,-11.189298 -6.1631449,-0.02578 z"
-       id="rect3770"
-       sodipodi:nodetypes="ccccccccccccccccccccc" />
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5,19 4,0 0,12 46,0 0,-12 4,0 0,28 -4,0 0,-12 -46,0 0,12 -4,0 z"
+       id="path3018-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance_Driven.svg
index 43478c2273..7f6fe7c815 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance_Driven.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance_Driven.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Constraint_HorizontalDistance.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_HorizontalDistance_Driven.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -202,9 +202,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890872"
-     inkscape:cx="38.180853"
-     inkscape:cy="20.314835"
+     inkscape:zoom="11.214843"
+     inkscape:cx="34.946566"
+     inkscape:cy="37.539784"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -213,7 +213,15 @@
      inkscape:window-height="688"
      inkscape:window-x="10"
      inkscape:window-y="34"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3014"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -222,7 +230,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -231,14 +239,16 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       id="path2845"
-       d="m 9.2298766,21.579936 c -0.080714,-1.77e-4 -0.1567867,0.137412 -0.1568273,0.309354 l 0,27.403601 c -4.05e-5,0.171941 0.076113,0.309177 0.1568273,0.309354 l 6.1631444,0.02578 0,-11.189297 c 3.2e-5,-0.118391 0.03042,-0.206358 0.0941,-0.206236 l 40.775434,0.07734 c 0.06368,1.22e-4 0.09413,0.08785 0.0941,0.206236 l 0,11.189298 6.163145,0.02578 c 0.08071,1.77e-4 0.156787,-0.137412 0.156827,-0.309354 l 0,-27.403601 c 4e-5,-0.171941 -0.07611,-0.309177 -0.156827,-0.309354 l -6.163145,-0.02578 0,11.189297 c -3.2e-5,0.118391 -0.03042,0.206358 -0.0941,0.206236 L 15.487121,33.00125 c -0.06368,-1.22e-4 -0.09413,-0.08784 -0.0941,-0.206236 l 0,-11.189298 -6.1631444,-0.02578 z"
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19099998;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3651);enable-background:accumulate" />
+       style="fill:#3465a4;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 3,17 8,0 0,12 42,0 0,-12 8,0 0,32 -8,0 0,-12 -42,0 0,12 -8,0 z"
+       id="path3018"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       style="color:#000000;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000040;stroke-width:2.19099999999999984;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 5.4956671,18.018147 c -0.080714,-1.77e-4 -0.1567867,0.137412 -0.1568273,0.309354 l 0,27.403601 c -4.05e-5,0.171941 0.076113,0.309177 0.1568273,0.309354 l 6.1631449,0.02578 0,-11.189297 c 3.2e-5,-0.118391 0.03042,-0.206358 0.0941,-0.206236 l 40.775434,0.07734 c 0.06368,1.22e-4 0.09413,0.08785 0.0941,0.206236 l 0,11.189298 6.163145,0.02578 c 0.08071,1.77e-4 0.156787,-0.137412 0.156827,-0.309354 l 0,-27.403601 c 4e-5,-0.171941 -0.07611,-0.309177 -0.156827,-0.309354 l -6.163145,-0.02578 0,11.189297 c -3.2e-5,0.118391 -0.03042,0.206358 -0.0941,0.206236 l -40.775434,-0.07734 c -0.06368,-1.22e-4 -0.09413,-0.08784 -0.0941,-0.206236 l 0,-11.189298 -6.1631449,-0.02578 z"
-       id="rect3770"
-       sodipodi:nodetypes="ccccccccccccccccccccc" />
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5,19 4,0 0,12 46,0 0,-12 4,0 0,28 -4,0 0,-12 -46,0 0,12 -4,0 z"
+       id="path3018-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment.svg
index 2293626453..dc1bab00f2 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Constraint_Ellipse_Foci_Construction2.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_InternalAlignment.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -249,18 +249,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.625"
-     inkscape:cx="-5.3333329"
-     inkscape:cy="27.362319"
+     inkscape:zoom="7.992758"
+     inkscape:cx="31.570101"
+     inkscape:cy="42.374094"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="999"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3145"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -269,7 +277,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -278,46 +286,100 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 l 5.78125,5.75 c 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-11.752658 9.528592,-21.28125 21.28125,-21.28125 z"
-       id="rect7798-0"
-       inkscape:connector-curvature="0"
-       transform="matrix(0.91159808,-0.1398222,-0.28798086,0.86314283,12.139183,9.8981286)"
-       sodipodi:nodetypes="ssssssccssss" />
-    <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.8198719;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 39.882288,7.6416786 C 25.40547,9.8621533 9.9511168,22.783501 5.3777791,36.490816 0.80444038,50.19813 8.8385936,59.516776 23.315413,57.296303 37.79223,55.075827 53.246583,42.154481 57.819922,28.447165 62.393259,14.739851 54.359107,5.4212045 39.882288,7.6416786 z m -2.156324,6.4629834 c 10.7137,-1.643283 16.652695,5.245233 13.268154,15.389454 C 47.609579,39.638339 36.185434,49.190037 25.471736,50.833318 14.758035,52.476602 8.8190406,45.588086 12.203582,35.443865 15.588122,25.299641 27.012265,15.747944 37.725964,14.104662 z"
-       id="path7752"
-       inkscape:connector-curvature="0" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:8.48074722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
     <path
        sodipodi:type="arc"
-       style="fill:#2d2dff;fill-opacity:1;stroke:#000000;stroke-width:1.45507193;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3946"
-       sodipodi:cx="-18.956522"
-       sodipodi:cy="44.173912"
-       sodipodi:rx="3.652174"
-       sodipodi:ry="3.594203"
-       d="m -15.304348,44.173912 a 3.652174,3.594203 0 1 1 -7.304348,0 3.652174,3.594203 0 1 1 7.304348,0 z"
-       transform="matrix(1.3441542,0,0,1.3486391,47.957833,-19.149632)" />
+       style="fill:none;stroke:#cc0000;stroke-width:4.24037361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
     <path
-       transform="matrix(1.3441542,0,0,1.3486391,65.843723,-34.49246)"
-       d="m -15.304348,44.173912 a 3.652174,3.594203 0 1 1 -7.304348,0 3.652174,3.594203 0 1 1 7.304348,0 z"
-       sodipodi:ry="3.594203"
-       sodipodi:rx="3.652174"
-       sodipodi:cy="44.173912"
-       sodipodi:cx="-18.956522"
-       id="path3948"
-       style="fill:#2d2dff;fill-opacity:1;stroke:#000000;stroke-width:1.45507193;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       sodipodi:type="arc" />
-    <rect
-       style="color:#000000;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.23780823;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect7798-8"
-       width="6.0095048"
-       height="39.245464"
-       x="-0.58810377"
-       y="25.793777"
-       rx="0.093049049"
-       ry="0.055569716"
-       transform="matrix(0.74066623,-0.67187316,0.65496674,0.7556577,0,0)" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.01843357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3-6"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.69425029,-0.69425029,0.70710678,0.70710678,-13.613718,33.773098)" />
+    <path
+       style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 42.025653,43.999999 20,22"
+       id="path3037"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#3465a4;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 42.025653,43.999999 20.000001,22.000001"
+       id="path3037-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 42.605566,43.334535 20.7375,21.217991"
+       id="path3037-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g3095"
+       transform="translate(34,-7.9999989)">
+      <path
+         transform="matrix(0.76923079,0,0,0.66666677,0.69230818,18.333329)"
+         d="m -10,47.5 c 0,4.142136 -2.910149,7.5 -6.5,7.5 -3.589851,0 -6.5,-3.357864 -6.5,-7.5 0,-4.142136 2.910149,-7.5 6.5,-7.5 3.589851,0 6.5,3.357864 6.5,7.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="47.5"
+         sodipodi:cx="-16.5"
+         id="path3075"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2.79284787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.46153846,0,0,0.40000001,-4.3846154,30.999999)"
+         d="m -10,47.5 c 0,4.142136 -2.910149,7.5 -6.5,7.5 -3.589851,0 -6.5,-3.357864 -6.5,-7.5 0,-4.142136 2.910149,-7.5 6.5,-7.5 3.589851,0 6.5,3.357864 6.5,7.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="47.5"
+         sodipodi:cx="-16.5"
+         id="path3075-3"
+         style="fill:none;stroke:#729fcf;stroke-width:4.65474701;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3095-6"
+       transform="translate(52,-26)">
+      <path
+         transform="matrix(0.76923079,0,0,0.66666677,0.69230818,18.333329)"
+         d="m -10,47.5 c 0,4.142136 -2.910149,7.5 -6.5,7.5 -3.589851,0 -6.5,-3.357864 -6.5,-7.5 0,-4.142136 2.910149,-7.5 6.5,-7.5 3.589851,0 6.5,3.357864 6.5,7.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="47.5"
+         sodipodi:cx="-16.5"
+         id="path3075-7"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2.79284787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.46153846,0,0,0.40000001,-4.3846154,30.999999)"
+         d="m -10,47.5 c 0,4.142136 -2.910149,7.5 -6.5,7.5 -3.589851,0 -6.5,-3.357864 -6.5,-7.5 0,-4.142136 2.910149,-7.5 6.5,-7.5 3.589851,0 6.5,3.357864 6.5,7.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="47.5"
+         sodipodi:cx="-16.5"
+         id="path3075-3-5"
+         style="fill:none;stroke:#729fcf;stroke-width:4.65474701;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus1.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus1.svg
index dfe5601fa8..07086f17a7 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus1.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus1.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Constraint_InternalAlignment_Ellipse_MinorAxis.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_InternalAlignment_Ellipse_Focus2.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -233,14 +233,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter7861">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0930937"
-         id="feGaussianBlur7863" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -249,18 +241,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.625"
-     inkscape:cx="-5.3333329"
-     inkscape:cy="27.362319"
+     inkscape:zoom="14.813723"
+     inkscape:cx="32.698591"
+     inkscape:cy="36.656863"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="999"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3145"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -278,26 +278,58 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 l 5.78125,5.75 c 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-11.752658 9.528592,-21.28125 21.28125,-21.28125 z"
-       id="rect7798-0"
-       inkscape:connector-curvature="0"
-       transform="matrix(0.91159808,-0.1398222,-0.28798086,0.86314283,12.139183,9.8981286)"
-       sodipodi:nodetypes="ssssssccssss" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:8.48074722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.8198719;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 39.882288,7.6416786 C 25.40547,9.8621533 9.9511168,22.783501 5.3777791,36.490816 0.80444038,50.19813 8.8385936,59.516776 23.315413,57.296303 37.79223,55.075827 53.246583,42.154481 57.819922,28.447165 62.393259,14.739851 54.359107,5.4212045 39.882288,7.6416786 z m -2.156324,6.4629834 c 10.7137,-1.643283 16.652695,5.245233 13.268154,15.389454 C 47.609579,39.638339 36.185434,49.190037 25.471736,50.833318 14.758035,52.476602 8.8190406,45.588086 12.203582,35.443865 15.588122,25.299641 27.012265,15.747944 37.725964,14.104662 z"
-       id="path7752"
-       inkscape:connector-curvature="0" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:4.24037361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
     <path
-       transform="matrix(1.3441542,0,0,1.3486391,65.843723,-34.49246)"
-       d="m -15.304348,44.173912 a 3.652174,3.594203 0 1 1 -7.304348,0 3.652174,3.594203 0 1 1 7.304348,0 z"
-       sodipodi:ry="3.594203"
-       sodipodi:rx="3.652174"
-       sodipodi:cy="44.173912"
-       sodipodi:cx="-18.956522"
-       id="path3948"
-       style="fill:#2d2dff;fill-opacity:1;stroke:#000000;stroke-width:1.45507193;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       sodipodi:type="arc" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.01843357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3-6"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.69425029,-0.69425029,0.70710678,0.70710678,-13.613718,33.773098)" />
+    <g
+       id="g3095-6"
+       transform="translate(52,-26)">
+      <path
+         transform="matrix(0.76923079,0,0,0.66666677,0.69230818,18.333329)"
+         d="m -10,47.5 c 0,4.142136 -2.910149,7.5 -6.5,7.5 -3.589851,0 -6.5,-3.357864 -6.5,-7.5 0,-4.142136 2.910149,-7.5 6.5,-7.5 3.589851,0 6.5,3.357864 6.5,7.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="47.5"
+         sodipodi:cx="-16.5"
+         id="path3075-7"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2.79284787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.46153846,0,0,0.40000001,-4.3846154,30.999999)"
+         d="m -10,47.5 c 0,4.142136 -2.910149,7.5 -6.5,7.5 -3.589851,0 -6.5,-3.357864 -6.5,-7.5 0,-4.142136 2.910149,-7.5 6.5,-7.5 3.589851,0 6.5,3.357864 6.5,7.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="47.5"
+         sodipodi:cx="-16.5"
+         id="path3075-3-5"
+         style="fill:none;stroke:#729fcf;stroke-width:4.65474701;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus2.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus2.svg
index 244afae160..d9b4926e03 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus2.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus2.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Constraint_InternalAlignment_Ellipse_Focus1.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_InternalAlignment_Ellipse_MinorAxis.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -233,14 +233,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter7861">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0930937"
-         id="feGaussianBlur7863" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -249,18 +241,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.625"
-     inkscape:cx="-5.3333329"
-     inkscape:cy="27.362319"
+     inkscape:zoom="14.813723"
+     inkscape:cx="32.698591"
+     inkscape:cy="25.856067"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="999"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3145"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -278,26 +278,58 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 l 5.78125,5.75 c 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-11.752658 9.528592,-21.28125 21.28125,-21.28125 z"
-       id="rect7798-0"
-       inkscape:connector-curvature="0"
-       transform="matrix(0.91159808,-0.1398222,-0.28798086,0.86314283,12.139183,9.8981286)"
-       sodipodi:nodetypes="ssssssccssss" />
-    <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.8198719;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 39.882288,7.6416786 C 25.40547,9.8621533 9.9511168,22.783501 5.3777791,36.490816 0.80444038,50.19813 8.8385936,59.516776 23.315413,57.296303 37.79223,55.075827 53.246583,42.154481 57.819922,28.447165 62.393259,14.739851 54.359107,5.4212045 39.882288,7.6416786 z m -2.156324,6.4629834 c 10.7137,-1.643283 16.652695,5.245233 13.268154,15.389454 C 47.609579,39.638339 36.185434,49.190037 25.471736,50.833318 14.758035,52.476602 8.8190406,45.588086 12.203582,35.443865 15.588122,25.299641 27.012265,15.747944 37.725964,14.104662 z"
-       id="path7752"
-       inkscape:connector-curvature="0" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:8.48074722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
     <path
        sodipodi:type="arc"
-       style="fill:#2d2dff;fill-opacity:1;stroke:#000000;stroke-width:1.45507193;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3946"
-       sodipodi:cx="-18.956522"
-       sodipodi:cy="44.173912"
-       sodipodi:rx="3.652174"
-       sodipodi:ry="3.594203"
-       d="m -15.304348,44.173912 a 3.652174,3.594203 0 1 1 -7.304348,0 3.652174,3.594203 0 1 1 7.304348,0 z"
-       transform="matrix(1.3441542,0,0,1.3486391,47.957833,-19.149632)" />
+       style="fill:none;stroke:#cc0000;stroke-width:4.24037361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.01843357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3-6"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.69425029,-0.69425029,0.70710678,0.70710678,-13.613718,33.773098)" />
+    <g
+       id="g3095"
+       transform="translate(34,-7.9999989)">
+      <path
+         transform="matrix(0.76923079,0,0,0.66666677,0.69230818,18.333329)"
+         d="m -10,47.5 c 0,4.142136 -2.910149,7.5 -6.5,7.5 -3.589851,0 -6.5,-3.357864 -6.5,-7.5 0,-4.142136 2.910149,-7.5 6.5,-7.5 3.589851,0 6.5,3.357864 6.5,7.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="47.5"
+         sodipodi:cx="-16.5"
+         id="path3075"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2.79284787;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.46153846,0,0,0.40000001,-4.3846154,30.999999)"
+         d="m -10,47.5 c 0,4.142136 -2.910149,7.5 -6.5,7.5 -3.589851,0 -6.5,-3.357864 -6.5,-7.5 0,-4.142136 2.910149,-7.5 6.5,-7.5 3.589851,0 6.5,3.357864 6.5,7.5 z"
+         sodipodi:ry="7.5"
+         sodipodi:rx="6.5"
+         sodipodi:cy="47.5"
+         sodipodi:cx="-16.5"
+         id="path3075-3"
+         style="fill:none;stroke:#729fcf;stroke-width:4.65474701;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+         sodipodi:type="arc" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MajorAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MajorAxis.svg
index 372541c399..f6cb427c50 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MajorAxis.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MajorAxis.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Constraint_Ellipse_Both_Axis_Construction2.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_InternalAlignment_Ellipse_Focus1.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -233,14 +233,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter7861">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0930937"
-         id="feGaussianBlur7863" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -249,18 +241,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.625"
-     inkscape:cx="-5.3333329"
-     inkscape:cy="27.362319"
+     inkscape:zoom="5.237442"
+     inkscape:cx="-6.1812916"
+     inkscape:cy="32.309215"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="999"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3145"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -278,26 +278,52 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 l 5.78125,5.75 c 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-11.752658 9.528592,-21.28125 21.28125,-21.28125 z"
-       id="rect7798-0"
-       inkscape:connector-curvature="0"
-       transform="matrix(0.91159808,-0.1398222,-0.28798086,0.86314283,12.139183,9.8981286)"
-       sodipodi:nodetypes="ssssssccssss" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:8.48074722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.8198719;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 39.882288,7.6416786 C 25.40547,9.8621533 9.9511168,22.783501 5.3777791,36.490816 0.80444038,50.19813 8.8385936,59.516776 23.315413,57.296303 37.79223,55.075827 53.246583,42.154481 57.819922,28.447165 62.393259,14.739851 54.359107,5.4212045 39.882288,7.6416786 z m -2.156324,6.4629834 c 10.7137,-1.643283 16.652695,5.245233 13.268154,15.389454 C 47.609579,39.638339 36.185434,49.190037 25.471736,50.833318 14.758035,52.476602 8.8190406,45.588086 12.203582,35.443865 15.588122,25.299641 27.012265,15.747944 37.725964,14.104662 z"
-       id="path7752"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="color:#000000;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.76129401;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect7798"
-       width="6.1005993"
-       height="62.273891"
-       x="42.128986"
-       y="-35.550266"
-       rx="0.091526188"
-       ry="0.11438308"
-       transform="matrix(0.63352355,0.77372341,-0.76537855,0.64358036,0,0)" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:4.24037361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.01843357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3-6"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.69425029,-0.69425029,0.70710678,0.70710678,-13.613718,33.773098)" />
+    <path
+       style="fill:none;stroke:#0b1521;stroke-width:7.99999905;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 12,50 49.724955,14"
+       id="path3037"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#3465a4;stroke-width:3.99999952;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 12,50 49.724954,14.000002"
+       id="path3037-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:1.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 11.141118,48.947844 49.065922,13.205413"
+       id="path3037-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MinorAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MinorAxis.svg
index af6b9c8fa1..acd22b56c3 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MinorAxis.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MinorAxis.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_InternalAlignment.svg">
   <defs
      id="defs2818">
@@ -233,14 +233,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter7861">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0930937"
-         id="feGaussianBlur7863" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -249,18 +241,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.625"
-     inkscape:cx="-5.3333329"
-     inkscape:cy="27.362319"
+     inkscape:zoom="14.813723"
+     inkscape:cx="32.698591"
+     inkscape:cy="25.856067"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="999"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3145"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -278,26 +278,52 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 l 5.78125,5.75 c 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-11.752658 9.528592,-21.28125 21.28125,-21.28125 z"
-       id="rect7798-0"
-       inkscape:connector-curvature="0"
-       transform="matrix(0.91159808,-0.1398222,-0.28798086,0.86314283,12.139183,9.8981286)"
-       sodipodi:nodetypes="ssssssccssss" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:8.48074722;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.8198719;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 39.882288,7.6416786 C 25.40547,9.8621533 9.9511168,22.783501 5.3777791,36.490816 0.80444038,50.19813 8.8385936,59.516776 23.315413,57.296303 37.79223,55.075827 53.246583,42.154481 57.819922,28.447165 62.393259,14.739851 54.359107,5.4212045 39.882288,7.6416786 z m -2.156324,6.4629834 c 10.7137,-1.643283 16.652695,5.245233 13.268154,15.389454 C 47.609579,39.638339 36.185434,49.190037 25.471736,50.833318 14.758035,52.476602 8.8190406,45.588086 12.203582,35.443865 15.588122,25.299641 27.012265,15.747944 37.725964,14.104662 z"
-       id="path7752"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="color:#000000;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.23780823;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect7798-8"
-       width="6.0095048"
-       height="39.245464"
-       x="-0.58810377"
-       y="25.793777"
-       rx="0.093049049"
-       ry="0.055569716"
-       transform="matrix(0.74066623,-0.67187316,0.65496674,0.7556577,0,0)" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:4.24037361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.66853732,-0.66853732,0.66551226,0.66551226,-11.462903,34.201144)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.01843357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3025-3-6"
+       sodipodi:cx="33.5"
+       sodipodi:cy="31"
+       sodipodi:rx="27.5"
+       sodipodi:ry="17"
+       d="M 61,31 A 27.5,17 0 1 1 6,31 27.5,17 0 1 1 61,31 z"
+       transform="matrix(0.69425029,-0.69425029,0.70710678,0.70710678,-13.613718,33.773098)" />
+    <path
+       style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 42.025653,43.999999 20,22"
+       id="path3037"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#3465a4;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 42.025653,43.999999 20.000001,22.000001"
+       id="path3037-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 42.605566,43.334535 20.7375,21.217991"
+       id="path3037-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle.svg
index 7d78cca957..677525d842 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_InternalAngle.svg">
   <defs
      id="defs2818">
@@ -228,18 +228,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="47.112828"
-     inkscape:cy="30.388888"
+     inkscape:zoom="7.3906034"
+     inkscape:cx="32.800036"
+     inkscape:cy="42.951035"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3019"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -248,7 +257,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -257,20 +266,61 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.97040009;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7748);enable-background:accumulate"
-       d="m 58.670626,6.1675776 c 0,0 -44.039772,22.2580544 -48.375,24.5000004 -4.3352284,2.241947 -4.4379821,5.168785 -0.21875,7.375 4.17694,2.184101 48.59375,24.875 48.59375,24.875 l 0,-9.53125 -16.28125,-8.3125 c 1.138527,-3.135605 1.787364,-6.507214 1.8125,-10.03125 0.02691,-3.772407 -0.691139,-7.381435 -1.9375,-10.71875 l 16.40625,-8.375 0,-9.7812504 z M 36.701876,27.167578 c 0.838709,2.458011 1.300821,5.099918 1.28125,7.84375 -0.01802,2.525945 -0.445045,4.936818 -1.1875,7.21875 l -14.8125,-7.5625 14.71875,-7.5 z"
-       id="path7694-7"
-       transform="matrix(1.0011645,0,0,0.95025798,-0.03776807,1.2751141)" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:6.51681376;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3827"
+       sodipodi:cx="35.325661"
+       sodipodi:cy="31.325663"
+       sodipodi:rx="29.325663"
+       sodipodi:ry="29.325663"
+       d="m 62.557446,20.443367 a 29.325663,29.325663 0 0 1 -0.632945,23.23123"
+       transform="matrix(1.2275938,0,0,1.2275937,-37.365562,-7.803863)"
+       sodipodi:start="5.9030088"
+       sodipodi:end="6.7178392"
+       sodipodi:open="true" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.89726639;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 37.985931,15.315296 -5.475118,2.850774 c 2.124098,3.423877 3.348375,7.409763 3.316357,11.670356 -0.03045,4.052358 -1.180311,7.853623 -3.159926,11.135836 l 5.2874,3.088338 c 2.557545,-4.178385 4.059623,-9.018943 4.098517,-14.194479 0.03984,-5.300474 -1.45994,-10.272597 -4.06723,-14.550825 z"
-       id="path7694" />
+       style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,8 6,31 58,56"
+       id="path3021"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.16241693;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 7.8879306,32.73352 C 12.069734,34.80898 56.541549,56.35721 56.541549,56.35721 l 0,-9.046433 -36.712677,-17.792857 36.712677,-17.792859 0,-9.3002872 c 0,0 -44.073783,21.1575562 -48.4140588,23.2879832 -4.3402763,2.130429 -4.4637046,4.92429 -0.2395596,7.020763 z"
-       id="path7596"
-       sodipodi:nodetypes="cccccczz" />
+       style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,8 6,31 58,56"
+       id="path3021-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:3.25840693999999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.80000000000000071"
+       id="path3827-7"
+       sodipodi:cx="35.325661"
+       sodipodi:cy="31.325663"
+       sodipodi:rx="29.325663"
+       sodipodi:ry="29.325663"
+       d="m 62.557446,20.443367 a 29.325663,29.325663 0 0 1 -0.632945,23.23123"
+       transform="matrix(1.2275938,0,0,1.2275937,-37.365562,-7.803863)"
+       sodipodi:start="5.9030088"
+       sodipodi:end="6.7178392"
+       sodipodi:open="true" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,7 6,30 58,55"
+       id="path3021-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:1.62920344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3827-7-5"
+       sodipodi:cx="35.325661"
+       sodipodi:cy="31.325663"
+       sodipodi:rx="29.325663"
+       sodipodi:ry="29.325663"
+       d="M 62.315568,19.856601 A 29.325663,29.325663 0 0 1 62.18947,43.08705"
+       transform="matrix(1.2275938,0,0,1.2275937,-38.312148,-7.6702077)"
+       sodipodi:start="5.8813664"
+       sodipodi:end="6.6958604"
+       sodipodi:open="true" />
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle_Driven.svg
index 821578a688..d343ad1c95 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle_Driven.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle_Driven.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Constraint_InternalAngle.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_InternalAngle_Driven.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -228,9 +228,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="47.112828"
-     inkscape:cy="30.388888"
+     inkscape:zoom="6.0656504"
+     inkscape:cx="4.0201213"
+     inkscape:cy="34.711769"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -238,8 +238,16 @@
      inkscape:window-width="1280"
      inkscape:window-height="715"
      inkscape:window-x="10"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3019"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -248,7 +256,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -257,18 +265,61 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.97040009;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7748);enable-background:accumulate"
-       d="m 58.670626,6.1675776 c 0,0 -44.039772,22.2580544 -48.375,24.5000004 -4.3352284,2.241947 -4.4379821,5.168785 -0.21875,7.375 4.17694,2.184101 48.59375,24.875 48.59375,24.875 l 0,-9.53125 -16.28125,-8.3125 c 1.138527,-3.135605 1.787364,-6.507214 1.8125,-10.03125 0.02691,-3.772407 -0.691139,-7.381435 -1.9375,-10.71875 l 16.40625,-8.375 0,-9.7812504 z M 36.701876,27.167578 c 0.838709,2.458011 1.300821,5.099918 1.28125,7.84375 -0.01802,2.525945 -0.445045,4.936818 -1.1875,7.21875 l -14.8125,-7.5625 14.71875,-7.5 z"
-       id="path7694-7"
-       transform="matrix(1.0011645,0,0,0.95025798,-0.03776807,1.2751141)" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#0b1521;stroke-width:6.51681376;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3827"
+       sodipodi:cx="35.325661"
+       sodipodi:cy="31.325663"
+       sodipodi:rx="29.325663"
+       sodipodi:ry="29.325663"
+       d="m 62.557446,20.443367 a 29.325663,29.325663 0 0 1 -0.632945,23.23123"
+       transform="matrix(1.2275938,0,0,1.2275937,-37.365562,-7.803863)"
+       sodipodi:start="5.9030088"
+       sodipodi:end="6.7178392"
+       sodipodi:open="true" />
     <path
-       style="color:#000000;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000040;stroke-width:2.89726638999999997;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 37.985931,15.315296 -5.475118,2.850774 c 2.124098,3.423877 3.348375,7.409763 3.316357,11.670356 -0.03045,4.052358 -1.180311,7.853623 -3.159926,11.135836 l 5.2874,3.088338 c 2.557545,-4.178385 4.059623,-9.018943 4.098517,-14.194479 0.03984,-5.300474 -1.45994,-10.272597 -4.06723,-14.550825 z"
-       id="path7694" />
+       style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,8 6,31 58,56"
+       id="path3021"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
     <path
-       style="color:#000000;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000040;stroke-width:2.16241693000000001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 7.8879306,32.73352 C 12.069734,34.80898 56.541549,56.35721 56.541549,56.35721 l 0,-9.046433 -36.712677,-17.792857 36.712677,-17.792859 0,-9.3002872 c 0,0 -44.073783,21.1575562 -48.4140588,23.2879832 -4.3402763,2.130429 -4.4637046,4.92429 -0.2395596,7.020763 z"
-       id="path7596"
-       sodipodi:nodetypes="cccccczz" />
+       style="fill:none;stroke:#3465a4;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,8 6,31 58,56"
+       id="path3021-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#3465a4;stroke-width:3.25840688;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3827-7"
+       sodipodi:cx="35.325661"
+       sodipodi:cy="31.325663"
+       sodipodi:rx="29.325663"
+       sodipodi:ry="29.325663"
+       d="m 62.557446,20.443367 a 29.325663,29.325663 0 0 1 -0.632945,23.23123"
+       transform="matrix(1.2275938,0,0,1.2275937,-37.365562,-7.803863)"
+       sodipodi:start="5.9030088"
+       sodipodi:end="6.7178392"
+       sodipodi:open="true" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 58,7 6,30 58,55"
+       id="path3021-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#729fcf;stroke-width:1.62920344;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3827-7-5"
+       sodipodi:cx="35.325661"
+       sodipodi:cy="31.325663"
+       sodipodi:rx="29.325663"
+       sodipodi:ry="29.325663"
+       d="M 62.315568,19.856601 A 29.325663,29.325663 0 0 1 62.18947,43.08705"
+       transform="matrix(1.2275938,0,0,1.2275937,-38.312148,-7.670208)"
+       sodipodi:start="5.8813664"
+       sodipodi:end="6.6958604"
+       sodipodi:open="true" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length.svg
index d4d00bb346..7d45797ca0 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_Length.svg">
   <defs
      id="defs2818">
@@ -310,14 +310,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter3702">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.9454633"
-         id="feGaussianBlur3704" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -326,18 +318,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9999999"
-     inkscape:cx="39.803961"
-     inkscape:cy="31.381933"
+     inkscape:zoom="14.781206"
+     inkscape:cx="62.602454"
+     inkscape:cy="42.469478"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3032"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -354,16 +354,21 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.64629387999999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter3702);opacity:0.6"
-       d="M 61.312475,8.7935719 36.099709,14.905007 41.3814,20.44774 20.115401,40.712189 14.575014,34.897974 7.2768832,59.809458 32.489649,53.698023 l -4.807417,-5.045019 21.266,-20.264449 5.044554,5.293877 7.319689,-24.8888601 z"
-       id="rect2860-4" />
-    <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.64629388;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 59.019295,5.874689 c 0,0 -8.279255,2.287145 -12.481383,3.3057175 -4.202128,1.0185725 -12.731383,2.8057175 -12.731383,2.8057175 l 5.281691,5.542733 c 0,0 -6.588666,6.879816 -10.132999,10.257225 -3.544334,3.377408 -11.133,10.007224 -11.133,10.007224 L 12.281834,31.979091 4.9837031,56.890575 30.196469,50.77914 l -4.807417,-5.045019 21.266,-20.264449 5.044554,5.293877 7.319689,-24.88886 z"
-       id="rect2860"
-       sodipodi:nodetypes="czcczcccccccc" />
+    <g
+       id="g3894"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-16.79899,35.544156)">
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3034"
+         d="m 17,27 0,-8 -21,13 21,13 0,-8 40,0 0,8 21,-13 -21,-13 0,8 z"
+         style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3034-3"
+         d="M 15,29 15,22.6 -0.2,32 15,41.4 15,35 59,35 59,41.4 74.2,32 59,22.6 59,29 z"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length_Driven.svg
index 19a124c692..00d5ee39ed 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length_Driven.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length_Driven.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Constraint_Length.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Length_Driven.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -326,18 +326,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.9999999"
-     inkscape:cx="39.803961"
-     inkscape:cy="31.381933"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="10.430393"
+     inkscape:cx="-1.8114153"
+     inkscape:cy="14.942618"
+     inkscape:current-layer="g3894"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="715"
-     inkscape:window-x="41"
-     inkscape:window-y="33"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3032"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -346,7 +354,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -354,14 +362,21 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.64629387999999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter3702);opacity:0.6"
-       d="M 61.312475,8.7935719 36.099709,14.905007 41.3814,20.44774 20.115401,40.712189 14.575014,34.897974 7.2768832,59.809458 32.489649,53.698023 l -4.807417,-5.045019 21.266,-20.264449 5.044554,5.293877 7.319689,-24.8888601 z"
-       id="rect2860-4" />
-    <path
-       style="color:#000000;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000040;stroke-width:2.64629387999999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 59.019295,5.874689 c 0,0 -8.279255,2.287145 -12.481383,3.3057175 -4.202128,1.0185725 -12.731383,2.8057175 -12.731383,2.8057175 l 5.281691,5.542733 c 0,0 -6.588666,6.879816 -10.132999,10.257225 -3.544334,3.377408 -11.133,10.007224 -11.133,10.007224 L 12.281834,31.979091 4.9837031,56.890575 30.196469,50.77914 l -4.807417,-5.045019 21.266,-20.264449 5.044554,5.293877 7.319689,-24.88886 z"
-       id="rect2860"
-       sodipodi:nodetypes="czcczcccccccc" />
+    <g
+       id="g3894"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-16.79899,35.544156)">
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3034"
+         d="m 17,27 0,-8 -21,13 21,13 0,-8 40,0 0,8 21,-13 -21,-13 0,8 z"
+         style="fill:#3465a4;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3034-3"
+         d="M 15,29 15,22.6 -0.2,32 15,41.4 15,35 59,35 59,41.4 74.2,32 59,22.6 59,29 z"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Parallel.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Parallel.svg
index 37d12ebc41..73885fa8c7 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Parallel.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Parallel.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_ConcentricCircles.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Parallel.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -438,14 +438,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter8655">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.1126875"
-         id="feGaussianBlur8657" />
-    </filter>
     <inkscape:perspective
        id="perspective8690"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -483,9 +475,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="60.909282"
-     inkscape:cy="14.52597"
+     inkscape:zoom="6.5407377"
+     inkscape:cx="37.216362"
+     inkscape:cy="25.273833"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -493,8 +485,17 @@
      inkscape:window-width="1280"
      inkscape:window-height="758"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3060"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -503,7 +504,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -511,31 +512,53 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.92547666999999989;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter8751);opacity:0.6"
-       d="m 41.96875,6.34375 c -0.03331,0.00742 -0.06327,0.031142 -0.09375,0.0625 l -36.2187501,37.25 c -0.06096,0.06272 -0.072386,0.147516 -0.03125,0.1875 L 11.5625,49.625 c 0.04114,0.03998 0.12654,0.03147 0.1875,-0.03125 l 36.21875,-37.25 C 48.02971,12.281034 48.041136,12.196234 48,12.15625 L 42.0625,6.375 c -0.02057,-0.019992 -0.06044,-0.038666 -0.09375,-0.03125 z m 14.375,14.5 c -0.03331,0.0074 -0.06327,0.03114 -0.09375,0.0625 l -36.21875,37.25 c -0.06096,0.06272 -0.07239,0.147516 -0.03125,0.1875 l 5.9375,5.78125 c 0.04114,0.03998 0.12654,0.03147 0.1875,-0.03125 l 36.21875,-37.25 c 0.06096,-0.06272 0.07239,-0.147516 0.03125,-0.1875 L 56.4375,20.875 c -0.02057,-0.01999 -0.06044,-0.03867 -0.09375,-0.03125 z"
-       id="rect8680-7" />
-    <rect
-       style="color:#000000;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.92547667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect8680"
-       width="52.25"
-       height="8.5"
-       x="-26.519567"
-       y="29.777342"
-       rx="0.1578715"
-       ry="0.10354951"
-       transform="matrix(0.69700031,-0.71707082,0.71707082,0.69700031,0,0)" />
-    <rect
-       style="color:#000000;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.92547667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect8680-5"
-       width="52.25"
-       height="8.5"
-       x="-26.897715"
-       y="50.191738"
-       rx="0.1578715"
-       ry="0.10354951"
-       transform="matrix(0.69700031,-0.71707082,0.71707082,0.69700031,0,0)" />
+    <g
+       id="g3071"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-75.704682,72.98171)">
+      <rect
+         transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+         ry="0"
+         rx="0"
+         y="32.981819"
+         x="78.29081"
+         height="9.9110889"
+         width="53.740101"
+         id="rect3770"
+         style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2.00000024;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         transform="matrix(0.99999989,4.636052e-4,-0.00111473,0.99999938,0,0)"
+         ry="0"
+         rx="0"
+         y="35.020126"
+         x="80.300385"
+         height="5.9074855"
+         width="49.745319"
+         id="rect3770-3"
+         style="color:#000000;fill:none;stroke:#ef2929;stroke-width:2.00000024;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <g
+       id="g3071-2"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-62.735161,85.941123)">
+      <rect
+         transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+         ry="0"
+         rx="0"
+         y="33.032074"
+         x="78.283699"
+         height="9.8608322"
+         width="53.747211"
+         id="rect3770-9"
+         style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2.00000024;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         transform="matrix(0.99999989,4.636052e-4,-0.00111473,0.99999938,0,0)"
+         ry="0"
+         rx="0"
+         y="35.020126"
+         x="80.300385"
+         height="5.9074764"
+         width="49.745319"
+         id="rect3770-3-1"
+         style="color:#000000;fill:none;stroke:#ef2929;stroke-width:2.00000024;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Perpendicular.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Perpendicular.svg
index df64b8ecb1..cd17fc57b7 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Perpendicular.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Perpendicular.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_Parallel.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Perpendicular.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -459,14 +459,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter8751">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.0887561"
-         id="feGaussianBlur8753" />
-    </filter>
     <inkscape:perspective
        id="perspective8789"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -497,18 +489,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="59.820537"
-     inkscape:cy="14.955208"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="-34.524928"
+     inkscape:cy="43.628383"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="960"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3061"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -517,7 +517,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -526,14 +526,16 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.92547666999999989;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter8824);opacity:0.6"
-       d="M 29.15625,8.625 C 29.06879,8.625 29,8.66138 29,8.71875 l 0,41.15625 -19.84375,0 c -0.087461,0 -0.1562499,0.03638 -0.1562499,0.09375 l 0,10.3125 c 0,0.05737 0.068789,0.09375 0.1562499,0.09375 l 51.6875,0 C 60.93121,60.375 61,60.33862 61,60.28125 l 0,-10.3125 C 61,49.91138 60.93121,49.875 60.84375,49.875 l -20.09375,0 0,-41.15625 C 40.75,8.66138 40.68121,8.625 40.59375,8.625 l -11.4375,0 z"
-       id="rect8776-7" />
+       style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 3,57 0,-14 22,0 0,-36 14,0 0,36 22,0 0,14 z"
+       id="path3063"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
     <path
-       style="opacity:1;color:#000000;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.92547666999999989;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       d="M 25.65625 5.75 C 25.568789 5.75 25.5 5.7863836 25.5 5.84375 L 25.5 47 L 5.65625 47 C 5.5687892 47 5.5 47.036384 5.5 47.09375 L 5.5 57.40625 C 5.5 57.463616 5.5687892 57.5 5.65625 57.5 L 57.34375 57.5 C 57.431211 57.5 57.5 57.463616 57.5 57.40625 L 57.5 47.09375 C 57.5 47.036384 57.431211 47 57.34375 47 L 37.25 47 L 37.25 5.84375 C 37.25 5.7863836 37.181211 5.75 37.09375 5.75 L 25.65625 5.75 z "
-       id="rect8776" />
+       style="fill:#cc0000;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5,55 0,-10 22,0 0,-36 10,0 0,36 22,0 0,10 z"
+       id="path3063-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnEnd.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnEnd.svg
index fb4a8af29e..72fdbcd0c9 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnEnd.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnEnd.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_PointOnEnd.svg">
   <defs
      id="defs2818">
@@ -326,14 +326,6 @@
          offset="1"
          id="stop3606-96-2" />
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter3750">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.86509375"
-         id="feGaussianBlur3752" />
-    </filter>
     <inkscape:perspective
        id="perspective2881"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -377,18 +369,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="32.920088"
-     inkscape:cy="32.24459"
+     inkscape:zoom="11.313709"
+     inkscape:cx="28.339956"
+     inkscape:cy="32.563216"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3094"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -406,24 +407,40 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.57379127;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3683);enable-background:accumulate"
-       d="m 18.086418,13.380204 c -5.221601,0 -9.4687501,4.247149 -9.4687501,9.46875 0,5.221601 4.2471491,9.4375 9.4687501,9.4375 2.347789,0 4.471866,-0.864632 6.125,-2.28125 l 5.21875,7.5 2.1875,-8.0625 c 9.229792,3.992533 15.6875,13.147071 15.6875,23.84375 0,1.133743 -0.07809,2.248344 -0.21875,3.34375 l 9.25,0 c 0.103344,-1.097398 0.125,-2.219411 0.125,-3.34375 0,-14.914019 -9.290249,-27.674732 -22.40625,-32.78125 l 1.90625,-7.0625 -9.65625,4.75 c -1.625469,-2.861088 -4.692984,-4.8125 -8.21875,-4.8125 z"
-       id="path7752-1" />
+       style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 37,33 0,8 -11,-13 11,-13 0,8 c 14,0 24,10 24,26 L 51,49 C 51,41 47,33 37,33 z"
+       id="path3892"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.57379127;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 32.53125 9.1875 L 22.34375 14.1875 C 20.877392 14.000811 19.391769 13.875 17.875 13.875 C 15.413462 13.875 13.006515 14.143063 10.6875 14.625 L 10.6875 24.03125 C 12.968723 23.377149 15.383216 23.03125 17.875 23.03125 C 18.219486 23.03125 18.565018 23.049228 18.90625 23.0625 L 26 33.25 L 28.1875 25.1875 C 37.417292 29.180033 43.875 38.334571 43.875 49.03125 C 43.875 50.164993 43.796914 51.279594 43.65625 52.375 L 52.90625 52.375 C 53.009594 51.277602 53.03125 50.155589 53.03125 49.03125 C 53.03125 34.117231 43.741001 21.356518 30.625 16.25 L 32.53125 9.1875 z "
-       id="path7752" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#linearGradient2875);fill-opacity:1;stroke:#731200;stroke-width:2.5999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2826"
-       sodipodi:cx="14.363636"
-       sodipodi:cy="14.363636"
-       sodipodi:rx="9.454545"
-       sodipodi:ry="9.454545"
-       d="m 23.818181,14.363636 a 9.454545,9.454545 0 1 1 -18.90909,0 9.454545,9.454545 0 1 1 18.90909,0 z"
-       transform="translate(0.29237664,4.2067239)" />
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 35,20.5 28.6,28 35,35.5 35,31 c 9,-1 17,5 18,16 l 6,0 C 59,36 51,24 35,25 z"
+       id="path3918"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <g
+       id="g3813"
+       transform="translate(-50.999999,-1.0000001)">
+      <path
+         transform="translate(35,-1)"
+         d="m 43,31 c 0,6.627417 -5.372583,12 -12,12 -6.627417,0 -12,-5.372583 -12,-12 0,-6.627417 5.372583,-12 12,-12 6.627417,0 12,5.372583 12,12 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025"
+         style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.83333337,0,0,0.83333333,40.166665,4.1666669)"
+         d="m 43,31 c 0,6.627417 -5.372583,12 -12,12 -6.627417,0 -12,-5.372583 -12,-12 0,-6.627417 5.372583,-12 12,-12 6.627417,0 12,5.372583 12,12 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025-3"
+         style="fill:none;stroke:#ef2929;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnMidPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnMidPoint.svg
index bd900563cb..06d6091bfb 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnMidPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnMidPoint.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_PointOnMidPoint.svg">
   <defs
      id="defs2818">
@@ -222,9 +222,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.4999999"
-     inkscape:cx="15.621933"
-     inkscape:cy="29.339605"
+     inkscape:zoom="7.7781744"
+     inkscape:cx="1.5895565"
+     inkscape:cy="32.315773"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -232,8 +232,16 @@
      inkscape:window-width="1280"
      inkscape:window-height="758"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3019"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -250,26 +258,45 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19132471;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6327);enable-background:accumulate"
-       d="m 53.863637,9.1107949 c -0.03281,0.0046 -0.0633,0.03411 -0.09375,0.0625 l -15.6875,14.5937501 c -1.137418,-0.418249 -2.373731,-0.65625 -3.65625,-0.65625 -5.839542,0 -10.5625,4.722958 -10.5625,10.5625 0,1.029707 0.163007,2.027694 0.4375,2.96875 l -18.7187502,17.4375 c -0.060901,0.05677 -0.070916,0.144947 -0.03125,0.1875 l 6.3125002,6.78125 c 0.03967,0.04255 0.126599,0.02552 0.1875,-0.03125 l 18.71875,-17.4375 c 1.138878,0.419472 2.371767,0.6875 3.65625,0.6875 5.839542,0 10.5625,-4.754208 10.5625,-10.59375 0,-1.038558 -0.158441,-2.020547 -0.4375,-2.96875 l 15.6875,-14.59375 c 0.0609,-0.05677 0.07092,-0.144947 0.03125,-0.1875 l -6.3125,-6.7812501 c -0.01983,-0.02128 -0.06094,-0.03589 -0.09375,-0.03125 z"
-       id="rect3770-0" />
-    <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.97208858;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 60.436323,4.0011774 c 0,0 -7.15557,1.7149 -10.824264,2.4814409 -3.668694,0.7665409 -11.187901,2.1178045 -11.187901,2.1178045 l 4.7051,5.5765842 c 0,0 -9.88713,10.165543 -14.830696,14.975587 -4.943565,4.810044 -14.830695,13.884678 -14.830695,13.884678 L 8.9553733,37.69065 c 0,0 -2.2120047,7.406702 -3.4089161,11.110052 C 4.3495458,52.504053 1.7739047,59.910755 1.7739047,59.910755 L 23.786069,55.282763 18.970908,49.591197 48.6323,20.730932 53.254854,26.221281 60.436323,4.0011774 z"
-       id="rect3770"
-       sodipodi:nodetypes="czcczcczcccccc" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#linearGradient3608);fill-opacity:1;stroke:#731200;stroke-width:2.5999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2826"
-       sodipodi:cx="14.363636"
-       sodipodi:cy="14.363636"
-       sodipodi:rx="9.454545"
-       sodipodi:ry="9.454545"
-       d="m 23.818181,14.363636 a 9.454545,9.454545 0 1 1 -18.90909,0 9.454545,9.454545 0 1 1 18.90909,0 z"
-       transform="matrix(1.1183432,0,0,1.1183432,15.411829,14.985805)" />
+    <g
+       id="g3894"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-16.79899,35.544156)">
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3034"
+         d="m 17,27 0,-8 -21,13 21,13 0,-8 40,0 0,8 21,-13 -21,-13 0,8 z"
+         style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3034-3"
+         d="M 15,29 15,22.6 -0.2,32 15,41.4 15,35 59,35 59,41.4 74.2,32 59,22.6 59,29 z"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g3813"
+       transform="translate(-33.999999,1.9999999)">
+      <path
+         transform="translate(35,-1)"
+         d="m 43,31 c 0,6.627417 -5.372583,12 -12,12 -6.627417,0 -12,-5.372583 -12,-12 0,-6.627417 5.372583,-12 12,-12 6.627417,0 12,5.372583 12,12 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025"
+         style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.83333337,0,0,0.83333333,40.166665,4.1666669)"
+         d="m 43,31 c 0,6.627417 -5.372583,12 -12,12 -6.627417,0 -12,-5.372583 -12,-12 0,-6.627417 5.372583,-12 12,-12 6.627417,0 12,5.372583 12,12 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025-3"
+         style="fill:none;stroke:#ef2929;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnObject.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnObject.svg
index a0910aaebe..53e6c07909 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnObject.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnObject.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_EqualLength.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_PointOnObject.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -310,14 +310,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter8294">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.75257812"
-         id="feGaussianBlur8296" />
-    </filter>
     <inkscape:perspective
        id="perspective8346"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -431,18 +423,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="38.057041"
-     inkscape:cy="16.03577"
+     inkscape:zoom="11.313708"
+     inkscape:cx="10.80986"
+     inkscape:cy="37.220476"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="960"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3052"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -451,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:Work>
     </rdf:RDF>
   </metadata>
@@ -460,24 +462,67 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.06780338;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8482);enable-background:accumulate"
-       d="m 48.917262,8.0018127 c -7.16197,0 -13.833785,1.9634186 -19.59375,5.3437503 -1.324937,-0.706996 -2.830854,-1.09375 -4.4375,-1.09375 -5.221601,0 -9.46875,4.215899 -9.46875,9.4375 0,1.445981 0.357178,2.805797 0.9375,4.03125 -3.937627,6.066536 -6.25,13.28903 -6.25,21.0625 0,5.407174 1.094804,10.541217 3.09375,15.21875 l 9.25,0 c -2.579481,-4.479441 -4.0625,-9.677005 -4.0625,-15.21875 0,-5.822515 1.642033,-11.245921 4.46875,-15.875 0.654747,0.14345 1.333448,0.25 2.03125,0.25 5.221601,0 9.4375,-4.247149 9.4375,-9.46875 0,-0.555677 -0.06428,-1.095626 -0.15625,-1.625 4.377634,-2.424473 9.389977,-3.8125 14.75,-3.8125 4.963114,0 9.639094,1.18122 13.78125,3.28125 l 0,-9.03125 C 58.415341,8.8762025 53.770583,8.0018127 48.917262,8.0018127 z"
-       id="path8376-3" />
-    <path
-       style="color:#000000;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.06780338;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 44.556376,5.0625 c -21.430536,0 -38.8124997,17.350714 -38.8124997,38.78125 0,5.407174 1.0948048,10.541217 3.09375,15.21875 l 9.2499997,0 c -2.579481,-4.479441 -4.0625,-9.677005 -4.0625,-15.21875 0,-16.865868 13.665382,-30.53125 30.53125,-30.53125 4.963114,0 9.639094,1.18122 13.78125,3.28125 l 0,-9.03125 c -4.283171,-1.6256102 -8.927929,-2.5 -13.78125,-2.5 z"
-       id="path8376" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+       id="path3054"
+       sodipodi:cx="43"
+       sodipodi:cy="43"
+       sodipodi:rx="39"
+       sodipodi:ry="39"
+       d="M 5.0607299,52.033924 A 39,39 0 0 1 52.983396,5.2994456"
+       transform="translate(5.0166037,4.0000002)"
+       sodipodi:start="2.9078304"
+       sodipodi:end="4.971255"
+       sodipodi:open="true" />
     <path
        sodipodi:type="arc"
-       style="color:#000000;fill:url(#linearGradient8355);fill-opacity:1;stroke:#731200;stroke-width:2.5999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2826"
-       sodipodi:cx="14.363636"
-       sodipodi:cy="14.363636"
-       sodipodi:rx="9.454545"
-       sodipodi:ry="9.454545"
-       d="m 23.818181,14.363636 a 9.454545,9.454545 0 1 1 -18.90909,0 9.454545,9.454545 0 1 1 18.90909,0 z"
-       transform="translate(6.1424601,4.3815297)" />
+       style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:none"
+       id="path3054-3"
+       sodipodi:cx="43"
+       sodipodi:cy="43"
+       sodipodi:rx="39"
+       sodipodi:ry="39"
+       d="M 5.0607299,52.033924 A 39,39 0 0 1 52.983396,5.2994456"
+       transform="translate(5.0166037,4)"
+       sodipodi:start="2.9078304"
+       sodipodi:end="4.971255"
+       sodipodi:open="true" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:1.96028101;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+       id="path3054-3-6"
+       sodipodi:cx="43"
+       sodipodi:cy="43"
+       sodipodi:rx="39"
+       sodipodi:ry="39"
+       d="M 5.0607299,52.033924 A 39,39 0 0 1 52.983396,5.2994456"
+       transform="matrix(1.0204114,0,0,1.0201124,3.9351394,2.9195508)"
+       sodipodi:start="2.9078304"
+       sodipodi:end="4.971255"
+       sodipodi:open="true" />
+    <g
+       id="g3813"
+       transform="translate(-47,-11)">
+      <path
+         transform="translate(35,-1)"
+         d="m 43,31 a 12,12 0 1 1 -24,0 12,12 0 1 1 24,0 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025"
+         style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.83333337,0,0,0.83333333,40.166665,4.1666669)"
+         d="m 43,31 a 12,12 0 1 1 -24,0 12,12 0 1 1 24,0 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025-3"
+         style="fill:none;stroke:#ef2929;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnPoint.svg
index 0a1a154979..7bd1796192 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnPoint.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_PointOnPoint.svg">
   <defs
      id="defs2818">
@@ -235,14 +235,6 @@
          offset="1"
          id="stop3606-4-7" />
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter7548">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.35927271"
-         id="feGaussianBlur7550" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -251,18 +243,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.7499999"
-     inkscape:cx="39.421314"
-     inkscape:cy="23.682331"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="11"
+     inkscape:cx="4.7207527"
+     inkscape:cy="37.821078"
+     inkscape:current-layer="g3813"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1280"
      inkscape:window-height="758"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3023"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -279,27 +281,29 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.5999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7548);enable-background:accumulate"
-       id="path2826-6-2"
-       sodipodi:cx="14.363636"
-       sodipodi:cy="14.363636"
-       sodipodi:rx="9.454545"
-       sodipodi:ry="9.454545"
-       d="m 23.818181,14.363636 a 9.454545,9.454545 0 1 1 -18.90909,0 9.454545,9.454545 0 1 1 18.90909,0 z"
-       transform="matrix(1.1912715,0,0,1.1912715,17.601526,17.31909)" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#linearGradient5061);fill-opacity:1;stroke:#731200;stroke-width:2.5999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2826-6"
-       sodipodi:cx="14.363636"
-       sodipodi:cy="14.363636"
-       sodipodi:rx="9.454545"
-       sodipodi:ry="9.454545"
-       d="m 23.818181,14.363636 a 9.454545,9.454545 0 1 1 -18.90909,0 9.454545,9.454545 0 1 1 18.90909,0 z"
-       transform="matrix(1.1912715,0,0,1.1912715,14.561922,13.257998)" />
+    <g
+       id="g3813"
+       transform="matrix(0.76131688,0,0,0.75952158,-18.203518,9.2360918)">
+      <path
+         transform="translate(35,-1)"
+         d="m 43,31 c 0,6.627417 -5.372583,12 -12,12 -6.627417,0 -12,-5.372583 -12,-12 0,-6.627417 5.372583,-12 12,-12 6.627417,0 12,5.372583 12,12 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025"
+         style="fill:#ef2929;fill-opacity:1;stroke:#280000;stroke-width:2.63012981000000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.76621621,0,0,0.76802732,42.190296,6.1625307)"
+         d="m 43,31 a 12,12 0 1 1 -24,0 12,12 0 1 1 24,0 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025-3"
+         style="fill:#cc0000;stroke:#ef2929;stroke-width:3.42857170000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnStart.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnStart.svg
index ba758ac3cd..65058eaec1 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnStart.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnStart.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_PointOnStart.svg">
   <defs
      id="defs2818">
@@ -360,9 +360,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="16.479855"
-     inkscape:cy="31.891036"
+     inkscape:zoom="11.313709"
+     inkscape:cx="11.196852"
+     inkscape:cy="19.385413"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -370,8 +370,16 @@
      inkscape:window-width="1280"
      inkscape:window-height="758"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3041"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -389,26 +397,40 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.57379127;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3680);enable-background:accumulate"
-       d="M 21.629915,7.21875 5.0049153,20.8125 22.161165,30.1875 22.004915,23.375 c 0.406333,-0.01917 0.807087,-0.03125 1.21875,-0.03125 12.545337,0 23.04702,8.868447 25.5,20.6875 -2.041243,1.734224 -3.34375,4.29918 -3.34375,7.1875 0,5.221601 4.247149,9.46875 9.46875,9.46875 5.221601,0 9.4375,-4.247149 9.4375,-9.46875 0,-4.231922 -2.760024,-7.825246 -6.59375,-9.03125 -4.99e-4,-0.0024 -0.03075,0.0024 -0.03125,0 -3.311904,-15.981733 -17.480941,-28 -34.4375,-28 -0.488215,0 -0.955028,0.04187 -1.4375,0.0625 l -0.15625,-7.03125 z"
-       id="path7752-7"
-       transform="matrix(0.9568815,0,0,0.98331974,0.03735921,0.01171802)" />
+       style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 22,23 0,8 -11,-13 11,-13 0,8 c 14,0 24,10 24,26 L 36,39 C 36,31 32,23 22,23 z"
+       id="path3892"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.49660468;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 17.805908,2.9827657 c 0,0 -5.479491,4.8092211 -8.1308498,7.0370553 -2.6513585,2.227834 -7.7773011,6.329948 -7.7773011,6.329948 l 16.2397219,9.218623 -0.149513,-6.698866 c 0.388813,-0.01885 0.772287,-0.03073 1.166199,-0.03073 13.742412,0 24.908822,11.444205 24.908822,25.566313 0,1.114832 -0.104622,2.180113 -0.23922,3.257247 l 8.851153,0 c 0.09889,-1.079093 0.149513,-2.151662 0.149513,-3.257247 0,-19.082408 -15.100922,-34.5698345 -33.670268,-34.5698345 -0.467163,0 -0.913848,0.041169 -1.375517,0.061457 l 0.02726,-6.9139658 z"
-       id="path7752"
-       sodipodi:nodetypes="czcccssccsscc" />
-    <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#linearGradient2875);fill-opacity:1;stroke:#731200;stroke-width:2.5999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2826"
-       sodipodi:cx="14.363636"
-       sodipodi:cy="14.363636"
-       sodipodi:rx="9.454545"
-       sodipodi:ry="9.454545"
-       d="m 23.818181,14.363636 a 9.454545,9.454545 0 1 1 -18.90909,0 9.454545,9.454545 0 1 1 18.90909,0 z"
-       transform="matrix(0.9568815,0,0,0.98331974,35.670388,32.134583)" />
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 20,10.5 13.6,18 20,25.5 20,21 c 9,-1 17,5 18,16 l 6,0 C 44,26 36,14 20,15 z"
+       id="path3918"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccc" />
+    <g
+       id="g3813"
+       transform="translate(-25,19)">
+      <path
+         transform="translate(35,-1)"
+         d="m 43,31 a 12,12 0 1 1 -24,0 12,12 0 1 1 24,0 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025"
+         style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.83333337,0,0,0.83333333,40.166665,4.1666669)"
+         d="m 43,31 a 12,12 0 1 1 -24,0 12,12 0 1 1 24,0 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025-3"
+         style="fill:none;stroke:#ef2929;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointToObject.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointToObject.svg
index f5b69e51ab..23d7bca6d6 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointToObject.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointToObject.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_PointToObject.svg">
   <defs
      id="defs2818">
@@ -269,9 +269,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.4999999"
-     inkscape:cx="26.704846"
-     inkscape:cy="27.983282"
+     inkscape:zoom="7.7781744"
+     inkscape:cx="20.562225"
+     inkscape:cy="24.458631"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -279,8 +279,16 @@
      inkscape:window-width="1280"
      inkscape:window-height="758"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3027"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -297,41 +305,63 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <rect
-       style="color:#000000;fill:#ffbf00;fill-opacity:1;fill-rule:nonzero;stroke:#530800;stroke-width:4;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect2856"
-       width="32"
-       height="0.72727275"
-       x="22.317427"
-       y="-0.97315663"
-       transform="matrix(0.68159227,0.73173217,-0.73173217,0.68159227,0,0)"
-       inkscape:transform-center-x="-4.0174134"
-       inkscape:transform-center-y="-4.559168" />
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.5999999;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6958);enable-background:accumulate"
-       d="m 16.349432,6.1193187 c -5.221601,0 -9.4687497,4.2158983 -9.4687497,9.4374993 0,5.221601 4.2471487,9.46875 9.4687497,9.46875 5.221601,0 9.46875,-4.247149 9.46875,-9.46875 0,-5.221601 -4.247149,-9.4374993 -9.46875,-9.4374993 z m 40.59375,13.9062493 c -0.03281,0.0046 -0.0633,0.03412 -0.09375,0.0625 l -40.25,37.53125 c -0.0609,0.05677 -0.07092,0.113697 -0.03125,0.15625 l 5.34375,5.75 c 0.03967,0.04255 0.1266,0.02552 0.1875,-0.03125 l 40.25,-37.5 c 0.0609,-0.05677 0.07092,-0.144947 0.03125,-0.1875 l -5.34375,-5.75 c -0.01983,-0.02128 -0.06094,-0.03589 -0.09375,-0.03125 z"
-       id="path2826-3" />
+       style="fill:none;stroke:#280000;stroke-width:6;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 15,15 38,38"
+       id="path3051"
+       inkscape:connector-curvature="0" />
     <path
-       sodipodi:type="arc"
-       style="color:#000000;fill:url(#linearGradient3608);fill-opacity:1;stroke:#731200;stroke-width:2.5999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2826"
-       sodipodi:cx="14.363636"
-       sodipodi:cy="14.363636"
-       sodipodi:rx="9.454545"
-       sodipodi:ry="9.454545"
-       d="m 23.818181,14.363636 a 9.454545,9.454545 0 1 1 -18.90909,0 9.454545,9.454545 0 1 1 18.90909,0 z"
-       transform="translate(-0.70651418,-1.8598117)" />
-    <rect
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3770"
-       width="55.325027"
-       height="8.0567474"
-       x="-27.169632"
-       y="49.379433"
-       rx="0.15028238"
-       ry="0.10500604"
-       transform="matrix(0.7314837,-0.68185892,0.68185892,0.7314837,0,0)" />
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 15,15 38,38"
+       id="path3051-3"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g3813"
+       transform="translate(-50.999999,-15)">
+      <path
+         transform="translate(35,-1)"
+         d="m 43,31 c 0,6.627417 -5.372583,12 -12,12 -6.627417,0 -12,-5.372583 -12,-12 0,-6.627417 5.372583,-12 12,-12 6.627417,0 12,5.372583 12,12 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025"
+         style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(0.83333337,0,0,0.83333333,40.166665,4.1666669)"
+         d="m 43,31 c 0,6.627417 -5.372583,12 -12,12 -6.627417,0 -12,-5.372583 -12,-12 0,-6.627417 5.372583,-12 12,-12 6.627417,0 12,5.372583 12,12 z"
+         sodipodi:ry="12"
+         sodipodi:rx="12"
+         sodipodi:cy="31"
+         sodipodi:cx="31"
+         id="path3025-3"
+         style="fill:none;stroke:#ef2929;stroke-width:2.4000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3071-2"
+       transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,-62.735161,85.94112)">
+      <rect
+         transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+         ry="0"
+         rx="0"
+         y="33.032074"
+         x="78.283699"
+         height="9.8608322"
+         width="53.747211"
+         id="rect3770-9"
+         style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2.00000024;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         transform="matrix(0.99999989,4.636052e-4,-0.00111473,0.99999938,0,0)"
+         ry="0"
+         rx="0"
+         y="35.020126"
+         x="80.300385"
+         height="5.9074764"
+         width="49.745319"
+         id="rect3770-3-1"
+         style="color:#000000;fill:none;stroke:#ef2929;stroke-width:2.00000024;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius.svg
index 523ef35839..05bcc8878a 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_Radius.svg">
   <defs
      id="defs2818">
@@ -249,18 +249,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="19.643734"
-     inkscape:cy="31.226774"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="12.765675"
+     inkscape:cy="19.974217"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3109"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -269,7 +278,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -278,24 +287,50 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 l -15.625,14.78125 c -0.04225,0.03999 -0.02598,0.127036 0.03125,0.1875 l 5.375,5.6875 c 0.05723,0.06046 0.145252,0.07124 0.1875,0.03125 l 15.8125,-14.9375 c 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-11.752658 9.528592,-21.28125 21.28125,-21.28125 z"
-       id="rect7798-0" />
-    <rect
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.16241693;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect7798"
-       width="8.1317282"
-       height="24.57196"
-       x="39.421326"
-       y="-24.916462"
-       rx="0.15028238"
-       ry="0.10500604"
-       transform="matrix(0.68744129,0.72623996,-0.72623996,0.68744129,0,0)" />
+       style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 32,32 50,14"
+       id="path3135"
+       inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.1062243;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 31.204505,2.4406537 c -15.880703,0 -28.7638513,12.8831483 -28.7638513,28.7638513 0,15.880703 12.8831483,28.763851 28.7638513,28.763851 15.880703,0 28.763851,-12.883148 28.763851,-28.763851 0,-15.880703 -12.883148,-28.7638513 -28.763851,-28.7638513 z m 0,7.4877327 c 11.752657,0 21.276118,9.5234606 21.276118,21.2761186 0,11.752657 -9.523461,21.276118 -21.276118,21.276118 -11.752658,0 -21.2761186,-9.523461 -21.2761186,-21.276118 0,-11.752658 9.5234606,-21.2761186 21.2761186,-21.2761186 z"
-       id="path7752" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#280000;stroke-width:9.23076916;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.86666667,0,0,0.86666667,4.266667,4.2666666)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#cc0000;stroke-width:4.61538458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060-3"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.86666667,0,0,0.86666667,4.266667,4.2666666)" />
+    <path
+       style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 32,32 50,14"
+       id="path3135-3"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#ef2929;stroke-width:2.22222209;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.8"
+       id="path3060-3-7"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.9,0,0,0.9,3.2,3.1999999)" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 31.269,31.338388 49.74589,12.834271"
+       id="path3135-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius_Driven.svg
index c1a91ce241..f3d2a20c0a 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius_Driven.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius_Driven.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Constraint_Radius.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Radius_Driven.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -249,9 +249,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="19.643734"
-     inkscape:cy="31.226774"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="25.397334"
+     inkscape:cy="34.553337"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -259,8 +259,16 @@
      inkscape:window-width="1280"
      inkscape:window-height="715"
      inkscape:window-x="10"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3022"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -269,7 +277,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -278,22 +286,50 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.16241693;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7861);enable-background:accumulate"
-       d="m 34.288266,6.23465 c -15.880703,0 -28.7499995,12.900547 -28.7499995,28.78125 0,15.880703 12.8692965,28.75 28.7499995,28.75 15.880703,0 28.78125,-12.869297 28.78125,-28.75 0,-15.880703 -12.900547,-28.78125 -28.78125,-28.78125 z m 0,7.5 c 4.38226,0 8.459516,1.323715 11.84375,3.59375 l -15.625,14.78125 c -0.04225,0.03999 -0.02598,0.127036 0.03125,0.1875 l 5.375,5.6875 c 0.05723,0.06046 0.145252,0.07124 0.1875,0.03125 l 15.8125,-14.9375 c 2.308922,3.402781 3.65625,7.514433 3.65625,11.9375 0,11.752657 -9.528593,21.28125 -21.28125,21.28125 -11.752658,0 -21.28125,-9.528593 -21.28125,-21.28125 0,-11.752658 9.528592,-21.28125 21.28125,-21.28125 z"
-       id="rect7798-0" />
-    <rect
-       style="color:#000000;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000040;stroke-width:2.16241693000000001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect7798"
-       width="8.1317282"
-       height="24.57196"
-       x="39.421326"
-       y="-24.916462"
-       rx="0.15028238"
-       ry="0.10500604"
-       transform="matrix(0.68744129,0.72623996,-0.72623996,0.68744129,0,0)" />
+       style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 32,32 50,14"
+       id="path3135"
+       inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000040;stroke-width:2.10622430000000005;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 31.204505,2.4406537 c -15.880703,0 -28.7638513,12.8831483 -28.7638513,28.7638513 0,15.880703 12.8831483,28.763851 28.7638513,28.763851 15.880703,0 28.763851,-12.883148 28.763851,-28.763851 0,-15.880703 -12.883148,-28.7638513 -28.763851,-28.7638513 z m 0,7.4877327 c 11.752657,0 21.276118,9.5234606 21.276118,21.2761186 0,11.752657 -9.523461,21.276118 -21.276118,21.276118 -11.752658,0 -21.2761186,-9.523461 -21.2761186,-21.276118 0,-11.752658 9.5234606,-21.2761186 21.2761186,-21.2761186 z"
-       id="path7752" />
+       sodipodi:type="arc"
+       style="fill:none;stroke:#0b1521;stroke-width:9.23076915999999947;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.80000000000000071"
+       id="path3060"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.86666667,0,0,0.86666667,4.266667,4.2666666)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#3465a4;stroke-width:4.61538457999999974;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.80000000000000071"
+       id="path3060-3"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.86666667,0,0,0.86666667,4.266667,4.2666666)" />
+    <path
+       style="fill:none;stroke:#3465a4;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 32,32 50,14"
+       id="path3135-3"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#729fcf;stroke-width:2.22222208999999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:10.80000000000000071"
+       id="path3060-3-7"
+       sodipodi:cx="32"
+       sodipodi:cy="32"
+       sodipodi:rx="30"
+       sodipodi:ry="30"
+       d="M 62,32 A 30,30 0 1 1 2,32 30,30 0 1 1 62,32 z"
+       transform="matrix(0.9,0,0,0.9,3.2,3.1999999)" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 31.269,31.338388 49.74589,12.834271"
+       id="path3135-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw.svg
index e2e5c58deb..b9bba58afb 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.91pre2 r13516"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_SnellsLaw.svg"
    enable-background="new">
   <defs
@@ -573,24 +573,32 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="22.454568"
-     inkscape:cy="24.343855"
+     inkscape:zoom="5.6568543"
+     inkscape:cx="57.688919"
+     inkscape:cy="13.497617"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:snap-midpoints="true"
      inkscape:object-nodes="true"
      inkscape:object-paths="true"
      inkscape:snap-bbox="false"
      inkscape:snap-intersection-paths="true"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3075"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -599,7 +607,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -628,34 +636,44 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      style="display:inline">
+    <path
+       style="fill:none;stroke:#302b00;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 7,7 25,24 7,26"
+       id="path3900"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#edd400;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
+       d="m 7,7 25,24 7,26"
+       id="path3900-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
+       d="M 8.15625,5.390625 36,32 30,31 37,58"
+       id="path3900-7-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
     <g
-       id="g4970"
-       mask="url(#mask4976)">
+       id="g3895">
       <path
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path4442"
-         d="m -4.4123344,37.102214 35.2038364,-2e-6 10.002101,34.604038 10.6066,-2.209709 -9.221159,-32.394329 33.302279,2e-6 0,-6.629126 -36.830531,0 L 11.183504,-4.7496684 3.4937193,1.2607393 27.149373,30.473088 l -31.3229012,0 z"
-         style="fill:#4e4e4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4966)" />
-      <g
-         mask="none"
-         clip-path="none"
-         id="g4371">
-        <path
-           style="fill:#ffff00;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 0.61871934,-1.053824 26.958447,31.473087 37.918603,69.391687 48.525203,67.181978 38.360542,31.473087 8.3085041,-7.0642316 Z"
-           id="path4229"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <rect
-           style="fill:#ff0000;stroke:#800000;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="rect4225"
-           width="79.893661"
-           height="6.6291237"
-           x="-7.2873344"
-           y="28.158525"
-           rx="0.23880625"
-           ry="0.017575977" />
-      </g>
+         id="path3077"
+         d="m 6,31 52,0"
+         style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3077-3"
+         d="m 6,31 52,0"
+         style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3077-3-6"
+         d="m 6,30 52,0"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw_Driven.svg
index 077cb56ce5..6994b480ee 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw_Driven.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw_Driven.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Constraint_SnellsLaw_Driven.svg"
    enable-background="new">
   <defs
@@ -574,23 +574,31 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8"
-     inkscape:cx="22.454568"
-     inkscape:cy="24.343855"
-     inkscape:current-layer="layer1"
+     inkscape:cx="40.263767"
+     inkscape:cy="43.732644"
+     inkscape:current-layer="g3895"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1360"
-     inkscape:window-height="744"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
      inkscape:snap-midpoints="true"
      inkscape:object-nodes="true"
      inkscape:object-paths="true"
      inkscape:snap-bbox="false"
      inkscape:snap-intersection-paths="true"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3075"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -628,34 +636,45 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      style="display:inline">
+    <path
+       style="fill:none;stroke:#302b00;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
+       d="m 7,7 25,24 7,26"
+       id="path3900"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#edd400;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
+       d="m 7,7 25,24 7,26"
+       id="path3900-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;display:inline"
+       d="M 8.15625,5.390625 36,32 30,31 37,58"
+       id="path3900-7-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
     <g
-       id="g4970"
-       mask="url(#mask4976)">
+       style="display:inline"
+       id="g3895">
       <path
+         sodipodi:nodetypes="cc"
          inkscape:connector-curvature="0"
-         id="path4442"
-         d="m -4.4123344,37.102214 35.2038364,-2e-6 10.002101,34.604038 10.6066,-2.209709 -9.221159,-32.394329 33.302279,2e-6 0,-6.629126 -36.830531,0 L 11.183504,-4.7496684 3.4937193,1.2607393 27.149373,30.473088 l -31.3229012,0 z"
-         style="fill:#4e4e4e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4966)" />
-      <g
-         mask="none"
-         clip-path="none"
-         id="g4371">
-        <path
-           style="fill:#ffff00;fill-rule:evenodd;stroke:#000040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
-           d="M 0.61871934,-1.053824 26.958447,31.473087 37.918603,69.391687 48.525203,67.181978 38.360542,31.473087 8.3085041,-7.0642316 Z"
-           id="path4229"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccccc" />
-        <rect
-           style="fill:#4040ff;stroke:#000040;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
-           id="rect4225"
-           width="79.893661"
-           height="6.6291237"
-           x="-7.2873344"
-           y="28.158525"
-           rx="0.23880625"
-           ry="0.017575977" />
-      </g>
+         id="path3077"
+         d="m 6,31 52,0"
+         style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3077-3"
+         d="m 6,31 52,0"
+         style="fill:none;stroke:#3465a4;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path3077-3-6"
+         d="m 6,30 52,0"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Symmetric.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Symmetric.svg
index 67ff354376..48c90f5966 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Symmetric.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Symmetric.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Constraint_Symmetric1.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Symmetric.svg"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/conflicting_constraints/Constraint_Symmetric1_16px.png"
    inkscape:export-xdpi="22.5"
    inkscape:export-ydpi="22.5">
@@ -357,18 +357,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="15.292161"
-     inkscape:cy="24.241496"
+     inkscape:zoom="11.313709"
+     inkscape:cx="25.138453"
+     inkscape:cy="26.797597"
      inkscape:current-layer="text3796"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3042"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -377,7 +385,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -389,25 +397,53 @@
        transform="scale(0.73872768,1.3536788)"
        style="font-size:54.21519089000000236px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ff2600;fill-opacity:1;stroke:#731200;font-family:Arial;-inkscape-font-specification:Arial;color:#000000;fill-rule:nonzero;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="text3796">
-      <path
-         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19132471;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3897);enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-         d="m -9.5275703,2.7089466 0,12.7187504 c 0,0 4.3232233,2.469977 6.5732233,4.058518 2.24999997,1.588542 6.9267767,5.472732 6.9267767,5.472732 l -13.5,9.5625 0,12.65625 c 0,0 7.40625,-6.363357 11.109375,-9.191482 C 5.2849297,35.15809 12.69118,30.208947 12.69118,30.208947 l 0,-10.59375 -7.5312503,-5.75 z M 47.890007,3.0625 c 0,0 -7.40625,5.6354167 -11.109375,8.453125 -3.703125,2.817708 -11.109375,8.453125 -11.109375,8.453125 l 0,10.59375 c 0,0 6.699143,5.12592 10.402268,7.954045 3.703125,2.828125 11.816482,9.014705 11.816482,9.014705 l 0,-12.65625 -13.5,-9.5625 c 0,0 4.5,-3.88419 6.75,-5.472732 2.25,-1.588541 6.75,-4.058518 6.75,-4.058518 z"
-         transform="matrix(1.3536788,0,0,0.73872768,19.861806,9.1412886)"
-         id="path3837-6"
-         sodipodi:nodetypes="cczccczccccczcczccczcc"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 4.1820246,41.029041 c 0,0 10.9901824,-4.434972 16.0066754,-6.521869 5.016494,-2.086896 14.092285,-5.99951 14.092285,-5.99951 l 0,-7.835789 L 24.072813,16.43418 4.1820246,8.1769653 l 0,9.3976527 18.2923314,7.041621 -18.2923314,7.068094 0,9.344708"
-         style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-         id="path3837"
-         sodipodi:nodetypes="czcccccccc"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 83.356588,41.029041 c 0,0 -10.750883,-4.434972 -15.767377,-6.521869 -5.016493,-2.086896 -14.331584,-5.99951 -14.331584,-5.99951 l 0,-7.835789 30.098961,-12.4949077 0,9.3976527 -18.292332,7.041621 18.292332,7.068094 0,9.344708"
-         style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-         id="path3839"
-         sodipodi:nodetypes="czccccccc"
-         inkscape:connector-curvature="0" />
+      <g
+         id="g3852"
+         transform="translate(2.7073576,0)">
+        <path
+           transform="scale(1.3536788,0.73872768)"
+           inkscape:connector-curvature="0"
+           id="path3044"
+           d="M 3,11 3,25 15,33 3,41 3,55 25,39 25,27 z"
+           style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cccccccc"
+           transform="scale(1.3536788,0.73872768)"
+           inkscape:connector-curvature="0"
+           id="path3832"
+           d="m 5,15 0,9 13,9 -13,9 0,9 18,-13 0,-10 z"
+           style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cccccccc"
+           inkscape:connector-curvature="0"
+           id="path3832-6"
+           d="m 6.768394,37.675112 0,-6.648549 0,6.648549 24.366218,-9.60346 0,-7.387276 -24.366218,-9.603461 0,6.648549 0,-6.648549"
+           style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" />
+      </g>
+      <g
+         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+         id="g3852-7"
+         transform="matrix(-1,0,0,1,83.928084,0)">
+        <path
+           transform="scale(1.3536788,0.73872768)"
+           inkscape:connector-curvature="0"
+           id="path3044-5"
+           d="M 3,11 3,25 15,33 3,41 3,55 25,39 25,27 z"
+           style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cccccccc"
+           transform="scale(1.3536788,0.73872768)"
+           inkscape:connector-curvature="0"
+           id="path3832-3"
+           d="m 5,15 0,9 13,9 -13,9 0,9 18,-13 0,-10 z"
+           style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cccccccc"
+           inkscape:connector-curvature="0"
+           id="path3832-6-5"
+           d="m 6.768394,37.675112 0,-6.648549 0,6.648549 24.366218,-9.60346 0,-7.387276 -24.366218,-9.603461 0,6.648549 0,-6.648549"
+           style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Tangent.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Tangent.svg
index 226bf57d78..9b6ef4d028 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Tangent.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Tangent.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_TangentToArc.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Tangent.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -256,18 +256,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="54.906194"
-     inkscape:cy="24.904438"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-0.79215358"
+     inkscape:cy="39.326146"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3023"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -276,7 +286,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -284,26 +294,72 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.71106052;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7899);enable-background:accumulate"
-       d="M 46.15625,4.40625 6.9687499,41.5 c -0.044052,0.0417 -0.028429,0.124453 0.03125,0.1875 L 12.6875,47.71875 C 12.74718,47.7818 12.830948,47.7917 12.875,47.75 L 52.0625,10.6875 C 52.10655,10.6458 52.09093,10.563047 52.03125,10.5 L 46.34375,4.46875 C 46.28407,4.405703 46.200302,4.364551 46.15625,4.40625 z m 12.65625,15.4375 c -19.406107,0 -35.15625,15.750142 -35.15625,35.15625 0,2.461537 0.268063,4.837235 0.75,7.15625 l 9.40625,0 c -0.654101,-2.281223 -1,-4.664467 -1,-7.15625 0,-14.361665 11.638335,-26 26,-26 1.133743,0 2.217094,0.07809 3.3125,0.21875 l 0,-9.25 c -1.097398,-0.103344 -2.188161,-0.125 -3.3125,-0.125 z"
-       id="rect7798-9"
-       transform="matrix(0,1,-1,0,67.163131,-0.14718683)" />
-    <rect
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.71106052;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect7798"
-       width="8.6107368"
-       height="54.173061"
-       x="-15.288319"
-       y="-72.21595"
-       rx="0.15670179"
-       ry="0.10949144"
-       transform="matrix(-0.72623996,0.68744129,-0.68744129,-0.72623996,0,0)" />
-    <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.57379127;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 45.251613,54.518286 c 0,-19.406107 -15.752959,-35.159067 -35.159067,-35.159067 -2.4615371,0 -4.8496549,0.267515 -7.1686699,0.749452 l 0,9.417025 c 2.281223,-0.654101 4.6768868,-1.01013 7.1686699,-1.01013 14.361665,0 26.002721,11.641055 26.002721,26.00272 0,1.133743 -0.08743,2.228251 -0.228094,3.323657 l 9.2541,0 c 0.103344,-1.097398 0.13034,-2.199318 0.13034,-3.323657 z"
-       id="path7752" />
+    <g
+       id="g3063"
+       transform="translate(1,-0.99999976)">
+      <path
+         transform="translate(-4,6)"
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="4.712389"
+         d="M 11.000001,18 C 29.225397,18 44,32.774603 44,51"
+         sodipodi:ry="33"
+         sodipodi:rx="33"
+         sodipodi:cy="51"
+         sodipodi:cx="11"
+         id="path3025"
+         style="fill:none;stroke:#280000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(-4,6)"
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="4.712389"
+         d="M 11.000001,18 C 29.225397,18 44,32.774603 44,51"
+         sodipodi:ry="33"
+         sodipodi:rx="33"
+         sodipodi:cy="51"
+         sodipodi:cx="11"
+         id="path3025-3"
+         style="fill:none;stroke:#ef2929;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(-4,6)"
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="4.712389"
+         d="M 11.000001,18 C 29.225397,18 44,32.774603 44,51"
+         sodipodi:ry="33"
+         sodipodi:rx="33"
+         sodipodi:cy="51"
+         sodipodi:cx="11"
+         id="path3025-3-6"
+         style="fill:none;stroke:#cc0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3071-2"
+       transform="matrix(-0.70710678,-0.70710678,-0.70710678,0.70710678,139.73516,72.918789)">
+      <rect
+         transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+         ry="0"
+         rx="0"
+         y="33.032074"
+         x="78.283699"
+         height="9.8608322"
+         width="53.747211"
+         id="rect3770-9"
+         style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2.00000024;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <rect
+         transform="matrix(0.99999989,4.636052e-4,-0.00111473,0.99999938,0,0)"
+         ry="0"
+         rx="0"
+         y="35.020126"
+         x="80.300385"
+         height="5.9074764"
+         width="49.745319"
+         id="rect3770-3-1"
+         style="color:#000000;fill:none;stroke:#ef2929;stroke-width:2.00000024;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToEnd.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToEnd.svg
index f54e128a55..c1b03f3063 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToEnd.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToEnd.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_TangentToArcEnd.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_TangentToEnd.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -254,14 +254,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter8001">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.93515625"
-         id="feGaussianBlur8003" />
-    </filter>
     <inkscape:perspective
        id="perspective2867"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -285,18 +277,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6568543"
-     inkscape:cx="10.823001"
-     inkscape:cy="35.9569"
+     inkscape:zoom="11.313709"
+     inkscape:cx="12.350795"
+     inkscape:cy="29.015973"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3107"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -313,19 +313,64 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.57379127;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3657);enable-background:accumulate"
-       d="M 25.964466,7.9019661 6.8707162,18.933217 l 7.7499998,4.46875 c -1.332814,0.126261 -2.648151,0.294548 -3.9375,0.5625 l 0,9.4375 c 2.281223,-0.654101 4.695717,-1.03125 7.1875,-1.03125 14.361665,0 26,11.669585 26,26.03125 0,1.133743 -0.07809,2.217094 -0.21875,3.3125 l 9.25,0 c 0.103344,-1.097398 0.125,-2.188161 0.125,-3.3125 0,-16.615985 -11.560107,-30.554402 -27.0625,-34.21875 l 0,-0.84375 36,0.0625 c 0.04789,7.6e-5 0.09367,-0.06678 0.09375,-0.15625 l 0,-8.53125 c 8.4e-5,-0.08947 -0.04586,-0.187424 -0.09375,-0.1875 l -36,-0.0625 0,-6.5625009 z"
-       id="path7752-4" />
-    <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.57379127;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 47.726487,53.634403 c 0,-19.406107 -15.752959,-35.159067 -35.159067,-35.159067 -2.461537,0 -4.8496551,0.267515 -7.1686701,0.749452 l 0,9.417025 c 2.281223,-0.654101 4.6768871,-1.01013 7.1686701,-1.01013 14.361665,0 26.002721,11.641055 26.002721,26.00272 0,1.133743 -0.08743,2.228251 -0.228094,3.323657 l 9.2541,0 c 0.103344,-1.097398 0.13034,-2.199318 0.13034,-3.323657 z"
-       id="path7752" />
-    <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.44556618;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 20.674937,3.1329635 1.5811869,14.164214 l 19.0937501,11 0,-6.59375 36,0.0625 c 0.04789,7.6e-5 0.09367,-0.06678 0.09375,-0.15625 l 0,-8.5312505 c 8.4e-5,-0.089469 -0.04586,-0.1874238 -0.09375,-0.1875 l -36,-0.0625 0,-6.5625 z"
-       id="rect7798" />
+    <g
+       id="g3063"
+       transform="translate(1,-0.99999976)">
+      <path
+         transform="translate(-4,6)"
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="4.712389"
+         d="M 11.000001,18 C 29.225397,18 44,32.774603 44,51"
+         sodipodi:ry="33"
+         sodipodi:rx="33"
+         sodipodi:cy="51"
+         sodipodi:cx="11"
+         id="path3025"
+         style="fill:none;stroke:#280000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(-4,6)"
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="4.712389"
+         d="M 11.000001,18 C 29.225397,18 44,32.774603 44,51"
+         sodipodi:ry="33"
+         sodipodi:rx="33"
+         sodipodi:cy="51"
+         sodipodi:cx="11"
+         id="path3025-3"
+         style="fill:none;stroke:#ef2929;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(-4,6)"
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="4.712389"
+         d="M 11.000001,18 C 29.225397,18 44,32.774603 44,51"
+         sodipodi:ry="33"
+         sodipodi:rx="33"
+         sodipodi:cy="51"
+         sodipodi:cx="11"
+         id="path3025-3-6"
+         style="fill:none;stroke:#cc0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3894"
+       transform="translate(8,-16)">
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3034"
+         d="m 15,27 0,-8 -20,13 20,13 0,-8 38,0 c 0,2.2e-5 0,0 0,0 l 0,-10 z"
+         style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3034-3"
+         d="M 13,29 13,22.6 -1.2,32 13,41.4 13,35 l 38,0 0,-6 0,0 z"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToStart.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToStart.svg
index 48a28b7e52..0d4c95129e 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToStart.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToStart.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_TangentToArcStart.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_TangentToStart.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -247,14 +247,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter7950">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.98057813"
-         id="feGaussianBlur7952" />
-    </filter>
     <inkscape:perspective
        id="perspective2866"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -279,8 +271,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="5.6568543"
-     inkscape:cx="10.823001"
-     inkscape:cy="35.9569"
+     inkscape:cx="19.097145"
+     inkscape:cy="32.629691"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -288,8 +280,16 @@
      inkscape:window-width="1280"
      inkscape:window-height="758"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3027"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -306,19 +306,64 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.46711302;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3656);enable-background:accumulate"
-       d="m 51.979446,5.9862012 -11.78125,20.4062498 7.84375,0 -0.0625,35.4375 c -7.6e-5,0.04886 0.067,0.09367 0.15625,0.09375 l 8.53125,0 c 0.08925,8.5e-5 0.156174,-0.01364 0.15625,-0.0625 l 0.0625,-35.46875 6.875,0 -11.78125,-20.4062498 z m -39.9375,17.3749998 c -2.461537,0 -4.8372349,0.268063 -7.1562499,0.75 l 0,9.4375 c 2.281223,-0.654101 4.6644669,-1.03125 7.1562499,-1.03125 14.361666,0 26,11.638335 26,26 0,1.133743 -0.07809,2.248344 -0.21875,3.34375 l 9.25,0 c 0.103344,-1.097398 0.125,-2.219411 0.125,-3.34375 0,-19.406107 -15.750142,-35.15625 -35.15625,-35.15625 z"
-       id="rect7798-0" />
-    <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.46711302;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 50.03125 1.96875 L 38.25 22.375 L 46.09375 22.375 L 46.03125 57.8125 C 46.031174 57.861359 46.098246 57.906165 46.1875 57.90625 L 54.71875 57.90625 C 54.808004 57.906335 54.874924 57.892609 54.875 57.84375 L 54.9375 22.375 L 61.8125 22.375 L 50.03125 1.96875 z "
-       id="rect7798" />
-    <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.57379127;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 45.251613,54.518286 c 0,-19.406107 -15.752959,-35.159067 -35.159067,-35.159067 -2.4615371,0 -4.8496549,0.267515 -7.1686699,0.749452 l 0,9.417025 c 2.281223,-0.654101 4.6768868,-1.01013 7.1686699,-1.01013 14.361665,0 26.002721,11.641055 26.002721,26.00272 0,1.133743 -0.08743,2.228251 -0.228094,3.323657 l 9.2541,0 c 0.103344,-1.097398 0.13034,-2.199318 0.13034,-3.323657 z"
-       id="path7752" />
+    <g
+       id="g3063"
+       transform="translate(0.99999935,-1)">
+      <path
+         transform="translate(-4,6)"
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="4.712389"
+         d="M 11.000001,18 C 29.225397,18 44,32.774603 44,51"
+         sodipodi:ry="33"
+         sodipodi:rx="33"
+         sodipodi:cy="51"
+         sodipodi:cx="11"
+         id="path3025"
+         style="fill:none;stroke:#280000;stroke-width:10;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(-4,6)"
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="4.712389"
+         d="M 11.000001,18 C 29.225397,18 44,32.774603 44,51"
+         sodipodi:ry="33"
+         sodipodi:rx="33"
+         sodipodi:cy="51"
+         sodipodi:cx="11"
+         id="path3025-3"
+         style="fill:none;stroke:#ef2929;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="translate(-4,6)"
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="4.712389"
+         d="M 11.000001,18 C 29.225397,18 44,32.774603 44,51"
+         sodipodi:ry="33"
+         sodipodi:rx="33"
+         sodipodi:cy="51"
+         sodipodi:cx="11"
+         id="path3025-3-6"
+         style="fill:none;stroke:#cc0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g3894"
+       transform="matrix(0,1,-1,0,79,8)">
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3034"
+         d="m 15,27 0,-8 -20,13 20,13 0,-8 38,0 c 0,2.2e-5 0,0 0,0 l 0,-10 z"
+         style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         inkscape:connector-curvature="0"
+         id="path3034-3"
+         d="M 13,29 13,22.6 -1.2,32 13,41.4 13,35 l 38,0 0,-6 0,0 z"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Vertical.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Vertical.svg
index 8496434a4b..9e9c5ef242 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Vertical.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Vertical.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_Horizontal.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_Vertical.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -190,9 +190,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890872"
-     inkscape:cx="42.205777"
-     inkscape:cy="15.401951"
+     inkscape:zoom="12.71875"
+     inkscape:cx="27.093633"
+     inkscape:cy="48.080039"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -200,8 +200,16 @@
      inkscape:window-width="1280"
      inkscape:window-height="758"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3021"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -210,7 +218,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -219,26 +227,24 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <rect
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19132471;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter5705);enable-background:accumulate"
-       id="rect3770-3"
-       width="55.271896"
-       height="9.484437"
-       x="6.934855"
-       y="30.505665"
-       rx="0.15028238"
-       ry="0.10500604"
-       transform="matrix(7.1888592e-4,-0.99999974,0.99999974,7.1888592e-4,-1.2404595,68.749946)" />
+       style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2.00000024;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3770-36"
+       width="57.992863"
+       height="9.9582825"
+       x="-60.966282"
+       y="27.043867"
+       rx="0"
+       ry="0"
+       transform="matrix(7.1938714e-4,-0.99999974,0.99999974,7.1838503e-4,0,0)" />
     <rect
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3770"
-       width="55.271896"
-       height="9.484437"
-       x="-58.751598"
-       y="26.262764"
-       rx="0.15028238"
-       ry="0.10500604"
-       transform="matrix(7.1888592e-4,-0.99999974,0.99999974,7.1888592e-4,0,0)" />
+       style="color:#000000;fill:none;stroke:#ef2929;stroke-width:2.00000024;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3770-3-7"
+       width="53.993343"
+       height="5.9749722"
+       x="-58.953835"
+       y="29.027346"
+       rx="0"
+       ry="0"
+       transform="matrix(4.636052e-4,-0.99999989,0.99999938,0.00111473,0,0)" />
   </g>
 </svg>
-
- 	  	 
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance.svg
index edfb020ec1..9b0ac8bf3e 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_HorizontalDistance.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_VerticalDistance.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -186,22 +186,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter3692">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.77667049"
-         id="feGaussianBlur3694" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3651">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.75623179"
-         id="feGaussianBlur3653" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -210,9 +194,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890872"
-     inkscape:cx="38.180853"
-     inkscape:cy="20.314835"
+     inkscape:zoom="15.860184"
+     inkscape:cx="17.126129"
+     inkscape:cy="14.413797"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -220,8 +204,16 @@
      inkscape:window-width="1280"
      inkscape:window-height="688"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3016"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -230,7 +222,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -239,15 +231,16 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       id="path2845"
-       d="m 9.2298766,21.579936 c -0.080714,-1.77e-4 -0.1567867,0.137412 -0.1568273,0.309354 l 0,27.403601 c -4.05e-5,0.171941 0.076113,0.309177 0.1568273,0.309354 l 6.1631444,0.02578 0,-11.189297 c 3.2e-5,-0.118391 0.03042,-0.206358 0.0941,-0.206236 l 40.775434,0.07734 c 0.06368,1.22e-4 0.09413,0.08785 0.0941,0.206236 l 0,11.189298 6.163145,0.02578 c 0.08071,1.77e-4 0.156787,-0.137412 0.156827,-0.309354 l 0,-27.403601 c 4e-5,-0.171941 -0.07611,-0.309177 -0.156827,-0.309354 l -6.163145,-0.02578 0,11.189297 c -3.2e-5,0.118391 -0.03042,0.206358 -0.0941,0.206236 L 15.487121,33.00125 c -0.06368,-1.22e-4 -0.09413,-0.08784 -0.0941,-0.206236 l 0,-11.189298 -6.1631444,-0.02578 z"
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19099998;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3651);enable-background:accumulate"
-       transform="matrix(0,-1,1,0,0.21929715,71.530379)" />
+       style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 15,61 0,-8 12,0 0,-42 -12,0 0,-8 32,0 0,8 -12,0 0,42 12,0 0,8 z"
+       id="path3018"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19099998;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 18.065024,58.738714 c -1.77e-4,0.08071 0.137412,0.156786 0.309354,0.156827 l 27.403601,0 c 0.171941,4.1e-5 0.309177,-0.07611 0.309354,-0.156827 l 0.02578,-6.163145 -11.189297,0 c -0.118391,-3.2e-5 -0.206358,-0.03042 -0.206236,-0.0941 l 0.07734,-40.775434 c 1.22e-4,-0.06368 0.08785,-0.09413 0.206236,-0.0941 l 11.189298,0 0.02578,-6.1631451 c 1.77e-4,-0.08071 -0.137412,-0.156787 -0.309354,-0.156827 l -27.403601,0 c -0.171941,-4e-5 -0.309177,0.07611 -0.309354,0.156827 l -0.02578,6.1631451 11.189297,0 c 0.118391,3.2e-5 0.206358,0.03042 0.206236,0.0941 l -0.07734,40.775434 c -1.22e-4,0.06368 -0.08784,0.09413 -0.206236,0.0941 l -11.189298,0 -0.02578,6.163145 z"
-       id="rect3770"
-       sodipodi:nodetypes="ccccccccccccccccccccc" />
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 17,59 0,-4 12,0 0,-46 -12,0 0,-4 28,0 0,4 -12,0 0,46 12,0 0,4 z"
+       id="path3018-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance_Driven.svg
index 182e418350..6a5737b2ed 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance_Driven.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance_Driven.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Constraint_VerticalDistance.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Constraint_VerticalDistance_Driven.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -202,9 +202,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890872"
-     inkscape:cx="38.180853"
-     inkscape:cy="20.314835"
+     inkscape:zoom="11.214843"
+     inkscape:cx="27.70448"
+     inkscape:cy="12.656176"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
@@ -213,7 +213,15 @@
      inkscape:window-height="688"
      inkscape:window-x="10"
      inkscape:window-y="34"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3014"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -222,7 +230,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -231,15 +239,16 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       id="path2845"
-       d="m 9.2298766,21.579936 c -0.080714,-1.77e-4 -0.1567867,0.137412 -0.1568273,0.309354 l 0,27.403601 c -4.05e-5,0.171941 0.076113,0.309177 0.1568273,0.309354 l 6.1631444,0.02578 0,-11.189297 c 3.2e-5,-0.118391 0.03042,-0.206358 0.0941,-0.206236 l 40.775434,0.07734 c 0.06368,1.22e-4 0.09413,0.08785 0.0941,0.206236 l 0,11.189298 6.163145,0.02578 c 0.08071,1.77e-4 0.156787,-0.137412 0.156827,-0.309354 l 0,-27.403601 c 4e-5,-0.171941 -0.07611,-0.309177 -0.156827,-0.309354 l -6.163145,-0.02578 0,11.189297 c -3.2e-5,0.118391 -0.03042,0.206358 -0.0941,0.206236 L 15.487121,33.00125 c -0.06368,-1.22e-4 -0.09413,-0.08784 -0.0941,-0.206236 l 0,-11.189298 -6.1631444,-0.02578 z"
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19099998;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3651);enable-background:accumulate"
-       transform="matrix(0,-1,1,0,0.21929715,71.530379)" />
+       style="fill:#3465a4;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 15,61 0,-8 12,0 0,-42 -12,0 0,-8 32,0 0,8 -12,0 0,42 12,0 0,8 z"
+       id="path3018"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       style="color:#000000;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000040;stroke-width:2.19099997999999996;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 18.065024,58.738714 c -1.77e-4,0.08071 0.137412,0.156786 0.309354,0.156827 l 27.403601,0 c 0.171941,4.1e-5 0.309177,-0.07611 0.309354,-0.156827 l 0.02578,-6.163145 -11.189297,0 c -0.118391,-3.2e-5 -0.206358,-0.03042 -0.206236,-0.0941 l 0.07734,-40.775434 c 1.22e-4,-0.06368 0.08785,-0.09413 0.206236,-0.0941 l 11.189298,0 0.02578,-6.1631451 c 1.77e-4,-0.08071 -0.137412,-0.156787 -0.309354,-0.156827 l -27.403601,0 c -0.171941,-4e-5 -0.309177,0.07611 -0.309354,0.156827 l -0.02578,6.1631451 11.189297,0 c 0.118391,3.2e-5 0.206358,0.03042 0.206236,0.0941 l -0.07734,40.775434 c -1.22e-4,0.06368 -0.08784,0.09413 -0.206236,0.0941 l -11.189298,0 -0.02578,6.163145 z"
-       id="rect3770"
-       sodipodi:nodetypes="ccccccccccccccccccccc" />
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 17,59 0,-4 12,0 0,-46 -12,0 0,-4 28,0 0,4 -12,0 0,46 12,0 0,4 z"
+       id="path3018-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg b/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg
index 7fab95aaca..06306e75d0 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/SketcherWorkbench.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="Sketcher_NewSketch.svg"
+   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"
@@ -23,6 +23,30 @@
    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>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient6349">
@@ -74,6 +98,24 @@
        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"
@@ -82,18 +124,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="24.311263"
-     inkscape:cy="23.456398"
+     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="1280"
-     inkscape:window-height="756"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -117,74 +169,54 @@
        inkscape:export-ydpi="3.2478156"
        transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
       <rect
-         style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:29.94246101;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3860"
-         width="279.46939"
-         height="242.47264"
-         x="908.45099"
-         y="1168.7698" />
+         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:#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="path3862"
+         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.6471726,0,0,7.3274701,940.43005,910.31002)" />
+         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="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483137;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888"
-         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(4.3431863,0,0,4.5377509,1040.0959,1163.3368)"
-         inkscape:transform-center-y="-1.249386" />
+         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
-         sodipodi:type="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483137;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888-9"
-         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(4.3431863,0,0,-4.5377509,1040.0959,1407.8557)"
-         inkscape:transform-center-y="9.1339339" />
+         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
-         sodipodi:type="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483133;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888-97"
-         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(3.4930984,-2.4730917,2.8142718,3.6495811,1130.1679,976.90703)"
-         inkscape:transform-center-y="-6.1667373"
-         inkscape:transform-center-x="3.9989493" />
+         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>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterConstruction.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterConstruction.svg
index efc3c81b08..5793e66a66 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterConstruction.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterConstruction.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_ToggleConstruction.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_AlterConstruction.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -999,6 +999,36 @@
        id="radialGradient10642-1"
        xlink:href="#linearGradient3144-6"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4096"
+       id="linearGradient4102"
+       x1="26"
+       y1="58"
+       x2="16"
+       y2="26"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4096">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop4098" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4100" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4096"
+       id="linearGradient4190"
+       gradientUnits="userSpaceOnUse"
+       x1="26"
+       y1="58"
+       x2="16"
+       y2="26" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -1007,18 +1037,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.9557295"
-     inkscape:cx="37.749958"
-     inkscape:cy="41.833241"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="9.0556095"
+     inkscape:cx="9.334912"
+     inkscape:cy="34.114513"
+     inkscape:current-layer="g3134-7"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="688"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4121"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -1036,97 +1074,47 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g4312">
+       transform="translate(23,-23)"
+       id="g3134-7">
       <rect
-         y="2.3802543"
-         x="22.335066"
-         height="7.4589348"
-         width="6.7394919"
-         id="rect4618"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.76050824;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+         y="28"
+         x="6"
+         height="30"
+         width="30"
+         id="rect3107-5"
+         style="fill:none;stroke:#204a87;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:6, 12;stroke-dashoffset:20.39999999999999858" />
       <rect
-         y="2.3891532"
-         x="41.53767"
-         height="7.4411368"
-         width="7.0755115"
-         id="rect10648-9-7"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77830625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77830625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="rect4620"
-         width="7.0755115"
-         height="7.4411368"
-         x="53.218487"
-         y="2.3891582" />
-      <rect
-         y="31.223377"
-         x="53.218487"
-         height="7.4411368"
-         width="7.0755115"
-         id="rect4622"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77830625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.7384764;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="rect4624"
-         width="7.1153412"
-         height="6.6615238"
-         x="53.19857"
-         y="20.745106" />
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77830625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="rect4628"
-         width="7.0755115"
-         height="7.4411368"
-         x="22.343966"
-         y="13.393806" />
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77830625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="rect4632"
-         width="7.0755115"
-         height="7.4411368"
-         x="22.343966"
-         y="31.223377" />
-      <rect
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.77830625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="rect4636"
-         width="7.0755115"
-         height="7.4411368"
-         x="33.906845"
-         y="31.223377" />
-      <path
-         inkscape:connector-curvature="0"
-         id="rect10648-9-7-7-0"
-         d="m 33.689176,9.8120782 3.224976,0 0,-7.4047131 -3.224976,0 0,7.4047131 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.81473058;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <path
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.81473058;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         d="m 45.487932,38.646302 3.224975,0 0,-7.404714 -3.224975,0 0,7.404714 z"
-         id="path4396"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4398"
-         d="m 22.179365,24.416671 0,3.224976 7.404714,0 0,-3.224976 -7.404714,0 z"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.81473058;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <path
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.81473058;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         d="m 53.053886,13.685169 0,3.224974 7.404714,0 0,-3.224974 -7.404714,0 z"
-         id="path4400"
-         inkscape:connector-curvature="0" />
+         y="28"
+         x="6"
+         height="30"
+         width="30"
+         id="rect3107-5-6"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:6, 12;stroke-dashoffset:20.4" />
     </g>
     <g
-       id="g4470"
-       transform="matrix(1.0051781,0,0,1.0051781,0.24103191,0.13228973)">
-      <path
-         style="display:inline;overflow:visible;visibility:visible;opacity:0.56099997;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.59099996;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.29019608;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-         d="m 6.34,27.339622 0,34.209378 35.855467,0 0,-34.209379 -35.855467,0 z m 7.404029,7.641268 20.922622,0 0,19.945677 -20.922622,0 0,-19.945677 z"
-         id="path4433"
-         inkscape:connector-curvature="0" />
-      <path
-         inkscape:connector-curvature="0"
-         id="rect2663"
-         d="m 3.8397555,24.839755 0,34.209378 35.8554675,0 0,-34.209378 -35.8554675,0 z m 7.4040295,7.641269 20.922622,0 0,19.945676 -20.922622,0 0,-19.945676 z"
-         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ff1e00;stroke-width:2.19000006;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+       id="g3134"
+       transform="translate(2,-2)">
+      <rect
+         y="28"
+         x="8"
+         height="28"
+         width="28"
+         id="rect3107"
+         style="fill:none;stroke:#280000;stroke-width:12;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="28"
+         x="8"
+         height="28"
+         width="28"
+         id="rect3107-3"
+         style="fill:none;stroke:#ef2929;stroke-width:7.99999952;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="28"
+         x="8"
+         height="28"
+         width="28"
+         id="rect3107-3-7"
+         style="fill:none;stroke:url(#linearGradient4190);stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterFillet.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterFillet.svg
index 2ebd380c5c..e877e72f02 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterFillet.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterFillet.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 "
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_AlterFillet.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -33,18 +33,6 @@
          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(1.1) rotate(180) translate(1,0)" />
     </marker>
-    <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"
@@ -54,128 +42,218 @@
        id="perspective2734" />
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-4" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-0" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
-       id="radialGradient2370"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-6-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-6-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-6-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-70" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-6-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-5-9" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-3-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-6-7-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-5-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-3-28" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-1">
+       xlink:href="#linearGradient3836-0-6-9"
+       id="linearGradient3801-1-3-2"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.84956703,0,0,0.84301394,-2.927337,1.7790378)" />
+    <linearGradient
+       id="linearGradient3836-0-6-9">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#a40000;stop-opacity:1"
          offset="0"
-         id="stop3146-7" />
+         id="stop3838-2-7-3" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#ef2929;stop-opacity:1"
          offset="1"
-         id="stop3148-4" />
+         id="stop3840-5-5-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-6-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-36" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-6-61">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-55" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-6-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-74" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-52" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-1"
-       id="radialGradient2368"
-       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-1"
-       id="radialGradient2378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-0">
+       xlink:href="#linearGradient3836-0-6-9-7"
+       id="linearGradient3801-1-3-2-0"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.84956703,0,0,0.84301394,-2.927337,1.7790378)" />
+    <linearGradient
+       id="linearGradient3836-0-6-9-7">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#a40000;stop-opacity:1"
          offset="0"
-         id="stop3146-76" />
+         id="stop3838-2-7-3-8" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#ef2929;stop-opacity:1"
          offset="1"
-         id="stop3148-3" />
+         id="stop3840-5-5-1-6" />
     </linearGradient>
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4489"
+       xlink:href="#linearGradient3836-0-6-92"
+       id="linearGradient3801-1-3-14"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)" />
+    <linearGradient
+       id="linearGradient3836-0-6-92">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-06" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-8" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4491"
+       xlink:href="#linearGradient3836-0-6-92-4"
+       id="linearGradient3801-1-3-14-0"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)" />
+    <linearGradient
+       id="linearGradient3836-0-6-92-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-06-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-8-7" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient4493"
+       xlink:href="#linearGradient3836-0-6-92-2"
+       id="linearGradient3801-1-3-14-2"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-0"
-       id="radialGradient4495"
-       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-0"
-       id="radialGradient4497"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.76342439,0,0,0.75750425,-4.596389,2.7525637)" />
+    <linearGradient
+       id="linearGradient3836-0-6-92-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-06-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-8-1" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,18 +262,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="-62.914671"
-     inkscape:cy="25.806874"
+     inkscape:zoom="5.7706031"
+     inkscape:cx="28.334559"
+     inkscape:cy="21.242887"
      inkscape:current-layer="g3401"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="964"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="800"
+     inkscape:window-height="837"
+     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="grid3040"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -204,7 +292,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -212,166 +300,6 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <g
-       id="g4466"
-       transform="matrix(0.84186266,0,0,0.78520671,2.5574215,-10.297594)">
-      <g
-         transform="matrix(0.15033206,0,0,0.15767575,7.3143,-49.990268)"
-         id="g3255">
-        <path
-           id="rect3257"
-           d="m 246.91044,448.95693 c -20.93264,0.58596 -37.99085,17.50495 -38.47184,38.67566 -0.10989,4.83689 0.67296,9.48714 2.16564,13.80909 L 52.207293,643.86391 c -7.155308,-6.01548 -16.450171,-9.51822 -26.522636,-9.24853 -21.8514501,0.58506 -39.107857,18.78599 -38.52279,40.63747 0.585067,21.85144 18.7860155,39.10786 40.637467,38.52279 21.851448,-0.58507 39.107856,-18.786 38.52279,-40.63747 -0.07462,-2.7871 -0.45103,-5.49182 -1.070077,-8.10202 L 225.40698,521.03429 c 6.17366,4.30802 13.64772,6.8992 21.73276,7.0829 21.85364,0.4965 39.98809,-16.82203 40.4846,-38.67566 0.4965,-21.85364 -16.82201,-39.9881 -38.67566,-40.4846 -0.68292,-0.0155 -1.363,-0.0189 -2.03824,0 z"
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000114;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="matrix(0.12038224,0,0,0.12369548,1.6669393,-34.235132)"
-         id="g3242">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000114;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect2269"
-           width="30.000006"
-           height="330.00009"
-           x="534.10168"
-           y="119.87096"
-           transform="matrix(0.668591,0.7436304,-0.7436304,0.668591,0,0)" />
-        <g
-           id="g3154"
-           transform="matrix(-0.9996417,0.02676515,-0.02676515,-0.9996417,238.03783,1359.7845)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2162"
-             style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3134"
-             style="fill:url(#radialGradient4489);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g3160"
-           transform="matrix(-0.999742,-0.02271351,0.02271351,-0.999742,475.0668,1137.8902)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3162"
-             style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3164"
-             style="fill:url(#radialGradient4491);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <path
-         transform="matrix(-0.08180323,0.09110947,-0.05348998,-0.13933542,85.595485,120.84744)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path3134-1"
-         style="fill:url(#radialGradient4493);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         transform="matrix(-0.00642936,0.14130894,-0.14269863,-0.00805849,141.98597,28.412089)"
-         id="g3255-5">
-        <path
-           id="rect3257-4"
-           d="m 246.91044,448.95693 c -20.93264,0.58596 -37.99085,17.50495 -38.47184,38.67566 -0.10989,4.83689 0.67296,9.48714 2.16564,13.80909 L 52.207293,643.86391 c -7.155308,-6.01548 -16.450171,-9.51822 -26.522636,-9.24853 -21.8514501,0.58506 -39.107857,18.78599 -38.52279,40.63747 0.585067,21.85144 18.7860155,39.10786 40.637467,38.52279 21.851448,-0.58507 39.107856,-18.786 38.52279,-40.63747 -0.07462,-2.7871 -0.45103,-5.49182 -1.070077,-8.10202 L 225.40698,521.03429 c 6.17366,4.30802 13.64772,6.8992 21.73276,7.0829 21.85364,0.4965 39.98809,-16.82203 40.4846,-38.67566 0.4965,-21.85364 -16.82201,-39.9881 -38.67566,-40.4846 -0.68292,-0.0155 -1.363,-0.0189 -2.03824,0 z"
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000114;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="matrix(-0.00556602,0.12726288,-0.12353687,-0.00725748,125.0167,26.626102)"
-         id="g3242-2">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000114;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect2269-0"
-           width="30.000006"
-           height="330.00009"
-           x="534.10168"
-           y="119.87096"
-           transform="matrix(0.668591,0.7436304,-0.7436304,0.668591,0,0)" />
-        <g
-           id="g3154-9"
-           transform="matrix(-0.9996417,0.02676515,-0.02676515,-0.9996417,238.03783,1359.7845)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2162-7"
-             style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3134-3"
-             style="fill:url(#radialGradient4495);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g3160-7"
-           transform="matrix(-0.999742,-0.02271351,0.02271351,-0.999742,475.0668,1137.8902)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3162-2"
-             style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3164-6"
-             style="fill:url(#radialGradient4497);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-    </g>
     <g
        id="g3401"
        inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
@@ -379,95 +307,157 @@
        inkscape:export-ydpi="6.7480335"
        transform="matrix(0.0544775,-0.0359434,0.02142365,0.09139929,29.04045,-32.878566)">
       <path
+         style="fill:#d3d7cf;stroke:#2e3436;stroke-width:26.37695312;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 104.82037,809.42022 83.25743,-13.6772 -248.6155,-321.25493 -83.25742,13.67719 z"
+         id="path3061-3"
          inkscape:connector-curvature="0"
-         id="path3354"
-         d="m -364.50944,453.1287 c -24.43504,0.6847 -44.34478,20.46235 -44.90623,45.17388 -0.57954,25.50866 19.66523,46.67609 45.17388,47.25564 17.59897,0.39983 33.14555,-9.09388 41.27805,-23.40478 99.12718,16.70173 177.80663,89.83785 197.88481,183.19364 -13.23374,8.44121 -21.83293,23.41404 -21.3825,40.23718 0.68292,25.50609 21.92796,45.6486 47.43407,44.96571 25.50609,-0.68292 45.648633,-21.95773 44.965706,-47.46381 -0.624362,-23.31922 -18.437626,-42.13112 -40.980656,-44.66832 -22.25726,-105.59199 -110.92997,-188.28685 -222.53863,-206.56867 -3.52524,-21.52172 -21.96023,-38.20726 -44.54936,-38.72047 -0.79715,-0.0181 -1.59091,-0.0221 -2.37914,0 z m -4.81776,244.99175 c -25.50609,0.68292 -45.64865,21.95771 -44.96571,47.46381 0.68292,25.50609 21.92799,45.6486 47.43407,44.96571 25.50609,-0.68292 45.64862,-21.95773 44.96571,-47.46381 -0.68292,-25.50609 -21.92796,-45.64862 -47.43407,-44.96571 z"
-         style="fill:#000000;fill-opacity:0.5098038;fill-rule:evenodd;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:26.37695312;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 124.75712,754.34163 -77.06462,493.55268"
+         id="path3063-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#d3d7cf;stroke:#2e3436;stroke-width:26.37695312;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -534.00119,558.20193 -51.6384,-66.72587 400.84702,-65.84956 51.6383,66.72587 z"
+         id="path3061"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:26.37695312;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -511.07947,504.29716 325.4004,-53.45537"
+         id="path3063"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
-         id="g3389"
-         transform="matrix(0.73523471,-0.32657513,0.67564023,1.0600053,-337.50981,-123.97335)">
+         transform="matrix(8.9245851,3.5096547,-2.1082516,5.3610043,-588.47306,200.34875)"
+         id="g3827-1-3">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#ef2929;stroke:#280000;stroke-width:3.54880524;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-6"
+             d="M -26.118221,5.6643347 A 8.9379793,8.8680774 0 1 1 -12.540634,17.200906 8.9379793,8.8680774 0 1 1 -26.118221,5.6643347 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:3.54880428;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-2"
+             d="m -23.40227,7.9744858 a 5.3439706,5.3025298 0 1 1 8.11794,6.8981452 5.3439706,5.3025298 0 0 1 -8.11794,-6.8981452 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(10.692662,4.2049633,-2.5259361,6.4231205,-113.06345,49.783413)"
+         id="g3827-1-3-9">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5-4">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#ef2929;stroke:#280000;stroke-width:2.96198821;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-6-7"
+             d="M -26.118221,5.6643347 A 8.9379793,8.8680774 0 1 1 -12.540634,17.200906 8.9379793,8.8680774 0 1 1 -26.118221,5.6643347 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-3-2);fill-opacity:1;stroke:#ef2929;stroke-width:2.96198726;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-2-8"
+             d="m -23.855221,7.5904285 a 5.9469691,5.9010977 0 1 1 9.033946,7.6768315 5.9469691,5.9010977 0 0 1 -9.033946,-7.6768315 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(10.692662,4.2049633,-2.5259361,6.4231204,-262.11704,428.80723)"
+         id="g3827-1-3-9-8">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5-4-8">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#ef2929;stroke:#280000;stroke-width:2.96198821;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-6-7-4"
+             d="M -26.118221,5.6643347 A 8.9379793,8.8680774 0 1 1 -12.540634,17.200906 8.9379793,8.8680774 0 1 1 -26.118221,5.6643347 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-3-2-0);fill-opacity:1;stroke:#ef2929;stroke-width:2.96198726;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-2-8-3"
+             d="m -23.855221,7.5904285 a 5.9469691,5.9010977 0 1 1 9.033946,7.6768315 5.9469691,5.9010977 0 0 1 -9.033946,-7.6768315 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(8.9245851,3.5096547,-2.1082517,5.3610043,174.29666,500.02902)"
+         id="g3827-1-3-92">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5-66">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#ef2929;stroke:#280000;stroke-width:3.54880524;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-6-49"
+             d="M -26.118221,5.6643347 A 8.9379793,8.8680774 0 1 1 -12.540634,17.200906 8.9379793,8.8680774 0 1 1 -26.118221,5.6643347 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-3-14);fill-opacity:1;stroke:#ef2929;stroke-width:3.54880428;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-2-5"
+             d="m -23.40227,7.9744858 a 5.3439706,5.3025298 0 1 1 8.11794,6.8981452 5.3439706,5.3025298 0 0 1 -8.11794,-6.8981452 z" />
+        </g>
+      </g>
+      <g
+         id="g3523"
+         transform="matrix(0.96303858,-0.01453533,-0.01453533,0.99428388,14.253648,-38.158671)">
         <path
+           sodipodi:nodetypes="cc"
            inkscape:connector-curvature="0"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m -412,442.9375 0,32.03125 c 141.80798,1.02697 256.5625,110.69004 256.5625,245.6875 0,0.15497 2.6e-4,0.28957 0,0.4375 l 32,0.3125 c 0.0101,-0.96882 0,-1.78116 0,-2.75 0,-152.19427 -129.2711,-275.71874 -288.5625,-275.71875 z"
-           id="path2380" />
+           id="path3347"
+           d="m -464.5106,538.94735 c 173.77747,7.74279 377.963123,88.04019 535.987387,210.78068"
+           style="fill:none;stroke:#2e3436;stroke-width:107.83394623;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:0;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path3347-3"
+           d="m -464.51065,538.94727 c 173.77749,7.74283 377.96312,88.04017 535.987421,210.78076"
+           style="fill:none;stroke:#d3d7cf;stroke-width:53.91697311;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path3347-3-9"
+           d="m -461.01114,530.22413 c 173.7775,7.74283 377.963119,88.04017 535.987427,210.78076"
+           style="fill:none;stroke:#ffffff;stroke-width:26.95848656;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <g
+         transform="matrix(8.9245851,3.5096547,-2.1082517,5.3610043,45.131207,361.70579)"
+         id="g3827-1-3-92-1">
         <g
-           id="g2331"
-           transform="matrix(-0.9996417,0.02676515,-0.02676515,-0.9996417,-201.41759,1361.9423)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5-66-7">
           <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2333"
-             style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:#ef2929;stroke:#280000;stroke-width:3.54880524;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-6-49-2"
+             d="M -26.118221,5.6643347 A 8.9379793,8.8680774 0 1 1 -12.540634,17.200906 8.9379793,8.8680774 0 1 1 -26.118221,5.6643347 z" />
           <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2335"
-             style="fill:url(#radialGradient2370);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-3-14-0);fill-opacity:1;stroke:#ef2929;stroke-width:3.54880428;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-2-5-7"
+             d="m -23.40227,7.9744858 a 5.3439706,5.3025298 0 1 1 8.11794,6.8981452 5.3439706,5.3025298 0 0 1 -8.11794,-6.8981452 z" />
         </g>
+      </g>
+      <g
+         transform="matrix(8.9245851,3.5096547,-2.1082517,5.3610043,-400.00216,186.65402)"
+         id="g3827-1-3-92-0">
         <g
-           id="g2337"
-           transform="matrix(-0.999742,-0.02271351,0.02271351,-0.999742,-228.67433,1114.3337)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5-66-6">
           <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2339"
-             style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:#ef2929;stroke:#280000;stroke-width:3.54880524;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-6-49-1"
+             d="M -26.118221,5.6643347 A 8.9379793,8.8680774 0 1 1 -12.540634,17.200906 8.9379793,8.8680774 0 1 1 -26.118221,5.6643347 z" />
           <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2341"
-             style="fill:url(#radialGradient2368);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g2372"
-           transform="matrix(-0.9996417,0.02676515,-0.02676515,-0.9996417,80.010973,1361.9423)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2374"
-             style="fill:#ff0000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2376"
-             style="fill:url(#radialGradient2378);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-3-14-2);fill-opacity:1;stroke:#ef2929;stroke-width:3.54880428;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-2-5-5"
+             d="m -23.40227,7.9744858 a 5.3439706,5.3025298 0 1 1 8.11794,6.8981452 5.3439706,5.3025298 0 0 1 -8.11794,-6.8981452 z" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Clone.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Clone.svg
index a8aeaf98cd..35bc6dca28 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Clone.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Clone.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48+devel r"
-   sodipodi:docname="Sketcher_Copy_Element_Equal.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Clone.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Sketcher_Copy_Element_1_22px.png"
@@ -184,6 +184,97 @@
          stdDeviation="0.75257812"
          id="feGaussianBlur8296" />
     </filter>
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3091"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3093"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7-6"
+       id="linearGradient3093-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       id="linearGradient3836-9-7-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-5"
+       id="linearGradient3091-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       id="linearGradient3836-9-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-2" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -192,18 +283,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.139678"
-     inkscape:cx="19.883012"
-     inkscape:cy="26.544977"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="11.977976"
+     inkscape:cx="11.156791"
+     inkscape:cy="40.112693"
+     inkscape:current-layer="g3389-6-1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3019"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -212,7 +313,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -221,115 +322,138 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g4913"
-       transform="matrix(0.83956655,0,0,0.83004607,15.662701,11.799389)">
-      <path
-         style="fill:#008900;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.60815412;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 20.434596,5.9054114 C 0.53193393,9.4970192 0.22458061,44.802193 19.114373,55.187532 l 2.311566,-1.914859 C 5.6737228,42.14212 5.7543272,14.220646 21.649787,9.0127444 Z"
-         id="path2380"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <circle
-         transform="matrix(0.02723316,0.09867652,-0.09640808,0.02731828,79.829352,-29.616533)"
-         id="path2374"
-         style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         cx="197.14285"
-         cy="655.2193"
-         r="48.57143"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-      <ellipse
-         transform="matrix(0.0737666,0.06967032,-0.06778387,0.07502926,49.644345,-59.911331)"
-         id="path2376"
-         style="fill:url(#radialGradient3166);fill-opacity:1;stroke:none"
-         cx="225.26402"
-         cy="672.79736"
-         rx="34.345188"
-         ry="23.991123"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.60778022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 49.540743,7.6812595 C 28.779014,11.212066 28.091383,46.336853 50.508819,56.357055 L 52.754817,54.36526 C 33.269275,41.43439 34.10645,16.4053 50.913625,10.692633 Z"
-         id="path2380-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
-      <circle
-         transform="matrix(-0.02682131,-0.09982615,0.09765525,-0.02693812,-37.497841,93.073794)"
-         id="path2374-1"
-         style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         cx="197.14285"
-         cy="655.2193"
-         r="48.57143"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-      <ellipse
-         transform="matrix(-0.07407035,-0.07084847,0.06906165,-0.0753088,-9.5541356,121.19065)"
-         id="path2376-9"
-         style="fill:url(#radialGradient4019);fill-opacity:1;stroke:none"
-         cx="225.26402"
-         cy="672.79736"
-         rx="34.345188"
-         ry="23.991123"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z" />
-      <circle
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path4021"
-         transform="matrix(0.02243113,0.09990701,-0.09763712,0.02240394,109.33184,-26.239796)"
-         cx="197.14285"
-         cy="655.2193"
-         r="48.57143"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-      <ellipse
-         style="fill:url(#radialGradient4025);fill-opacity:1;stroke:none"
-         id="path4023"
-         transform="matrix(0.07032347,0.07329626,-0.07134966,0.07149127,80.367199,-57.312599)"
-         cx="225.26402"
-         cy="672.79736"
-         rx="34.345188"
-         ry="23.991123"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z" />
-      <circle
-         transform="matrix(0.02243113,0.09990701,-0.09763712,0.02240394,109.72993,21.376792)"
-         id="path2339"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         cx="197.14285"
-         cy="655.2193"
-         r="48.57143"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-      <ellipse
-         transform="matrix(0.07032347,0.07329626,-0.07134966,0.07149127,80.765291,-9.6960118)"
-         id="path2341"
-         style="fill:url(#radialGradient4017);fill-opacity:1;stroke:none"
-         cx="225.26402"
-         cy="672.79736"
-         rx="34.345188"
-         ry="23.991123"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z" />
-    </g>
-    <g
-       id="g4908"
-       transform="matrix(0.44838459,0,0,0.30946353,8.8522393,2.8414062)">
-      <path
-         id="rect8223-2"
-         d="m -11.700615,0.74040582 c -0.08746,0 -0.15625,0.03638 -0.15625,0.09375 l 0,12.87500018 c 0,0.05737 0.06879,0.09375 0.15625,0.09375 l 37.84375,0 c 0.08746,0 0.15625,-0.03638 0.15625,-0.09375 l 0,-12.87500018 c 0,-0.05737 -0.06879,-0.09375 -0.15625,-0.09375 l -37.84375,0 z m 0,28.00000018 c -0.08746,0 -0.15625,0.03638 -0.15625,0.09375 l 0,12.875 c 0,0.05737 0.06879,0.09375 0.15625,0.09375 l 37.84375,0 c 0.08746,0 0.15625,-0.03638 0.15625,-0.09375 l 0,-12.875 c 0,-0.05737 -0.06879,-0.09375 -0.15625,-0.09375 l -37.84375,0 z"
-         style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.64629388;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8294);enable-background:accumulate"
-         inkscape:connector-curvature="0" />
-      <rect
-         ry="0.10354951"
-         rx="0.1578715"
-         y="-3.2411418"
-         x="-14.346457"
-         height="13.081475"
-         width="38.183765"
-         id="rect8223"
-         style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.64629388;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         ry="0.10354951"
-         rx="0.1578715"
-         y="24.758862"
-         x="-14.346457"
-         height="13.081475"
-         width="38.183765"
-         id="rect8223-7"
-         style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.64629388;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       id="g3078"
+       transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,153.07645,137.41179)">
+      <g
+         transform="matrix(0.13557529,-0.01099171,-0.01099171,0.13557529,210.0733,-95.348366)"
+         inkscape:export-ydpi="6.7480335"
+         inkscape:export-xdpi="6.7480335"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+         id="g3401-3">
+        <g
+           id="g3389-6">
+          <path
+             sodipodi:nodetypes="ccsccsc"
+             inkscape:connector-curvature="0"
+             id="path2380-7"
+             d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+             style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:14.80067348;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+             inkscape:connector-curvature="0"
+             id="path3892"
+             d="M 10.999999,13 C 32,13 49,32 49,48"
+             style="fill:none;stroke:#ffffff;stroke-width:2.1692903;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+      </g>
+      <g
+         id="g3827-0"
+         transform="translate(148.15755,-34.789876)">
+        <g
+           id="g3797-7"
+           transform="translate(31.322131,40.570289)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0"
+             style="fill:url(#linearGradient3091);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         id="g3797-7-6"
+         transform="translate(152.60306,-23.928397)">
+        <path
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+           id="path4250-6-0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+           id="path4250-7-0-6"
+           style="fill:url(#linearGradient3093);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0.13557529,-0.01099171,-0.01099171,0.13557529,193.9051,-78.991918)"
+         inkscape:export-ydpi="6.7480335"
+         inkscape:export-xdpi="6.7480335"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+         id="g3401-3-9">
+        <g
+           id="g3389-6-1"
+           style="stroke:#172a04">
+          <path
+             sodipodi:nodetypes="ccsccsc"
+             inkscape:connector-curvature="0"
+             id="path2380-7-2"
+             d="m -351.20864,328.76396 0,40.93693 c 141.80801,1.02697 245.62146,96.97838 245.62146,231.97584 0,0.15497 8.932685,-0.46043 8.932425,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19428 -127.266945,-272.91276 -286.558375,-272.91277 z"
+             style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:14.80067348;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3892-7"
+             d="m -337.563,342.40961 c 143.27919,0 259.26711,129.63359 259.26711,238.79867"
+             style="fill:none;stroke:#8ae234;stroke-width:14.80067348;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+          <rect
+             style="color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:14.80067444;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect8223-1"
+             width="95.160355"
+             height="31.634809"
+             x="292.99579"
+             y="-426.19644"
+             rx="0"
+             ry="0"
+             transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+          <rect
+             style="color:#000000;fill:#ef2929;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:14.80067444;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="rect8223-5"
+             width="95.160355"
+             height="31.691975"
+             x="292.99579"
+             y="-345.98621"
+             rx="0"
+             ry="0"
+             transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+        </g>
+      </g>
+      <g
+         id="g3827-0-0"
+         transform="translate(163.7139,-50.346225)">
+        <g
+           id="g3797-7-9"
+           transform="translate(31.322131,40.570289)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-3"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-60"
+             style="fill:url(#linearGradient3091-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         id="g3797-7-6-6"
+         transform="translate(168.15936,-39.484744)">
+        <path
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+           id="path4250-6-0-2"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+           id="path4250-7-0-6-6"
+           style="fill:url(#linearGradient3093-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CloseShape.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CloseShape.svg
index d229e53620..61ee54f0f5 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CloseShape.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CloseShape.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_CloseShape_2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CloseShape.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Sketcher_CloseShape_2_32px.png"
@@ -75,28 +75,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3148"
-       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="radialGradient3150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144-9">
@@ -143,6 +121,104 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3093"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3091"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3175"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3177"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-6"
+       id="linearGradient3175-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       id="linearGradient3836-9-6">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-7" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7-5"
+       id="linearGradient3177-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       id="linearGradient3836-9-7-5">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0-6" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9-2" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -151,18 +227,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="11.424431"
+     inkscape:cx="10.032035"
+     inkscape:cy="12.813977"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3088"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -171,7 +257,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -180,130 +266,147 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g3141"
-       transform="matrix(-0.13844829,-0.72831269,0.68946143,-0.14624987,-5.6849025,67.003886)">
+       id="g3162"
+       transform="translate(-0.75509507,-1.9999551)">
+      <g
+         id="g3401-3"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+         inkscape:export-xdpi="6.7480335"
+         inkscape:export-ydpi="6.7480335"
+         transform="matrix(-0.10363852,-0.08809389,0.10363852,-0.08809389,-98.88928,58.289011)">
+        <g
+           id="g3389-6">
+          <path
+             style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:14.80067348;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+             id="path2380-7"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccsccsc" />
+          <path
+             style="fill:none;stroke:#ffffff;stroke-width:2.1692903;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 10.999999,13 C 32,13 49,32 49,48"
+             id="path3892"
+             inkscape:connector-curvature="0"
+             transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+             sodipodi:nodetypes="cc" />
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,-12.28691,59.248739)"
+         id="g3827-0">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-7">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-6"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3175);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-0"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,-7.750135,48.425063)"
+         id="g3797-7-6">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-0"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3177);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       id="g3162-9"
+       transform="translate(37.244905,-5.9999548)">
       <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.61441571;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 18.109899,6.5157019 C -1.6618131,8.1579325 -3.5213716,42.946402 14.424113,55.216057 l 2.469423,-1.78125 C 0.84250639,39.314777 2.4402059,12.94537 19.213817,9.6501215 z"
-         transform="matrix(-0.27996216,1.3941893,-1.3198173,-0.26502781,86.841333,25.683723)"
-         id="path2380"
+         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 98,12 0,40"
+         id="path3254"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         transform="translate(-83.244905,5.9999548)" />
       <path
-         transform="matrix(-0.14652919,-0.00332905,0.00332905,-0.14652919,34.206307,132.54732)"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2339"
-         style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
+         style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.755095,17.999955 0,40"
+         id="path3254-1"
+         inkscape:connector-curvature="0" />
       <path
-         transform="matrix(-0.12648731,0.07404623,-0.07404623,-0.12648731,87.529758,102.36056)"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2341"
-         style="fill:url(#radialGradient3148);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,102.32449,146.9761)"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2374"
-         style="fill:#008900;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.12266988,0.08021211,-0.08021211,-0.12266988,154.9986,114.78251)"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2376"
-         style="fill:url(#radialGradient3150);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-    </g>
-    <rect
-       ry="0"
-       transform="matrix(0.98770354,0.15633846,0.00139872,0.99999902,0,0)"
-       y="2.4981198"
-       x="53.430199"
-       height="42.019638"
-       width="3.4154592"
-       id="rect2269"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.66605568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       id="g3865"
-       transform="matrix(-0.07817104,0.07348351,-0.08311112,-0.07763103,123.98813,50.0557)">
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 13.755095,17.999955 0,40"
+         id="path3254-1-8"
+         inkscape:connector-curvature="0" />
       <g
-         id="g3867">
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,-13.531822,63.26068)"
+         id="g3827-0-9">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-7-3">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-6-6"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3175-3);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-0-0"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,-6.9923863,52.425063)"
+         id="g3797-7-6-6">
         <path
-           transform="translate(-31.043012,30.173819)"
-           sodipodi:type="arc"
-           style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path3869"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-0-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
         <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3306);fill-opacity:1;stroke:none"
-           id="path3871"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-378.52976,249.75771)" />
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3177-3);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-6-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
     <g
-       id="g3865-3"
-       transform="matrix(-0.07817103,0.07348352,-0.08311111,-0.07763103,124.6718,85.622368)">
-      <g
-         id="g3867-3">
-        <path
-           transform="translate(45.992573,-44.234787)"
-           sodipodi:type="arc"
-           style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path3869-0"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3308);fill-opacity:1;stroke:none"
-           id="path3871-4"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-302.10009,177.574)" />
-      </g>
+       id="g4062"
+       transform="translate(-54,4)">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path4102-2"
+         d="m 77,38 8,-7 0,4 12,0 0,6 -12,0 0,4 z"
+         style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4060"
+         d="m 80,38 3,-2.6 0,1.6 12,0"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4062-7"
+       transform="translate(-54,-16)">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path4102-2-9"
+         d="m 77,38 8,-7 0,4 12,0 0,6 -12,0 0,4 z"
+         style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4060-2"
+         d="m 80,38 3,-2.6 0,1.6 12,0"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
-    <path
-       style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:0.99310744px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 26.253957,21.134758 6.873603,-4.861905 0.167649,3.695048 12.238367,-0.194476 -0.167649,3.889524 -12.070718,0 0,3.889524 z"
-       id="path4102"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:1.02421761px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 26.774293,44.0078 6.992156,-5.083605 0.17054,3.863539 12.449449,-0.203344 -0.17054,4.066885 -12.278909,0 0,4.066884 z"
-       id="path4102-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics.svg
index 7fbd83ee9d..9066aba4f6 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics.svg
@@ -15,12 +15,24 @@
    height="64px"
    id="svg2943"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Conics_5.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Conics.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2945">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
     <linearGradient
        id="linearGradient4349">
       <stop
@@ -191,6 +203,77 @@
          offset="1"
          id="stop3148-5" />
     </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="radialGradient3815"
+       cx="225.93762"
+       cy="91.956673"
+       fx="225.93762"
+       fy="91.956673"
+       r="22"
+       gradientTransform="matrix(-1.4090915,3.8636359,-0.97565325,-0.35582669,693.7938,-749.33348)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3444"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.90206746,0,0,0.90216902,-1.9060863,1.1084289)" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3444-3"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -199,18 +282,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.1640625"
-     inkscape:cx="41.705239"
-     inkscape:cy="39.822714"
-     inkscape:current-layer="g3629"
+     inkscape:zoom="5.7122157"
+     inkscape:cx="-9.9614691"
+     inkscape:cy="41.564735"
+     inkscape:current-layer="g3797-7-2-3"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3037"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2948">
     <rdf:RDF>
@@ -231,108 +324,62 @@
        id="g3629"
        transform="translate(-256.70919,-66.886588)">
       <path
-         style="fill:url(#radialGradient3845);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4355);stroke-width:2.20000005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 267.98699,121.8673 c 4.91575,6.46856 15.52726,6.06628 21.21875,6.09375 11.73127,0 21.24999,-2.55045 21.25,-5.71875 l -20.4742,-50.560459 z"
-         id="path3596"
+         style="fill:url(#radialGradient3815);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+         d="m 289.70919,69.886588 -22,52.000002 c 0,8 42,8 42,0 z"
+         id="path3039"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         sodipodi:nodetypes="cccc" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 289.70919,74.886588 -20,47.000002 c 3,6 35,6 38,0 z"
+         id="path3817"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 302.70919,92.886588 c -5.57026,18.746562 -16.6962,22.144412 -32,14.000002"
+         id="path3880"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 302.70919,92.886588 c -5.57026,18.746562 -16.6962,22.144412 -32,14.000002"
+         id="path3880-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 301.70919,92.886588 c -5.57026,18.746562 -16,20.000002 -31,13.000002"
+         id="path3880-2-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
-         id="g3843"
-         transform="matrix(0.69633392,-0.27857604,0.26283369,0.62280151,24.857559,138.81593)">
+         transform="matrix(0.79185382,0,0,0.79171708,316.01471,85.835245)"
+         id="g3797-7-2">
         <path
-           sodipodi:nodetypes="czcczcc"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.74503344;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 358.74181,89.233527 C 354.59033,99.48946 350.7963,102.12 344.50118,103.19587 c -6.29511,1.07587 -18.38475,-5.885542 -21.58785,-15.702998 l -8.31768,6.422397 c 3.66154,9.784971 19.4164,21.495111 30.12663,19.682391 10.71023,-1.81271 18.83506,-8.25879 22.73739,-23.04933 z"
-           id="path4425"
-           inkscape:connector-curvature="0" />
-        <g
-           transform="matrix(0.08806295,-0.10203428,0.10097426,0.08687082,168.6017,265.32163)"
-           id="g3800-6">
-          <g
-             id="g3778-7"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780-2">
-              <g
-                 id="g3784-5"
-                 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="g3790-2"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792-8"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc"
-                   transform="translate(-16.428779,46.931096)" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-355.1257,261.12438)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794-5"
-                   style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           id="g3019"
-           transform="matrix(0.08806295,-0.10203428,0.10097426,0.08687082,210.77553,266.7111)">
-          <g
-             transform="translate(-10.941933,-540.84412)"
-             id="g3021">
-            <g
-               id="g3023">
-              <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="g3025" />
-              <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="g3027">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   transform="translate(-45.763528,57.48102)" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-384.46045,271.67429)" />
-              </g>
-            </g>
-          </g>
-        </g>
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.52593684;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9"
+           d="M -26.040488,5.6841521 A 8.8376452,8.8366785 89.991482 1 1 -12.616786,17.181135 8.8376452,8.8366785 89.991482 1 1 -26.040488,5.6841521 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3444);fill-opacity:1;stroke:#ef2929;stroke-width:2.52593613;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1"
+           d="m -24.127244,7.3276105 a 6.3144719,6.3151833 0 1 1 9.592213,8.2155225 6.3144719,6.3151833 0 0 1 -9.592213,-8.2155225 z" />
+      </g>
+      <g
+         transform="matrix(0.80022968,0,0,0.80021786,228.17363,99.738151)"
+         id="g3797-7-2-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930072;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M 49.011949,5.7450981 A 8.7441901,8.743766 0.01920999 1 1 62.295154,17.119951 8.7441901,8.743766 0.01920999 1 1 49.011949,5.7450981 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3857);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930024;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="m 50.905481,7.3707415 a 6.2483828,6.2480927 0 1 1 9.49182,8.1282445 6.2483828,6.2480927 0 0 1 -9.49182,-8.1282445 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Constr.svg
index e203455481..978610a4a5 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Constr.svg
@@ -15,12 +15,24 @@
    height="64px"
    id="svg2943"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_Conics_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Conics.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2945">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
     <linearGradient
        id="linearGradient4349">
       <stop
@@ -191,6 +203,77 @@
          offset="1"
          id="stop3148-5" />
     </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="radialGradient3815"
+       cx="225.93762"
+       cy="91.956673"
+       fx="225.93762"
+       fy="91.956673"
+       r="22"
+       gradientTransform="matrix(-1.4090915,3.8636359,-0.97565325,-0.35582669,693.7938,-749.33348)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3444"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.90206746,0,0,0.90216902,-1.9060863,1.1084289)" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3444-3"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -199,18 +282,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="19.214539"
-     inkscape:cx="32.935838"
-     inkscape:cy="25.250415"
+     inkscape:zoom="4.0391464"
+     inkscape:cx="20.782476"
+     inkscape:cy="45.951159"
      inkscape:current-layer="g3629"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3037"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2948">
     <rdf:RDF>
@@ -231,94 +324,62 @@
        id="g3629"
        transform="translate(-256.70919,-66.886588)">
       <path
-         style="fill:url(#radialGradient3845);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4355);stroke-width:2.20000005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 267.98699,121.8673 c 4.91575,6.46856 15.52726,6.06628 21.21875,6.09375 11.73127,0 21.24999,-2.55045 21.25,-5.71875 l -20.4742,-50.560459 z"
-         id="path3596"
+         style="fill:url(#radialGradient3815);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+         d="m 289.70919,69.886588 -22,52.000002 c 0,8 42,8 42,0 z"
+         id="path3039"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         sodipodi:nodetypes="cccc" />
       <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 289.70919,74.886588 -20,47.000002 c 3,6 35,6 38,0 z"
+         id="path3817"
          inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 298.11523,94.453833 c -0.19521,7.543917 -2.14573,10.239147 -6.24646,12.662867 -4.10073,2.42372 -14.34885,1.45603 -19.15963,-3.76599 l -4.10386,6.31698 c 5.12147,5.07408 19.16994,7.97824 26.15139,3.86567 6.98145,-4.11258 10.9448,-10.39059 9.77467,-20.689253 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.5304392;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
+         sodipodi:nodetypes="cccc" />
+      <path
+         style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 302.70919,92.886588 c -5.57026,18.746562 -16.6962,22.144412 -32,14.000002"
+         id="path3880"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#3465a4;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 302.70919,92.886588 c -5.57026,18.746562 -16.6962,22.144412 -32,14.000002"
+         id="path3880-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 301.70919,92.886588 c -5.57026,18.746562 -16,20.000002 -31,13.000002"
+         id="path3880-2-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
-         id="g3800-6"
-         transform="matrix(0.03450317,-0.08807933,0.09314438,0.02597427,211.9961,257.09025)">
-        <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">
-              <circle
-                 r="48.57143"
-                 cy="655.2193"
-                 cx="197.14285"
-                 transform="translate(-16.428779,46.931096)"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                 id="path3792-8" />
-              <ellipse
-                 ry="23.991123"
-                 rx="34.345188"
-                 cy="672.79736"
-                 cx="225.26402"
-                 style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-355.1257,261.12438)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(0.79185382,0,0,0.79171708,316.01471,85.835245)"
+         id="g3797-7-2">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.52593684;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9"
+           d="M -26.040488,5.6841521 A 8.8376452,8.8366785 89.991482 1 1 -12.616786,17.181135 8.8376452,8.8366785 89.991482 1 1 -26.040488,5.6841521 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3444);fill-opacity:1;stroke:#ef2929;stroke-width:2.52593613;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1"
+           d="m -24.127244,7.3276105 a 6.3144719,6.3151833 0 1 1 9.592213,8.2155225 6.3144719,6.3151833 0 0 1 -9.592213,-8.2155225 z" />
       </g>
       <g
-         transform="matrix(0.03450317,-0.08807933,0.09314438,0.02597427,241.72837,246.20699)"
-         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">
-              <circle
-                 r="48.57143"
-                 cy="655.2193"
-                 cx="197.14285"
-                 transform="translate(-45.763528,57.48102)"
-                 id="path3029"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-              <ellipse
-                 ry="23.991123"
-                 rx="34.345188"
-                 cy="672.79736"
-                 cx="225.26402"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-384.46045,271.67429)"
-                 id="path3031"
-                 style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(0.80022968,0,0,0.80021786,228.17363,99.738151)"
+         id="g3797-7-2-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930072;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M 49.011949,5.7450981 A 8.7441901,8.743766 0.01920999 1 1 62.295154,17.119951 8.7441901,8.743766 0.01920999 1 1 49.011949,5.7450981 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3857);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930024;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="m 50.905481,7.3707415 a 6.2483828,6.2480927 0 1 1 9.49182,8.1282445 6.2483828,6.2480927 0 0 1 -9.49182,-8.1282445 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_3points.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_3points.svg
index a02cd33179..b0f44e3ae2 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_3points.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_3points.svg
@@ -15,12 +15,36 @@
    height="64px"
    id="svg2943"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Conics_6.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Conics_Ellipse_3points.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2945">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4104">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop4106" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4108" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4096">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop4098" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop4100" />
+    </linearGradient>
     <linearGradient
        id="linearGradient4349">
       <stop
@@ -224,6 +248,256 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,228.50562,100.71253)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3444"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.90206746,0,0,0.90216902,-1.9060863,1.1084289)" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3809"
+       id="radialGradient3815"
+       cx="225.93762"
+       cy="91.956673"
+       fx="225.93762"
+       fy="91.956673"
+       r="22"
+       gradientTransform="matrix(-1.4090915,3.8636359,-0.97565325,-0.35582669,693.7938,-749.33348)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
+    <radialGradient
+       r="22"
+       fy="91.956673"
+       fx="225.93762"
+       cy="91.956673"
+       cx="225.93762"
+       gradientTransform="matrix(-1.7064667,4.6731721,-1.1815555,-0.43038201,776.9032,-933.08315)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3163"
+       xlink:href="#linearGradient3809"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4096"
+       id="linearGradient4102"
+       x1="-24.035076"
+       y1="16.85112"
+       x2="-23.821426"
+       y2="7.2881389"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4104"
+       id="linearGradient4110"
+       x1="-23.070524"
+       y1="18.383886"
+       x2="-24.194258"
+       y2="6.534451"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857-6"
+       xlink:href="#linearGradient3836-9-3-6-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.86505337,0,0,0.86391944,316.35916,68.050415)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-9" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857-2"
+       xlink:href="#linearGradient3836-9-3-6-7"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.86505337,0,0,0.86391944,286.08124,87.815567)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857-0"
+       xlink:href="#linearGradient3836-9-3-6-6"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.86505337,0,0,0.86391944,293.34714,68.463135)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857-7"
+       xlink:href="#linearGradient3836-9-3-6-9"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-20" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-9"
+       id="linearGradient4216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-9-7"
+       id="linearGradient4216-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-20-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-2-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4235"
+       xlink:href="#linearGradient3836-9-3-6-9-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-9-73"
+       id="linearGradient4216-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-9-73">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-20-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-2-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4235-2"
+       xlink:href="#linearGradient3836-9-3-6-9-73"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -232,18 +506,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="11.619973"
-     inkscape:cy="32"
+     inkscape:zoom="4.3586504"
+     inkscape:cx="70.149128"
+     inkscape:cy="26.508425"
      inkscape:current-layer="g3629"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     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="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3216"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2948">
     <rdf:RDF>
@@ -264,147 +549,98 @@
        id="g3629"
        transform="translate(-256.70919,-66.886588)">
       <path
-         style="fill:url(#radialGradient3845);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4355);stroke-width:2.7991128;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 264.39301,118.58909 c 5.86982,8.76937 18.54084,8.22401 25.33695,8.26125 14.00811,0 25.37425,-3.45763 25.37426,-7.75287 L 303.93478,77.281555 290.2689,79.9307 275.33456,84.489974 z"
-         id="path3596"
+         style="fill:url(#radialGradient3163);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+         d="M 274.21896,89.233383 260.89752,120.6811 c 0,9.67621 50.8637,9.67621 50.8637,0 L 296.01769,79.557159 z"
+         id="path3039"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
+         sodipodi:nodetypes="ccccc" />
       <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.74169803;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 285.06661,78.115972 c -11.04581,4.488122 -18.7004,11.812372 -17.08887,16.359613 1.61152,4.547241 11.87702,4.59022 22.92283,0.102094 11.04581,-4.488126 18.7004,-11.812375 17.08887,-16.359612 -1.61152,-4.547237 -11.87702,-4.590217 -22.92283,-0.102095 z m 1.04659,5.339082 c 6.7403,-2.738715 12.6992,-3.53456 13.32694,-1.763245 0.62775,1.771315 -4.31476,5.435097 -11.05507,8.173809 -6.74031,2.738714 -12.70855,3.508188 -13.3363,1.736871 -0.62774,-1.771318 4.32411,-5.40872 11.06443,-8.147435 z"
-         id="path3060"
-         inkscape:connector-curvature="0" />
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 276.03552,91.047666 -13.01633,29.933924 c 3.63312,7.25716 43.08687,7.15716 46.72,-0.1 L 294.56445,82.701929 z"
+         id="path3817"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#729fcf;fill-opacity:1;stroke:#0b1521;stroke-width:1.75720227;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         id="path3218"
+         sodipodi:cx="-23.5"
+         sodipodi:cy="12.5"
+         sodipodi:rx="11.5"
+         sodipodi:ry="5.5"
+         d="m -12,12.5 a 11.5,5.5 0 1 1 -23,0 11.5,5.5 0 1 1 23,0 z"
+         transform="matrix(0.95227492,-0.61978696,0.52253356,1.020271,300.53972,58.891531)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:#2e3436;stroke-width:6.85537624;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         id="path3218-5"
+         sodipodi:cx="-23.5"
+         sodipodi:cy="12.5"
+         sodipodi:rx="11.5"
+         sodipodi:ry="5.5"
+         d="m -12,12.5 a 11.5,5.5 0 1 1 -23,0 11.5,5.5 0 1 1 23,0 z"
+         transform="matrix(1.0090541,-0.61488104,0.55368951,1.0121951,301.50084,58.784445)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:url(#linearGradient4110);stroke-width:1.49276698;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         id="path3218-5-3"
+         sodipodi:cx="-23.5"
+         sodipodi:cy="12.5"
+         sodipodi:rx="10.839503"
+         sodipodi:ry="5.5"
+         d="m -12.660497,12.5 a 10.839503,5.5 0 1 1 -21.679006,0 10.839503,5.5 0 1 1 21.679006,0 z"
+         transform="matrix(1.1550777,-0.70803185,0.63381582,1.1655366,303.93082,54.678632)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:url(#linearGradient4102);stroke-width:1.78893459;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         id="path3218-5-3-5"
+         sodipodi:cx="-23.5"
+         sodipodi:cy="12.5"
+         sodipodi:rx="11.171144"
+         sodipodi:ry="4.8580894"
+         d="m -12.328856,12.5 a 11.171144,4.8580894 0 1 1 -22.342288,0 11.171144,4.8580894 0 1 1 22.342288,0 z"
+         transform="matrix(0.96448702,-0.62261347,0.62745834,0.89086093,299.53141,60.11941)" />
       <g
-         transform="matrix(0.03450317,-0.08807933,0.09314438,0.02597427,244.64854,231.68735)"
-         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">
-              <path
-                 transform="translate(-45.763528,57.48102)"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-384.46045,271.67429)"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3846);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
+         id="g4212"
+         transform="translate(25.004544,15.006366)">
+        <path
+           d="m 240.39202,75.332654 a 6.9973616,6.9969189 0.01472547 1 1 10.62962,9.102361 6.9973616,6.9969189 0.01472547 0 1 -10.62962,-9.102361 z"
+           id="path4250-6-9-5"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 241.90729,76.633523 a 5.0001414,4.9998354 0 1 1 7.59563,6.504367 5.0001414,4.9998354 0 0 1 -7.59563,-6.504367 z"
+           id="path4250-7-0-1-6"
+           style="fill:url(#linearGradient4216);fill-opacity:1;stroke:#ef2929;stroke-width:1.9999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
       </g>
       <g
-         id="g3800-6"
-         transform="matrix(0.03450317,-0.08807933,0.09314438,0.02597427,211.59053,242.48949)">
-        <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">
-              <path
-                 transform="translate(-16.428779,46.931096)"
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient3848);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-355.1257,261.12438)" />
-            </g>
-          </g>
-        </g>
+         id="g4212-2"
+         transform="translate(53.004544,-2.9997967)">
+        <path
+           d="m 240.39202,75.332654 a 6.9973616,6.9969189 0.01472547 1 1 10.62962,9.102361 6.9973616,6.9969189 0.01472547 0 1 -10.62962,-9.102361 z"
+           id="path4250-6-9-5-2"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 241.90729,76.633523 a 5.0001414,4.9998354 0 1 1 7.59563,6.504367 5.0001414,4.9998354 0 0 1 -7.59563,-6.504367 z"
+           id="path4250-7-0-1-6-8"
+           style="fill:url(#linearGradient4235);fill-opacity:1;stroke:#ef2929;stroke-width:1.9999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
       </g>
       <g
-         transform="matrix(0.03450317,-0.08807933,0.09314438,0.02597427,226.02906,229.8355)"
-         id="g3850">
-        <g
-           id="g3852"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g3854">
-            <g
-               id="g3856"
-               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="g3858"
-               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">
-              <path
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3860"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc"
-                 transform="translate(-16.428779,46.931096)" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-355.1257,261.12438)"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3862"
-                 style="fill:url(#radialGradient3864);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
+         id="g4212-9"
+         transform="translate(34.999267,-0.99363438)">
+        <path
+           d="m 240.39202,75.332654 a 6.9973616,6.9969189 0.01472547 1 1 10.62962,9.102361 6.9973616,6.9969189 0.01472547 0 1 -10.62962,-9.102361 z"
+           id="path4250-6-9-5-3"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 241.90729,76.633523 a 5.0001414,4.9998354 0 1 1 7.59563,6.504367 5.0001414,4.9998354 0 0 1 -7.59563,-6.504367 z"
+           id="path4250-7-0-1-6-1"
+           style="fill:url(#linearGradient4235-2);fill-opacity:1;stroke:#ef2929;stroke-width:1.9999994;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_Center.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_Center.svg
index 2a15f272a5..9f0803b2bb 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_Center.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_Center.svg
@@ -15,12 +15,60 @@
    height="64px"
    id="svg2943"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Conics_7.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Conics_Ellipse_3points.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2945">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4341">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop4343" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4345" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4333">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop4335" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop4337" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4104">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1;"
+         offset="0"
+         id="stop4106" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4108" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4096">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop4098" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop4100" />
+    </linearGradient>
     <linearGradient
        id="linearGradient4349">
       <stop
@@ -124,27 +172,6 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2951" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="radialGradient3845"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1056557,0.54460886,-0.88827217,2.6774851,69.142796,-330.18181)"
-       cx="271.96695"
-       cy="103.54697"
-       fx="271.96695"
-       fy="103.54697"
-       r="19.467436" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4349"
-       id="linearGradient4355"
-       x1="6.6594167"
-       y1="3.8183174"
-       x2="61.419407"
-       y2="48.560249"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1925777,0,0,1.4531471,257.94033,38.505991)" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144"
@@ -191,39 +218,307 @@
          offset="1"
          id="stop3148-5" />
     </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
     <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3846"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       xlink:href="#linearGradient3809"
+       id="radialGradient3815"
+       cx="225.93762"
+       cy="91.956673"
+       fx="225.93762"
+       fy="91.956673"
+       r="22"
+       gradientTransform="matrix(-1.4090915,3.8636359,-0.97565325,-0.35582669,693.7938,-749.33348)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3848"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3809">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3811" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop3813" />
+    </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3864"
+       r="22"
+       fy="91.956673"
+       fx="225.93762"
+       cy="91.956673"
+       cx="225.93762"
+       gradientTransform="matrix(-1.7064667,4.6731721,-1.1815555,-0.43038201,776.9032,-933.08315)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="radialGradient3163"
+       xlink:href="#linearGradient3809"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4096"
+       id="linearGradient4102"
+       x1="-24.035076"
+       y1="16.85112"
+       x2="-23.821426"
+       y2="7.2881389"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4104"
+       id="linearGradient4110"
+       x1="-23.070524"
+       y1="18.383886"
+       x2="-24.194258"
+       y2="6.534451"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-9" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3-6-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3-6-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3-6-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-20" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-9"
+       id="linearGradient4216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-9-7"
+       id="linearGradient4216-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-20-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-2-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4235"
+       xlink:href="#linearGradient3836-9-3-6-9-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-9-73"
+       id="linearGradient4216-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-9-73">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-20-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-2-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.65313239,0,0,0.65304994,258.31758,72.40809)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4235-2"
+       xlink:href="#linearGradient3836-9-3-6-9-73"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4333"
+       id="linearGradient4339"
+       x1="-21.141161"
+       y1="17.489555"
+       x2="-24.733845"
+       y2="7.0083036"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4341"
+       id="linearGradient4347"
+       x1="-21.31983"
+       y1="18.008659"
+       x2="-24.907471"
+       y2="6.9377007"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-9-4"
+       id="linearGradient4216-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-9-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-20-50" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-2-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.71430595,0,0,0.71426219,259.5032,71.709694)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4366"
+       xlink:href="#linearGradient3836-9-3-6-9-4"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.65313239,0,0,0.65304994,258.31758,72.40809)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4235-2-6"
+       xlink:href="#linearGradient3836-9-3-6-9-73-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-9-73-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-20-6-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-2-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.65313239,0,0,0.65304994,258.31758,72.40809)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4406"
+       xlink:href="#linearGradient3836-9-3-6-9-73-3"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.65313239,0,0,0.65304994,258.31758,72.40809)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4235-2-5"
+       xlink:href="#linearGradient3836-9-3-6-9-73-4"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-9-73-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-20-6-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-2-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.65313239,0,0,0.65304994,258.31758,72.40809)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4406-5"
+       xlink:href="#linearGradient3836-9-3-6-9-73-4"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -232,18 +527,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="6.1640625"
+     inkscape:cx="47.313439"
+     inkscape:cy="31.699123"
      inkscape:current-layer="g3629"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     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="false"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3216"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2948">
     <rdf:RDF>
@@ -252,7 +558,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -264,148 +570,98 @@
        id="g3629"
        transform="translate(-256.70919,-66.886588)">
       <path
-         style="fill:url(#radialGradient3845);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4355);stroke-width:2.89614844;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 264.42497,117.92955 c 5.86242,9.39977 18.51747,9.95081 25.30501,9.99073 13.99046,0 25.34227,-4.8418 25.34228,-9.4458 l -11.15536,-44.821901 -13.64866,0.665922 -14.91551,7.060682 z"
-         id="path3596"
+         style="fill:url(#radialGradient3163);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+         d="M 274.21896,89.233383 260.89752,120.6811 c 0,9.67621 50.8637,9.67621 50.8637,0 L 296.01769,79.557159 z"
+         id="path3039"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
+         sodipodi:nodetypes="ccccc" />
       <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.98889905;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="m 280.77882,74.707151 c -10.06788,6.723415 -13.99872,16.551951 -10.15713,24.132216 3.84157,7.580273 13.65651,7.947303 23.72441,1.223883 10.06788,-6.723427 15.68225,-17.060019 11.84067,-24.640282 -3.84157,-7.58026 -15.34007,-7.43923 -25.40795,-0.715817 z m 3.32947,6.214912 c 6.14355,-4.102724 13.06478,-3.6114 14.56121,-0.658613 1.49645,2.95278 -1.60765,9.394669 -7.75121,13.497385 -6.14357,4.102717 -12.38656,3.845559 -13.88299,0.892762 -1.49638,-2.952828 0.9294,-9.628811 7.07299,-13.731534 z"
-         id="path3060"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 275.73519,91.047666 -12.716,29.933924 c 3.63312,7.25716 43.08687,7.15716 46.72,-0.1 l -14.775,-38.179661 z"
+         id="path3817"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssssssscs" />
+         sodipodi:nodetypes="ccccc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#729fcf;fill-opacity:1;stroke:#0b1521;stroke-width:1.2290616;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         id="path3218"
+         sodipodi:cx="-23.5"
+         sodipodi:cy="12.5"
+         sodipodi:rx="11.5"
+         sodipodi:ry="5.5"
+         d="m -12,12.5 a 11.5,5.5 0 1 1 -23,0 11.5,5.5 0 1 1 23,0 z"
+         transform="matrix(1.1772298,-1.0248017,0.64597109,1.6869918,303.29945,47.71635)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:#2e3436;stroke-width:4.59872532;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none"
+         id="path3218-9"
+         sodipodi:cx="-23.5"
+         sodipodi:cy="12.5"
+         sodipodi:rx="11.5"
+         sodipodi:ry="5.5"
+         d="m -12,12.5 a 11.5,5.5 0 1 1 -23,0 11.5,5.5 0 1 1 23,0 z"
+         transform="matrix(1.261318,-1.0931218,0.69211206,1.7994579,304.69876,44.705001)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:url(#linearGradient4347);stroke-width:1.07993746000000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:none"
+         id="path3218-9-4"
+         sodipodi:cx="-23.5"
+         sodipodi:cy="12.5"
+         sodipodi:rx="11.5"
+         sodipodi:ry="5.5"
+         d="m -12,12.5 a 11.5,5.5 0 1 1 -23,0 11.5,5.5 0 1 1 23,0 z"
+         transform="matrix(1.3454059,-1.1614419,0.73825291,1.9119242,306.09807,41.69365)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:url(#linearGradient4339);stroke-width:1.22906113000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:none"
+         id="path3218-9-4-7"
+         sodipodi:cx="-23.5"
+         sodipodi:cy="12.5"
+         sodipodi:rx="11.932256"
+         sodipodi:ry="5.2261062"
+         d="m -11.567744,12.5 a 11.932256,5.2261062 0 1 1 -23.864512,0 11.932256,5.2261062 0 1 1 23.864512,0 z"
+         transform="matrix(1.1772299,-1.0248017,0.64597111,1.6869919,303.29945,47.71635)" />
       <g
-         transform="matrix(0.03445968,-0.09441101,0.09302697,0.02784146,241.86768,239.49465)"
-         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">
-              <path
-                 transform="translate(-45.763528,57.48102)"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-384.46045,271.67429)"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3846);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
+         id="g4212-9"
+         transform="matrix(0.87495874,0,0,0.87495184,68.728484,23.995164)">
+        <path
+           d="m 240.49566,75.419368 a 6.8577845,6.8572426 89.988209 0 1 10.41677,8.921356 6.8577845,6.8572426 89.988209 1 1 -10.41677,-8.921356 z"
+           id="path4250-6-9-5-3"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.28583097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 242.22859,76.909947 a 4.5719265,4.5713496 0 1 1 6.94513,5.946943 4.5719265,4.5713496 0 0 1 -6.94513,-5.946943 z"
+           id="path4250-7-0-1-6-1"
+           style="fill:url(#linearGradient4235-2);fill-opacity:1;stroke:#ef2929;stroke-width:2.2858305;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
       </g>
       <g
-         id="g3800-6"
-         transform="matrix(0.03445968,-0.09441101,0.09302697,0.02784146,228.61874,247.16552)">
-        <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">
-              <path
-                 transform="translate(-16.428779,46.931096)"
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient3848);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-355.1257,261.12438)" />
-            </g>
-          </g>
-        </g>
+         id="g4212-9-6"
+         transform="matrix(0.87495874,0,0,0.87495184,60.728093,13.995164)">
+        <path
+           d="m 240.49566,75.419368 a 6.8577845,6.8572426 89.988209 0 1 10.41677,8.921356 6.8577845,6.8572426 89.988209 1 1 -10.41677,-8.921356 z"
+           id="path4250-6-9-5-3-1"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.28583097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 242.22859,76.909947 a 4.5719265,4.5713496 0 1 1 6.94513,5.946943 4.5719265,4.5713496 0 0 1 -6.94513,-5.946943 z"
+           id="path4250-7-0-1-6-1-5"
+           style="fill:url(#linearGradient4406);fill-opacity:1;stroke:#ef2929;stroke-width:2.2858305;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
       </g>
       <g
-         transform="matrix(0.03445968,-0.09441101,0.09302697,0.02784146,222.46043,238.10559)"
-         id="g3850">
-        <g
-           id="g3852"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g3854">
-            <g
-               id="g3856"
-               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="g3858"
-               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">
-              <path
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3860"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc"
-                 transform="translate(-16.428779,46.931096)" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-355.1257,261.12438)"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3862"
-                 style="fill:url(#radialGradient3864);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
+         id="g4212-9-69"
+         transform="matrix(0.87495874,0,0,0.87495184,82.728484,7.9951636)">
+        <path
+           d="m 240.49566,75.419368 a 6.8577845,6.8572426 89.988209 0 1 10.41677,8.921356 6.8577845,6.8572426 89.988209 1 1 -10.41677,-8.921356 z"
+           id="path4250-6-9-5-3-3"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.28583097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m 242.22859,76.909947 a 4.5719265,4.5713496 0 1 1 6.94513,5.946943 4.5719265,4.5713496 0 0 1 -6.94513,-5.946943 z"
+           id="path4250-7-0-1-6-1-7"
+           style="fill:url(#linearGradient4406-5);fill-opacity:1;stroke:#ef2929;stroke-width:2.2858305;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConnectLines.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConnectLines.svg
index 3975a8a831..fdaa5c0883 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConnectLines.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConnectLines.svg
@@ -14,15 +14,26 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_ConnectLines_3.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CloseShape.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Sketcher_ConnectLines_3_32px.png"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Sketcher_CloseShape_2_32px.png"
    inkscape:export-xdpi="45"
    inkscape:export-ydpi="45">
   <defs
      id="defs2871">
+    <linearGradient
+       id="linearGradient4090">
+      <stop
+         id="stop4092"
+         offset="0"
+         style="stop-color:#a40000;stop-opacity:1" />
+      <stop
+         id="stop4094"
+         offset="1"
+         style="stop-color:#ef2929;stop-opacity:1" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -75,74 +86,86 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3148"
-       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="radialGradient3150"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-9">
+       id="linearGradient3836-9-7">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#4e9a06;stop-opacity:1"
          offset="0"
-         id="stop3146-2" />
+         id="stop3838-8-0" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#8ae234;stop-opacity:1"
          offset="1"
-         id="stop3148-6" />
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-9-6">
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3175"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4090"
+       id="linearGradient3177"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-6"
+       id="linearGradient3175-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       id="linearGradient3836-9-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#4e9a06;stop-opacity:1"
          offset="0"
-         id="stop3146-2-9" />
+         id="stop3838-8-7" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#8ae234;stop-opacity:1"
          offset="1"
-         id="stop3148-6-5" />
+         id="stop3840-1-5" />
     </linearGradient>
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-9"
-       id="radialGradient3306"
+       xlink:href="#linearGradient3836-9-7-5"
+       id="linearGradient3177-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9-6"
-       id="radialGradient3308"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       id="linearGradient3836-9-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9-2" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -151,18 +174,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="5.7122157"
+     inkscape:cx="-1.0912904"
+     inkscape:cy="28.658388"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3088"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -180,124 +213,130 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g3141"
-       transform="matrix(-0.13844829,-0.72831269,0.68946143,-0.14624987,-5.6849025,67.003886)">
+       id="g3162"
+       transform="translate(-0.75509507,-1.9999551)">
+      <g
+         id="g3401-3"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+         inkscape:export-xdpi="6.7480335"
+         inkscape:export-ydpi="6.7480335"
+         transform="matrix(-0.10363852,-0.08809389,0.10363852,-0.08809389,-98.88928,58.289011)">
+        <g
+           id="g3389-6">
+          <path
+             style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:14.80067348;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+             id="path2380-7"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccsccsc" />
+          <path
+             style="fill:none;stroke:#ffffff;stroke-width:2.1692903;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 10.999999,13 C 32,13 49,32 49,48"
+             id="path3892"
+             inkscape:connector-curvature="0"
+             transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+             sodipodi:nodetypes="cc" />
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,-12.28691,59.248739)"
+         id="g3827-0">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-7">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-6"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3175);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-0"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,-7.750135,48.425063)"
+         id="g3797-7-6">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-0"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3177);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       id="g3162-9"
+       transform="translate(37.244905,-5.9999548)">
       <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.61441571;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 18.109899,6.5157019 C -1.6618131,8.1579325 -3.5213716,42.946402 14.424113,55.216057 l 2.469423,-1.78125 C 0.84250639,39.314777 2.4402059,12.94537 19.213817,9.6501215 z"
-         transform="matrix(-0.27996216,1.3941893,-1.3198173,-0.26502781,86.841333,25.683723)"
-         id="path2380"
+         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.755095,17.999955 0,36"
+         id="path3254"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 14.755095,15.999955 0,33.999999"
+         id="path3254-1"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 13.755095,17.999955 0,37"
+         id="path3254-1-8"
+         inkscape:connector-curvature="0" />
+      <g
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,-13.531822,63.26068)"
+         id="g3827-0-9">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-7-3">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-6-6"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3175-3);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-0-0"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,-6.9923863,42.425063)"
+         id="g3797-7-6-6">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-0-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3177-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-6-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       id="g4062-7"
+       transform="translate(-54,-12)">
+      <path
+         sodipodi:nodetypes="cccccccc"
          inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccc" />
+         id="path4102-2-9"
+         d="m 77,38 8,-7 0,4 12,0 0,6 -12,0 0,4 z"
+         style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         transform="matrix(-0.14652919,-0.00332905,0.00332905,-0.14652919,34.206307,132.54732)"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2339"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.12648731,0.07404623,-0.07404623,-0.12648731,87.529758,102.36056)"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2341"
-         style="fill:url(#radialGradient3148);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,102.32449,146.9761)"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2374"
-         style="fill:#008900;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.12266988,0.08021211,-0.08021211,-0.12266988,154.9986,114.78251)"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2376"
-         style="fill:url(#radialGradient3150);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+         sodipodi:nodetypes="cccc"
+         inkscape:connector-curvature="0"
+         id="path4060-2"
+         d="m 80,38 3,-2.6 0,1.6 12,0"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
-    <rect
-       ry="0"
-       transform="matrix(0.98770354,0.15633846,0.00139872,0.99999902,0,0)"
-       y="2.6008573"
-       x="52.773052"
-       height="32.706223"
-       width="3.8392735"
-       id="rect2269"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.66605568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       id="g3865"
-       transform="matrix(-0.07817104,0.07348351,-0.08311112,-0.07763103,123.98813,50.0557)">
-      <g
-         id="g3867">
-        <path
-           transform="translate(-31.043012,30.173819)"
-           sodipodi:type="arc"
-           style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path3869"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3306);fill-opacity:1;stroke:none"
-           id="path3871"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-378.52976,249.75771)" />
-      </g>
-    </g>
-    <g
-       id="g3865-3"
-       transform="matrix(-0.07817103,0.07348352,-0.08311111,-0.07763103,124.6718,85.622368)">
-      <g
-         id="g3867-3">
-        <path
-           transform="translate(-53.336546,55.046182)"
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path3869-0"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3308);fill-opacity:1;stroke:none"
-           id="path3871-4"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)" />
-      </g>
-    </g>
-    <path
-       style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:0.99310744px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 26.253957,21.134758 6.873603,-4.861905 0.167649,3.695048 12.238367,-0.194476 -0.167649,3.889524 -12.070718,0 0,3.889524 z"
-       id="path4102"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainCoincident.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainCoincident.svg
index 5ddf32a45a..877b5329fa 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainCoincident.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainCoincident.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -13,11 +14,24 @@
    height="64px"
    id="svg3230"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_ConstrainCoincident.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs3232">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3780">
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="0"
+         id="stop3782" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="1"
+         id="stop3784" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3273">
@@ -112,17 +126,6 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective3238" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3273"
-       id="radialGradient2409"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.6277815,0,0,0.6773261,1054.4347,158.6247)"
-       cx="2787.5991"
-       cy="552.89736"
-       fx="2787.5991"
-       fy="552.89736"
-       r="38.829369" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3273"
@@ -134,6 +137,36 @@
        fx="2787.5991"
        fy="552.89736"
        r="38.829369" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3780"
+       id="linearGradient3786"
+       x1="28.00001"
+       y1="4.999999"
+       x2="37.000008"
+       y2="59"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3780-6"
+       id="linearGradient3786-3"
+       x1="28.00001"
+       y1="4.999999"
+       x2="37.000008"
+       y2="59"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3780-6">
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="0"
+         id="stop3782-7" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="1"
+         id="stop3784-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -142,17 +175,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="26.229024"
-     inkscape:cy="26.419218"
+     inkscape:zoom="14.346905"
+     inkscape:cx="42.241975"
+     inkscape:cy="27.186144"
      inkscape:current-layer="g2383"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1012"
-     inkscape:window-height="722"
-     inkscape:window-x="109"
-     inkscape:window-y="25" />
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata3235">
     <rdf:RDF>
@@ -175,31 +217,40 @@
        inkscape:export-xdpi="4.4961462"
        inkscape:export-ydpi="4.4961462">
       <g
-         id="g2405"
-         transform="matrix(1.5929109,0,0,1.5956124,-1679.6205,-297.74995)">
+         id="g3788">
         <path
-           style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:7.74043751;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 2824.8888,508.4852 C 2782.1638,508.48519 2747.3894,543.24098 2746.5573,586.39382 L 2746.5325,586.39382 L 2746.5325,587.98531 L 2746.5325,655.15135 L 2776.0746,655.15135 L 2776.0746,586.39382 L 2776.0249,586.39382 C 2777.2954,559.56146 2799.1518,538.17652 2825.9083,538.17652 C 2853.0136,538.17651 2875.0583,560.08689 2875.7917,587.4631 L 2876.0155,587.4631 L 2876.0155,654.82807 L 2903.3195,654.82807 L 2903.3195,585.87161 L 2903.1952,585.87161 C 2902.0773,542.90388 2867.4234,508.48521 2824.8888,508.4852 z"
-           id="path2387" />
+           sodipodi:nodetypes="ccccccccc"
+           transform="matrix(5.1602916,0,0,5.1602916,2657.6353,483.91985)"
+           inkscape:connector-curvature="0"
+           id="path3008"
+           d="M 3,61 3,31 c 9.3e-6,-37.0000009 58.000009,-37.0000009 58,0 l 0,30 -12,0 0,-28 c 9e-6,-22.000001 -33.999991,-22.000001 -33.999991,-10e-7 l 0,28 z"
+           style="fill:url(#linearGradient3786);stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1" />
         <path
-           style="fill:url(#radialGradient2409);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 2826.4285,510.93363 C 2826.4285,510.93363 2801.7856,510.57648 2784.6428,522.71934 C 2767.4999,534.8622 2758.9285,545.93363 2753.2142,563.07648 C 2747.4999,580.21934 2748.9285,590.93362 2748.9285,590.93362 L 2761.4285,594.8622 C 2761.4285,594.8622 2771.8749,595.84434 2773.5713,584.14791 C 2775.2612,572.49696 2776.6071,565.21933 2786.7857,553.79076 C 2796.9642,542.36219 2810.4463,537.27291 2819.9999,535.93363 C 2829.5108,534.60032 2828.2142,525.93363 2828.2142,525.93363 L 2826.4285,510.93363 z"
-           id="path2401"
-           sodipodi:nodetypes="csscczzzcc" />
-      </g>
-      <g
-         id="g2411"
-         transform="matrix(0.7147401,0,0,0.6962763,801.80049,232.68408)">
-        <path
-           style="fill:#ffd000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:7.74043751;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 2824.8888,508.4852 C 2782.1638,508.48519 2747.3894,543.24098 2746.5573,586.39382 L 2746.5325,586.39382 L 2746.5325,587.98531 L 2746.5325,655.15135 L 2776.0746,655.15135 L 2776.0746,586.39382 L 2776.0249,586.39382 C 2777.2954,559.56146 2799.1518,538.17652 2825.9083,538.17652 C 2853.0136,538.17651 2875.0583,560.08689 2875.7917,587.4631 L 2876.0155,587.4631 L 2876.0155,654.82807 L 2903.3195,654.82807 L 2903.3195,585.87161 L 2903.1952,585.87161 C 2902.0773,542.90388 2867.4234,508.48521 2824.8888,508.4852 z"
-           id="path2413" />
-        <path
-           style="fill:url(#radialGradient2417);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 2826.4285,510.93363 C 2826.4285,510.93363 2801.7856,510.57648 2784.6428,522.71934 C 2767.4999,534.8622 2758.9285,545.93363 2753.2142,563.07648 C 2747.4999,580.21934 2748.9285,590.93362 2748.9285,590.93362 L 2761.4285,594.8622 C 2761.4285,594.8622 2771.8749,595.84434 2773.5713,584.14791 C 2775.2612,572.49696 2776.6071,565.21933 2786.7857,553.79076 C 2796.9642,542.36219 2810.4463,537.27291 2819.9999,535.93363 C 2829.5108,534.60032 2828.2142,525.93363 2828.2142,525.93363 L 2826.4285,510.93363 z"
-           id="path2415"
-           sodipodi:nodetypes="csscczzzcc" />
+           sodipodi:nodetypes="ccccccccc"
+           transform="matrix(5.1602916,0,0,5.1602916,2657.6353,483.91985)"
+           inkscape:connector-curvature="0"
+           id="path3778"
+           d="m 5,59 8,0 9e-6,-25.000001 c 0,-26 38,-26 38,0 L 51,59 l 8,0 9e-6,-28.000001 c 9e-6,-35.0000011 -53.9999909,-35.0000011 -54.0000002,0 z"
+           style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       </g>
+      <path
+         style="fill:none;stroke:#302b00;stroke-width:41.28233337000000347;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 2781.4823,747.09471 0,-92.88524 c 0,-51.60292 82.5647,-51.60292 82.5647,0 l 0,92.88524"
+         id="path3828"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         style="fill:none;stroke:#edd400;stroke-width:20.64116669;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 2781.4823,736.77413 0,-82.56466 c 0,-51.60292 82.5647,-51.60292 82.5647,0 l 0,82.56466"
+         id="path3828-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
+      <path
+         style="fill:none;stroke:#fce94f;stroke-width:10.32058334000000066;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 2776.3221,736.77413 0,-82.56466 c 0,-61.9235 92.8852,-61.9235 92.8852,0 l 0,82.56466"
+         id="path3828-2-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccc" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainDistance.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainDistance.svg
index 18e29c1e2f..29a7512715 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainDistance.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainDistance.svg
@@ -9,12 +9,12 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32px"
-   height="32px"
+   width="64"
+   height="64"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Sketcher_ConstrainParallel.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_ConstrainDistance.svg">
   <defs
      id="defs2818">
     <inkscape:perspective
@@ -33,17 +33,25 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.197802"
-     inkscape:cx="27.637404"
-     inkscape:cy="22.621488"
+     inkscape:cx="15.103858"
+     inkscape:cy="40.838466"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="952"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2988"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -52,35 +60,94 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     inkscape:groupmode="layer"
+     transform="translate(0,32)">
+    <g
+       id="g3785"
+       transform="matrix(2.4545455,0,0,2.4545455,90.909091,-39.272727)">
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2990"
+         d="m -34.592592,5.4074068 0,21.1851852"
+         style="fill:none;stroke:#172a04;stroke-width:3.25925922;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2990-3"
+         d="m -13.407407,5.4074068 0,21.1851852"
+         style="fill:none;stroke:#172a04;stroke-width:3.25925922;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2990-6"
+         d="m -13.407407,14.407407 -21.185185,0"
+         style="fill:none;stroke:#172a04;stroke-width:3.25925922;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g3785-7"
+       style="stroke:#73d216;stroke-width:0.81481481"
+       transform="matrix(2.4545455,0,0,2.4545455,90.909091,-39.272727)">
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2990-5"
+         d="m -34.592592,5.4074072 0,21.1851848"
+         style="fill:none;stroke:#73d216;stroke-width:1.62962961;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2990-3-3"
+         d="m -13.407407,5.4074072 0,21.1851848"
+         style="fill:none;stroke:#73d216;stroke-width:1.62962961;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2990-6-5"
+         d="m -13.407407,14.37037 -21.185185,0"
+         style="fill:none;stroke:#73d216;stroke-width:1.62962961;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2990-6-5-6"
+         d="m -14.629629,13.962963 -18.740741,0"
+         style="fill:none;stroke:#8ae234;stroke-width:0.81481481;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2990-5-2"
+         d="m -34.999999,5.4074072 0,21.1851848"
+         style="fill:none;stroke:#8ae234;stroke-width:0.81481481;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2990-5-2-9"
+         d="m -13.814814,5.4074072 0,21.1851848"
+         style="fill:none;stroke:#8ae234;stroke-width:0.81481481;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
     <path
-       style="fill:none;stroke:#00ff00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 5.1795879,4.7625118 0,23.7546622"
-       id="path2826" />
+       d="m 15.999997,-15 3,0 0,-10.000002 -1.999997,0 0,-2 1.999997,-2 4.000003,0 L 23,-15 l 1.999997,0 0,4 L 17,-11 l 0,-4"
+       style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+       id="path3049"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccc" />
     <path
-       style="fill:none;stroke:#00ff00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 28.041217,4.3159956 0.0893,24.5583914"
-       id="path2828" />
+       d="m 27.999996,-15 5.000006,0 0,4 -4.000003,0 0,-4"
+       style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+       id="path3051"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:none;stroke:#00ff00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 5.2688912,13.013739 22.8616298,-0.178607 0,0"
-       id="path3610" />
-    <text
-       xml:space="preserve"
-       style="font-size:9px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="8.1265955"
-       y="10.691854"
-       id="text3612"><tspan
-         sodipodi:role="line"
-         id="tspan3614"
-         x="8.1265955"
-         y="10.691854">12.1</tspan></text>
+       d="m 43.414056,-20.02905 c -9e-6,-2.16913 -0.164555,-3.695277 -0.493648,-4.57844 -0.322899,-0.890883 -0.869328,-1.336331 -1.639295,-1.336346 -0.769975,1.5e-5 -1.319504,0.445463 -1.648597,1.336346 -0.329109,0.883163 -0.493656,2.40931 -0.493656,4.57844 0,2.19239 0.164547,3.737902 0.493656,4.636541 0.329093,0.898647 0.878622,1.347969 1.648597,1.347966 0.763757,3e-6 1.310186,-0.449319 1.639295,-1.347966 0.329093,-0.898639 0.493639,-2.444151 0.493648,-4.636541 m 3.585942,0.03486 c -8e-6,2.874118 -0.496765,5.093613 -1.490261,6.65849 -0.993521,1.557133 -2.40306,2.335699 -4.228624,2.335699 -1.831782,0 -3.24443,-0.778566 -4.237934,-2.3357 -0.993505,-1.564877 -1.490262,-3.784372 -1.490262,-6.65849 0,-2.88185 0.496757,-5.101345 1.490262,-6.658492 0.993504,-1.564864 2.406152,-2.347303 4.237934,-2.347321 1.825564,1.8e-5 3.235103,0.782457 4.228624,2.347321 0.993496,1.557147 1.490253,3.776642 1.490261,6.658492"
+       style="font-size:22.51535797px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Arial Black;-inkscape-font-specification:'Arial Black, Bold'"
+       id="path3053"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainHorizontal.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainHorizontal.svg
index a91c4674db..8b729e0c87 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainHorizontal.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainHorizontal.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -13,11 +14,24 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_ConstrainHorizontal.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3788">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3790" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3792" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -77,6 +91,16 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 32 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3788"
+       id="linearGradient3794"
+       x1="28"
+       y1="60"
+       x2="20"
+       y2="3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(10,0)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -85,17 +109,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.046875"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="5.2476251"
+     inkscape:cx="39.883548"
+     inkscape:cy="32.289456"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1092"
-     inkscape:window-height="722"
-     inkscape:window-x="69"
-     inkscape:window-y="42" />
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2998"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -115,27 +148,17 @@
        inkscape:label="Layer 1"
        id="g3436"
        transform="translate(107.50353,10.589633)" />
-    <text
-       xml:space="preserve"
-       style="font-size:64.32894897px;font-style:normal;font-weight:normal;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="10.588164"
-       y="57.828312"
-       id="text3590"
-       transform="scale(1.0110691,0.989052)"><tspan
-         sodipodi:role="line"
-         id="tspan3592"
-         x="10.588164"
-         y="57.828312">H</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:64.32894897px;font-style:normal;font-weight:normal;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="7.1312051"
-       y="54.154034"
-       id="text3586"
-       transform="scale(1.0110691,0.989052)"><tspan
-         sodipodi:role="line"
-         id="tspan3588"
-         x="7.1312051"
-         y="54.154034">H</tspan></text>
+    <path
+       style="fill:url(#linearGradient3794);fill-opacity:1;stroke:#302b00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 11,3 8,0 0,24 26,0 0,-24 8,0 0,58 -8,0 0,-26 -26,0 0,26 -8,0 z"
+       id="path3000"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,5 4,0 0,24 30,0 0,-24 4,0 0,54 -4,0 0,-26 -30,0 0,26 -4,0 z"
+       id="path3000-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock.svg
index b97df38c1d..621d21a0ab 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="Constraint_Symmetric.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_ConstrainLock.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -338,14 +338,6 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
-       inkscape:collect="always"
-       id="filter3897">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.91585937"
-         id="feGaussianBlur3899" />
-    </filter>
     <inkscape:perspective
        id="perspective2896"
        inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
@@ -382,6 +374,69 @@
          stdDeviation="0.9131875"
          id="feGaussianBlur3754" />
     </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3844"
+       x1="2802.9631"
+       y1="538.36249"
+       x2="2859.7263"
+       y2="786.05646"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3838">
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="0"
+         id="stop3840" />
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="1"
+         id="stop3842" />
+    </linearGradient>
+    <linearGradient
+       y2="786.05646"
+       x2="2859.7263"
+       y1="538.36249"
+       x1="2802.9631"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3045"
+       xlink:href="#linearGradient3172"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3172"
+       inkscape:collect="always">
+      <stop
+         id="stop3174"
+         offset="0"
+         style="stop-color:#ef2929;stop-opacity:1" />
+      <stop
+         id="stop3176"
+         offset="1"
+         style="stop-color:#a40000;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3166"
+       id="linearGradient3880"
+       gradientUnits="userSpaceOnUse"
+       x1="2802.9631"
+       y1="626.0874"
+       x2="2849.4058"
+       y2="822.17853" />
+    <linearGradient
+       id="linearGradient3166"
+       inkscape:collect="always">
+      <stop
+         id="stop3168"
+         offset="0"
+         style="stop-color:#ef2929;stop-opacity:1" />
+      <stop
+         id="stop3170"
+         offset="1"
+         style="stop-color:#a40000;stop-opacity:1" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -390,9 +445,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="4"
-     inkscape:cx="19.028208"
-     inkscape:cy="21.392841"
+     inkscape:zoom="8"
+     inkscape:cx="14.040984"
+     inkscape:cy="31.603275"
      inkscape:current-layer="text3796"
      showgrid="true"
      inkscape:document-units="px"
@@ -400,8 +455,16 @@
      inkscape:window-width="1280"
      inkscape:window-height="758"
      inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3208"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -410,7 +473,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -422,21 +485,55 @@
        transform="scale(0.73872768,1.3536788)"
        style="font-size:54.21519089000000236px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ff2600;fill-opacity:1;stroke:#731200;font-family:Arial;-inkscape-font-specification:Arial;color:#000000;fill-rule:nonzero;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="text3796">
+      <g
+         inkscape:export-ydpi="6.5019679"
+         inkscape:export-xdpi="6.5019679"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/close.png"
+         transform="matrix(0.26232603,0,0,0.14315619,-698.74089,-70.421371)"
+         id="g2385"
+         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:url(#linearGradient3844);fill-opacity:1;fill-rule:nonzero;stroke:#042a2a;stroke-width:10.32058334;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;font-family:Arial;-inkscape-font-specification:Arial">
+        <path
+           style="fill:url(#linearGradient3045);fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:10.32058334000000066;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 2751.3603,595.12568 0,0 0,0 -2e-4,46.44262 30.9618,0 -0.2475,-47.17448 -0.05,0 c 0.2977,-25.0696 20.9388,-45.71077 46.7403,-45.71077 25.8014,0 46.4426,20.64117 46.4421,46.44263 l 0,0 0,46.44262 30.9618,0 0,-46.44262 0,0 c 5e-4,-41.28234 -25.801,-77.40438 -77.4039,-77.40438 -51.6029,0 -77.4044,36.12204 -77.4044,77.40438 z"
+           id="path2387"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccscccccccc" />
+        <rect
+           style="fill:url(#linearGradient3880);fill-opacity:1;fill-rule:evenodd;stroke:#280000;stroke-width:10.32058334000000066;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect2389"
+           width="196.09097"
+           height="154.80875"
+           x="2730.7192"
+           y="641.5683" />
+        <rect
+           style="fill:none;stroke:#ef2929;stroke-width:10.32058334000000066;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect2389-0"
+           width="175.44977"
+           height="134.16759"
+           x="2741.0398"
+           y="651.88885" />
+      </g>
       <path
-         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;opacity:0.75190843;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.98408437;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3752);enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
-         d="m 48.182505,6.6023787 c -13.044875,0 -24.027799,3.9670983 -24.027799,8.8647323 l 0.0423,8.518453 -6.895301,0 0,20.430438 60.830941,0 0,-20.430438 -6.091554,0 c 0.04395,-2.901975 0.112949,-5.787167 0.0846,-8.518453 0,-4.897634 -10.898314,-8.8647323 -23.943194,-8.8647323 z m 0,4.3861953 c 8.159907,0 14.932769,2.704928 14.932769,6.025248 0.02132,2.229837 -0.0078,4.595315 -0.0423,6.971742 l -29.865539,0 -0.0423,-6.971742 c 0,-3.32032 6.857491,-6.025248 15.017374,-6.025248 z"
-         id="rect2883-5" />
+         style="font-size:54.21519089000000236px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#a40000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+         d="m 25.719895,26.594196 35.195654,0"
+         id="path3777-7"
+         inkscape:connector-curvature="0" />
       <path
-         style="opacity:0.98999999;color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.98408437;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 42.968896,4.6901971 c -13.044875,0 -24.027073,3.9754525 -24.027073,8.8730869 l 0.04884,10.778854 8.985734,0 -0.04884,-9.241945 c 0,-3.32032 6.881455,-6.0246826 15.041338,-6.0246826 8.159907,0 14.943668,2.7043626 14.943668,6.0246826 0.0281,2.939334 -0.09279,6.121161 -0.09767,9.241945 l 8.985735,0 c 0.04375,-3.668106 0.133395,-7.335706 0.09766,-10.778854 0,-4.8976344 -10.884522,-8.8730869 -23.929402,-8.8730869 z"
-         id="rect2883" />
-      <rect
-         style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.89179194;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect2881"
-         width="60.8395"
-         height="20.43354"
-         x="12.076328"
-         y="22.073458" />
+         style="font-size:54.21519089000000236px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#a40000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+         d="m 25.719921,32.504016 35.195653,0"
+         id="path3777-3-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="font-size:54.21519089000000236px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#a40000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+         d="m 25.719921,38.413838 35.195653,0"
+         id="path3777-6-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="font-size:54.21519089000000236px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+         d="m 25.719879,20.684376 0,-6.648549 c 1.2e-5,-3.69364 5.414701,-8.8647326 17.597824,-8.8647334 12.183122,-7e-7 17.597835,5.1710934 17.597825,8.8647334 l 0,6.648549"
+         id="path3828"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cczcc" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock_Driven.svg
index 6c94875fb0..e2850ecd16 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock_Driven.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainLock_Driven.svg
@@ -14,10 +14,34 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.91 r"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_ConstrainLock_Driven.svg">
   <defs
      id="defs2818">
+    <linearGradient
+       id="linearGradient3172"
+       inkscape:collect="always">
+      <stop
+         id="stop3174"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1" />
+      <stop
+         id="stop3176"
+         offset="1"
+         style="stop-color:#204a87;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3166"
+       inkscape:collect="always">
+      <stop
+         id="stop3168"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1" />
+      <stop
+         id="stop3170"
+         offset="1"
+         style="stop-color:#204a87;stop-opacity:1" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3602">
       <stop
@@ -374,6 +398,54 @@
          stdDeviation="0.9131875"
          id="feGaussianBlur3754" />
     </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3844"
+       x1="2802.9631"
+       y1="538.36249"
+       x2="2859.7263"
+       y2="786.05646"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3838">
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="0"
+         id="stop3840" />
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="1"
+         id="stop3842" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3022"
+       x1="2802.9631"
+       y1="538.36249"
+       x2="2859.7263"
+       y2="786.05646"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3166"
+       id="linearGradient3880"
+       gradientUnits="userSpaceOnUse"
+       x1="2802.9631"
+       y1="626.0874"
+       x2="2849.4058"
+       y2="822.17853" />
+    <linearGradient
+       y2="786.05646"
+       x2="2859.7263"
+       y1="538.36249"
+       x1="2802.9631"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3045"
+       xlink:href="#linearGradient3172"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -382,18 +454,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.46875"
-     inkscape:cx="27.556445"
-     inkscape:cy="31.45826"
+     inkscape:zoom="8.8167377"
+     inkscape:cx="24.422848"
+     inkscape:cy="42.989851"
      inkscape:current-layer="text3796"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3117"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -402,7 +482,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -414,21 +494,55 @@
        transform="scale(0.73872768,1.3536788)"
        style="font-size:54.21519089000000236px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ff2600;fill-opacity:1;stroke:#731200;font-family:Arial;-inkscape-font-specification:Arial;color:#000000;fill-rule:nonzero;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="text3796">
+      <g
+         inkscape:export-ydpi="6.5019679"
+         inkscape:export-xdpi="6.5019679"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/close.png"
+         transform="matrix(0.26232603,0,0,0.14315619,-698.74089,-70.421371)"
+         id="g2385"
+         style="fill:url(#linearGradient3844);fill-opacity:1;stroke:#042a2a;stroke-width:10.32058334;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none">
+        <path
+           style="fill:url(#linearGradient3045);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:10.32058334000000066;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 2751.3603,595.12568 0,0 0,0 -2e-4,46.44262 30.9618,0 -0.2475,-47.17448 -0.05,0 c 0.2977,-25.0696 20.9388,-45.71077 46.7403,-45.71077 25.8014,0 46.4426,20.64117 46.4421,46.44263 l 0,0 0,46.44262 30.9618,0 0,-46.44262 0,0 c 5e-4,-41.28234 -25.801,-77.40438 -77.4039,-77.40438 -51.6029,0 -77.4044,36.12204 -77.4044,77.40438 z"
+           id="path2387"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccscccccccc" />
+        <rect
+           style="fill:url(#linearGradient3880);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:10.32058334000000066;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect2389"
+           width="196.09097"
+           height="154.80875"
+           x="2730.7192"
+           y="641.5683" />
+        <rect
+           style="fill:none;stroke:#729fcf;stroke-width:10.32058334000000066;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="rect2389-0"
+           width="175.44977"
+           height="134.16759"
+           x="2741.0398"
+           y="651.88885" />
+      </g>
       <path
-         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;opacity:0.75190843;color:#000000;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.98408437;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3752);enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
-         d="m 48.182505,6.6023787 c -13.044875,0 -24.027799,3.9670983 -24.027799,8.8647323 l 0.0423,8.518453 -6.895301,0 0,20.430438 60.830941,0 0,-20.430438 -6.091554,0 c 0.04395,-2.901975 0.112949,-5.787167 0.0846,-8.518453 0,-4.897634 -10.898314,-8.8647323 -23.943194,-8.8647323 z m 0,4.3861953 c 8.159907,0 14.932769,2.704928 14.932769,6.025248 0.02132,2.229837 -0.0078,4.595315 -0.0423,6.971742 l -29.865539,0 -0.0423,-6.971742 c 0,-3.32032 6.857491,-6.025248 15.017374,-6.025248 z"
-         id="rect2883-5" />
+         style="fill:none;stroke:#204a87;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.719899,26.594196 35.195654,0"
+         id="path3777-7"
+         inkscape:connector-curvature="0" />
       <path
-         style="opacity:0.98999999;color:#000000;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000040;stroke-width:1.98408437;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 42.968896,4.6901971 c -13.044875,0 -24.027073,3.9754525 -24.027073,8.8730869 l 0.04884,10.778854 8.985734,0 -0.04884,-9.241945 c 0,-3.32032 6.881455,-6.0246826 15.041338,-6.0246826 8.159907,0 14.943668,2.7043626 14.943668,6.0246826 0.0281,2.939334 -0.09279,6.121161 -0.09767,9.241945 l 8.985735,0 c 0.04375,-3.668106 0.133395,-7.335706 0.09766,-10.778854 0,-4.8976344 -10.884522,-8.8730869 -23.929402,-8.8730869 z"
-         id="rect2883" />
-      <rect
-         style="color:#000000;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000040;stroke-width:1.89179194;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect2881"
-         width="60.8395"
-         height="20.43354"
-         x="12.076328"
-         y="22.073458" />
+         style="fill:none;stroke:#204a87;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.719925,32.504017 35.195653,0"
+         id="path3777-3-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#204a87;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.719925,38.413838 35.195653,0"
+         id="path3777-6-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 25.719883,20.684376 0,-6.648549 c 1.2e-5,-3.69364 5.414702,-8.8647322 17.597824,-8.864733 12.183121,-7e-7 17.597836,5.171093 17.597824,8.864733 l 0,6.648549"
+         id="path3828"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cczcc" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainParallel.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainParallel.svg
index 3ca4915bc0..a83aed6e44 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainParallel.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainParallel.svg
@@ -7,16 +7,29 @@
    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="32px"
-   height="32px"
+   width="64"
+   height="64"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.47 r22583"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_ConstrainParallel.svg">
   <defs
      id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3779">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3781" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3783" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 16 : 1"
@@ -24,6 +37,15 @@
        inkscape:vp_z="32 : 16 : 1"
        inkscape:persp3d-origin="16 : 10.666667 : 1"
        id="perspective2824" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3779"
+       id="linearGradient3785"
+       x1="24.935808"
+       y1="25.862068"
+       x2="15.760358"
+       y2="-25.862068"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -32,18 +54,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="14.481353"
-     inkscape:cy="17.875368"
+     inkscape:zoom="3.9590209"
+     inkscape:cx="-90.098642"
+     inkscape:cy="72.972363"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="952"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1" />
+     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:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -59,16 +92,29 @@
   <g
      id="layer1"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <text
-       xml:space="preserve"
-       style="font-size:40px;font-style:normal;font-weight:normal;fill:#ffff00;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans"
-       x="3.4828262"
-       y="30.303238"
-       id="text2818"><tspan
-         sodipodi:role="line"
-         id="tspan2820"
-         x="3.4828262"
-         y="30.303238">P</tspan></text>
+     inkscape:groupmode="layer"
+     transform="translate(0,32)">
+    <g
+       style="font-size:82.30408478px;font-style:normal;font-weight:normal;fill:#ffff00;fill-opacity:1;stroke:#302b00;stroke-width:2.05392241;font-family:Bitstream Vera Sans"
+       id="text2818"
+       transform="matrix(0.98087829,0,0,0.96666668,7.5410072,-4.7599922e-7)">
+      <path
+         d="m 15.760358,-21.724137 0,20.6896547 10.194945,0 c 3.777599,0 6.672508,-0.7270395 8.735502,-2.6828649 2.062923,-1.955758 2.478898,-5.0795279 2.478937,-8.6964448 -3.9e-5,-3.590041 0.02393,-5.285538 -2.038989,-7.24138 -2.062994,-1.955741 -5.397851,-2.068912 -9.17545,-2.068965 l -10.194945,0 m -8.1559561,-8.275862 18.3255191,0 c 6.724682,6e-5 11.801703,1.527185 15.231078,4.581379 3.456083,3.027514 5.184146,7.474931 5.184193,13.342264 -4.7e-5,5.9210007 -2.058348,10.6013891 -5.229715,13.561213 -3.171367,2.9598239 -7.004219,5.7565227 -15.160174,5.7565227 l -10.194945,0 L 15.722285,30 l -8.1178831,0 0,-59.999999"
+         style="fill:url(#linearGradient3785);fill-opacity:1;stroke:#302b00;stroke-width:2.05392241"
+         id="path2988"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccsscccccscczscccc" />
+    </g>
+    <g
+       style="font-size:82.30408477999999661px;font-style:normal;font-weight:normal;fill:none;fill-opacity:1;stroke:#fce94f;stroke-width:2.05392241000000020;font-family:Bitstream Vera Sans"
+       id="text2818-3"
+       transform="matrix(0.98087829,0,0,0.96666668,7.541007,-4.2954024e-7)">
+      <path
+         d="m 13.721369,-23.793103 0,24.8275862 14.272923,0 c 3.100671,0 7.898444,-2.5588985 8.971551,-4.137931 2.08676,-3.0705801 2.242888,-6.2068965 2.242888,-9.3103442 0,-3.103449 0,-7.034483 -3.058483,-9.103449 -3.058484,-2.068965 -6.417346,-2.275809 -10.194945,-2.275862 l -12.233934,0 m -4.0779779,-4.137931 16.3119119,0 c 6.724682,0 10.843547,1.083737 14.272922,4.137931 3.058484,3.103449 4.077978,6.206897 4.077978,11.379311 0.131486,6.2144203 -1.856407,9.8329394 -5.097472,12.82758554 C 36.150248,3.1034487 33.091764,5.1724142 25.955303,5.1724142 l -12.233934,0 0,22.7586208 -4.0779779,0 0,-55.862069"
+         style="fill:none;stroke:#fce94f;stroke-width:2.05392241"
+         id="path2988-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccsscccccscccscccc" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainVertical.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainVertical.svg
index 32185e1865..02b5519398 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainVertical.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ConstrainVertical.svg
@@ -1,22 +1,37 @@
 <?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="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="Sketcher_ConstrainVerticalsvg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_ConstrainVertical.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2728">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3791">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3793" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3795" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -67,6 +82,15 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 32 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3791"
+       id="linearGradient3797"
+       x1="32.545582"
+       y1="61.636627"
+       x2="28.716692"
+       y2="4.1787543"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -75,17 +99,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.046875"
-     inkscape:cx="35.107161"
-     inkscape:cy="32"
+     inkscape:zoom="11.38"
+     inkscape:cx="28.480022"
+     inkscape:cy="39.843895"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1092"
-     inkscape:window-height="722"
-     inkscape:window-x="69"
-     inkscape:window-y="42" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -105,27 +140,26 @@
        inkscape:label="Layer 1"
        id="g3436"
        transform="translate(107.50353,10.589633)" />
-    <text
-       xml:space="preserve"
-       style="font-size:68.35467529px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="13.44701"
-       y="60.135727"
-       id="text3644"
-       transform="scale(1.0187466,0.9815984)"><tspan
-         sodipodi:role="line"
-         id="tspan3646"
-         x="13.44701"
-         y="60.135727">V</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-size:68.35467529000000300px;font-style:normal;font-weight:normal;fill:#ffff00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-       x="8.7929401"
-       y="57.507835"
-       id="text3648"
-       transform="scale(1.0187466,0.9815984)"><tspan
-         sodipodi:role="line"
-         id="tspan3650"
-         x="8.7929401"
-         y="57.507835">V</tspan></text>
+    <g
+       transform="scale(1.0446886,0.95722304)"
+       style="font-size:83.11606598000000190px;font-style:normal;font-weight:normal;fill:url(#linearGradient3797);fill-opacity:1;stroke:#302b00;font-family:Bitstream Vera Sans;stroke-width:2;stroke-linejoin:round"
+       id="text3648">
+      <path
+         d="M 26.004559,63.726006 2.8716691,3.1340688 l 8.5632279,0 19.196239,51.0141092 19.236824,-51.0141092 8.522644,0 -23.092306,60.5919372 -9.293739,0"
+         id="path3000"
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3797);stroke:#302b00;stroke-width:2;stroke-linejoin:round;fill-opacity:1" />
+    </g>
+    <g
+       transform="scale(1.0446886,0.95722304)"
+       style="font-size:83.11606598000000190px;font-style:normal;font-weight:normal;fill:none;fill-opacity:1;stroke:#fce94f;stroke-width:2;stroke-linejoin:round;font-family:Bitstream Vera Sans"
+       id="text3648-3">
+      <path
+         d="m 5.7433383,5.223443 4.4032257,0 20.484573,52.756774 20.484573,-52.756774 4.403226,0 -21.441796,56.413185 -6.796283,0 z"
+         id="path3000-6"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#fce94f;stroke-width:2;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;stroke-dasharray:none"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Copy.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Copy.svg
index b7452765c5..0e78a1e245 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Copy.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Copy.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Copy_Content.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Clone.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Sketcher_Copy_Element_1_22px.png"
@@ -176,6 +176,105 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <filter
+       inkscape:collect="always"
+       id="filter8294">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.75257812"
+         id="feGaussianBlur8296" />
+    </filter>
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3091"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3093"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7-6"
+       id="linearGradient3093-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       id="linearGradient3836-9-7-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-5"
+       id="linearGradient3091-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       id="linearGradient3836-9-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-2" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,18 +283,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.139678"
-     inkscape:cx="37.662632"
-     inkscape:cy="26.544977"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="8.4697084"
+     inkscape:cx="33.238364"
+     inkscape:cy="35.20855"
+     inkscape:current-layer="g3389-6-1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3019"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -212,97 +321,119 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path2380"
-       d="M 20.434596,5.9054114 C 1.3429729,8.5126095 1.1495941,43.679445 19.114373,55.187532 l 2.311566,-1.914859 C 5.2121316,39.807692 5.5411295,13.142431 21.649787,9.0127444 z"
-       style="fill:#008900;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.60815412;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path2374"
-       sodipodi:cx="197.14285"
-       sodipodi:cy="655.2193"
-       sodipodi:rx="48.57143"
-       sodipodi:ry="48.57143"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       transform="matrix(0.02723316,0.09867652,-0.09640808,0.02731828,79.829352,-29.616533)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3166);fill-opacity:1;stroke:none"
-       id="path2376"
-       sodipodi:cx="225.26402"
-       sodipodi:cy="672.79736"
-       sodipodi:rx="34.345188"
-       sodipodi:ry="23.991123"
-       d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-       transform="matrix(0.0737666,0.06967032,-0.06778387,0.07502926,49.644345,-59.911331)" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path2380-1"
-       d="M 49.540743,7.6812595 C 30.373736,11.102103 31.82098,45.802988 50.508819,56.357055 L 52.754817,54.36526 C 35.744625,41.802858 34.831504,15.482795 50.913625,10.692633 z"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.60778022;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path2374-1"
-       sodipodi:cx="197.14285"
-       sodipodi:cy="655.2193"
-       sodipodi:rx="48.57143"
-       sodipodi:ry="48.57143"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       transform="matrix(-0.02682131,-0.09982615,0.09765525,-0.02693812,-37.497841,93.073794)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4019);fill-opacity:1;stroke:none"
-       id="path2376-9"
-       sodipodi:cx="225.26402"
-       sodipodi:cy="672.79736"
-       sodipodi:rx="34.345188"
-       sodipodi:ry="23.991123"
-       d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-       transform="matrix(-0.07407035,-0.07084847,0.06906165,-0.0753088,-9.5541356,121.19065)" />
-    <path
-       transform="matrix(0.02243113,0.09990701,-0.09763712,0.02240394,109.33184,-26.239796)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       sodipodi:ry="48.57143"
-       sodipodi:rx="48.57143"
-       sodipodi:cy="655.2193"
-       sodipodi:cx="197.14285"
-       id="path4021"
-       style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.07032347,0.07329626,-0.07134966,0.07149127,80.367199,-57.312599)"
-       d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-       sodipodi:ry="23.991123"
-       sodipodi:rx="34.345188"
-       sodipodi:cy="672.79736"
-       sodipodi:cx="225.26402"
-       id="path4023"
-       style="fill:url(#radialGradient4025);fill-opacity:1;stroke:none"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2339"
-       sodipodi:cx="197.14285"
-       sodipodi:cy="655.2193"
-       sodipodi:rx="48.57143"
-       sodipodi:ry="48.57143"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       transform="matrix(0.02243113,0.09990701,-0.09763712,0.02240394,109.72993,21.376792)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4017);fill-opacity:1;stroke:none"
-       id="path2341"
-       sodipodi:cx="225.26402"
-       sodipodi:cy="672.79736"
-       sodipodi:rx="34.345188"
-       sodipodi:ry="23.991123"
-       d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-       transform="matrix(0.07032347,0.07329626,-0.07134966,0.07149127,80.765291,-9.6960118)" />
+    <g
+       id="g3078"
+       transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,153.07645,137.41179)">
+      <g
+         transform="matrix(0.13557529,-0.01099171,-0.01099171,0.13557529,211.48751,-96.76258)"
+         inkscape:export-ydpi="6.7480335"
+         inkscape:export-xdpi="6.7480335"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+         id="g3401-3">
+        <g
+           id="g3389-6">
+          <path
+             sodipodi:nodetypes="ccsccsc"
+             inkscape:connector-curvature="0"
+             id="path2380-7"
+             d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+             style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:14.80067348;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+             inkscape:connector-curvature="0"
+             id="path3892"
+             d="M 10.999999,13 C 32,13 49,32 49,48"
+             style="fill:none;stroke:#ffffff;stroke-width:2.1692903;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+      </g>
+      <g
+         id="g3827-0"
+         transform="translate(149.57176,-36.20409)">
+        <g
+           id="g3797-7"
+           transform="translate(31.322131,40.570289)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0"
+             style="fill:url(#linearGradient3091);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         id="g3797-7-6"
+         transform="translate(154.01727,-25.342611)">
+        <path
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+           id="path4250-6-0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+           id="path4250-7-0-6"
+           style="fill:url(#linearGradient3093);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         transform="matrix(0.13557529,-0.01099171,-0.01099171,0.13557529,193.9051,-78.991918)"
+         inkscape:export-ydpi="6.7480335"
+         inkscape:export-xdpi="6.7480335"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+         id="g3401-3-9">
+        <g
+           id="g3389-6-1"
+           style="stroke:#172a04">
+          <path
+             sodipodi:nodetypes="ccsccsc"
+             inkscape:connector-curvature="0"
+             id="path2380-7-2"
+             d="m -302.96402,280.51934 0,40.93693 c 141.80801,1.02697 245.621451,96.97838 245.621451,231.97584 0,0.15497 8.932685,-0.46043 8.932425,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19428 -127.266936,-272.91276 -286.558366,-272.91277 z"
+             style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:14.80067348;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3892-7"
+             d="m -289.31838,294.16499 c 143.27919,0 259.267101,129.63359 259.267101,238.79867"
+             style="fill:none;stroke:#8ae234;stroke-width:14.80067348;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        </g>
+      </g>
+      <g
+         id="g3827-0-0"
+         transform="translate(170.78499,-57.417291)">
+        <g
+           id="g3797-7-9"
+           transform="translate(31.322131,40.570289)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-3"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-60"
+             style="fill:url(#linearGradient3091-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+        </g>
+      </g>
+      <g
+         id="g3797-7-6-6"
+         transform="translate(175.23045,-46.55581)">
+        <path
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+           id="path4250-6-0-2"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+           id="path4250-7-0-6-6"
+           style="fill:url(#linearGradient3093-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc.svg
index c454a530e3..94add65ee0 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc.svg
@@ -14,13 +14,10 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Sketcher_Create_Arc_from_3_points.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateArc.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_Create_Arc_from_3_points_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   version="1.1">
   <defs
      id="defs2871">
     <radialGradient
@@ -75,72 +72,124 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2877" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3014"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3801"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3016"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3801-7"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3018"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3040"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3801-7-5"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3048"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3801-7-2"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3054"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3082-3"
+       xlink:href="#linearGradient3836-9-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -149,19 +198,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="13.21875"
-     inkscape:cx="20.312057"
-     inkscape:cy="32"
+     inkscape:zoom="4.7232161"
+     inkscape:cx="59.325777"
+     inkscape:cy="31.982318"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="1004"
-     inkscape:window-x="1278"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3002"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -178,103 +234,74 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       id="path3030"
-       d="m 41.158396,21.820361 c -3.738351,0.100094 -6.690585,3.218276 -6.590489,6.956628 0.100094,3.738351 3.21392,6.690579 6.952269,6.590489 3.738351,-0.100093 6.690582,-3.218278 6.59049,-6.956628 -0.100094,-3.738351 -3.213916,-6.690581 -6.95227,-6.590489 z"
-       style="fill:#000000;fill-opacity:0.5098038;fill-rule:evenodd;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssss" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#000000;fill-opacity:0.5098038;fill-rule:evenodd;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 16.977304,11.284084 c -3.581371,0.100355 -6.499481,2.999105 -6.581772,6.621 -0.08494,3.738728 2.882274,6.841175 6.621001,6.926118 2.579428,0.0586 4.858043,-1.332863 6.05,-3.430369 14.528773,2.447923 26.060584,13.167264 29.003382,26.850142 -1.939629,1.237203 -3.199987,3.431726 -3.133968,5.897443 0.100093,3.738351 3.213915,6.690579 6.952269,6.590489 3.738351,-0.100093 6.690583,-3.218278 6.590489,-6.956628 -0.09151,-3.417828 -2.702348,-6.175032 -6.006412,-6.546901 C 53.210113,31.759076 40.21362,19.638739 23.855473,16.959227 23.33879,13.804853 20.636828,11.359304 17.326007,11.284084 c -0.116836,-0.0027 -0.233175,-0.0032 -0.348703,0 z"
-       id="path3354"
-       sodipodi:nodetypes="cssccssscccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.85008866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 10.016755,9.7903906 0,4.6947244 c 20.78437,0.15052 37.603596,16.223507 37.603596,36.00968 0,0.02271 3.8e-5,0.04244 0,0.06412 l 4.690144,0.0458 c 0.0015,-0.141997 0,-0.261059 0,-0.403059 0,-22.306658 -18.946877,-40.411269 -42.29374,-40.4112704 z"
-       id="path2380"
-       inkscape:connector-curvature="0" />
     <g
-       id="g2337"
-       transform="matrix(-0.14652919,-0.00332905,0.00332905,-0.14652919,36.886248,108.19492)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-       inkscape:export-xdpi="7.0721951"
-       inkscape:export-ydpi="7.0721951">
-      <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2339"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2341"
-         style="fill:url(#radialGradient3016);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-    </g>
-    <g
-       id="g2372"
-       transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,82.129327,144.48617)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-       inkscape:export-xdpi="7.0721951"
-       inkscape:export-ydpi="7.0721951">
-      <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2374"
-         style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2376"
-         style="fill:url(#radialGradient3018);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-    </g>
-    <g
-       id="g3056">
+       id="g3401-3"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+       inkscape:export-xdpi="6.7480335"
+       inkscape:export-ydpi="6.7480335"
+       transform="matrix(0.146567,0,0,0.146567,94.1836,-69.115448)">
       <g
-         id="g3034"
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,68.871732,118.23558)"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-         inkscape:export-xdpi="7.0721951"
-         inkscape:export-ydpi="7.0721951">
+         id="g3389-6">
         <path
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-           sodipodi:ry="48.57143"
-           sodipodi:rx="48.57143"
-           sodipodi:cy="655.2193"
-           sodipodi:cx="197.14285"
-           id="path3036"
-           style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           sodipodi:type="arc" />
+           style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+           id="path2380-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsccsc" />
         <path
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           sodipodi:ry="23.991123"
-           sodipodi:rx="34.345188"
-           sodipodi:cy="672.79736"
-           sodipodi:cx="225.26402"
-           id="path3038"
-           style="fill:url(#radialGradient3054);fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
+           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 10.999999,13 C 32,13 49,32 49,48"
+           id="path3892"
+           inkscape:connector-curvature="0"
+           transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+           sodipodi:nodetypes="cc" />
       </g>
     </g>
+    <g
+       transform="translate(38,0)"
+       id="g3827-0">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       transform="translate(59.322131,12.570289)"
+       id="g3797-7-2">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
+    <g
+       transform="translate(31.322131,2.570289)"
+       id="g3797-7-6">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-0"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-6"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc_Constr.svg
index b6e88b1094..7ec97517d6 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc_Constr.svg
@@ -14,13 +14,10 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_Create3PointArc_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Create3PointArc.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_Create_Arc_from_3_points_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   version="1.1">
   <defs
      id="defs2871">
     <radialGradient
@@ -75,72 +72,124 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2877" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3014"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3801"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3016"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3801-7"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3018"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3040"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3801-7-5"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3048"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3801-7-2"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3054"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3082-3"
+       xlink:href="#linearGradient3836-9-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -149,19 +198,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="41.205322"
-     inkscape:cx="16.222779"
-     inkscape:cy="48.502723"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="6.6796362"
+     inkscape:cx="55.645189"
+     inkscape:cy="39.114551"
+     inkscape:current-layer="g3389-6"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3002"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -178,103 +234,74 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       id="path3030"
-       d="m 41.158396,21.820361 c -3.738351,0.100094 -6.690585,3.218276 -6.590489,6.956628 0.100094,3.738351 3.21392,6.690579 6.952269,6.590489 3.738351,-0.100093 6.690582,-3.218278 6.59049,-6.956628 -0.100094,-3.738351 -3.213916,-6.690581 -6.95227,-6.590489 z"
-       style="fill:#000000;fill-opacity:0.5098038;fill-rule:evenodd;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssss" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#000000;fill-opacity:0.5098038;fill-rule:evenodd;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 16.977304,11.284084 c -3.581371,0.100355 -6.499481,2.999105 -6.581772,6.621 -0.08494,3.738728 2.882274,6.841175 6.621001,6.926118 2.579428,0.0586 4.858043,-1.332863 6.05,-3.430369 14.528773,2.447923 26.060584,13.167264 29.003382,26.850142 -1.939629,1.237203 -3.199987,3.431726 -3.133968,5.897443 0.100093,3.738351 3.213915,6.690579 6.952269,6.590489 3.738351,-0.100093 6.690583,-3.218278 6.590489,-6.956628 -0.09151,-3.417828 -2.702348,-6.175032 -6.006412,-6.546901 C 53.210113,31.759076 40.21362,19.638739 23.855473,16.959227 23.33879,13.804853 20.636828,11.359304 17.326007,11.284084 c -0.116836,-0.0027 -0.233175,-0.0032 -0.348703,0 z"
-       id="path3354"
-       sodipodi:nodetypes="cssccssscccc" />
-    <path
-       style="fill:#4040ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.85008866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 10.016755,9.7903906 0,4.6947244 c 20.78437,0.15052 37.603596,16.223507 37.603596,36.00968 0,0.02271 3.8e-5,0.04244 0,0.06412 l 4.690144,0.0458 c 0.0015,-0.141997 0,-0.261059 0,-0.403059 0,-22.306658 -18.946877,-40.411269 -42.29374,-40.4112704 z"
-       id="path2380"
-       inkscape:connector-curvature="0" />
     <g
-       id="g2337"
-       transform="matrix(-0.14652919,-0.00332905,0.00332905,-0.14652919,36.886248,108.19492)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-       inkscape:export-xdpi="7.0721951"
-       inkscape:export-ydpi="7.0721951">
-      <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2339"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2341"
-         style="fill:url(#radialGradient3016);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-    </g>
-    <g
-       id="g2372"
-       transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,82.129327,144.48617)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-       inkscape:export-xdpi="7.0721951"
-       inkscape:export-ydpi="7.0721951">
-      <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2374"
-         style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2376"
-         style="fill:url(#radialGradient3018);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-    </g>
-    <g
-       id="g3056">
+       id="g3401-3"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+       inkscape:export-xdpi="6.7480335"
+       inkscape:export-ydpi="6.7480335"
+       transform="matrix(0.146567,0,0,0.146567,94.1836,-69.115448)">
       <g
-         id="g3034"
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,68.871732,118.23558)"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-         inkscape:export-xdpi="7.0721951"
-         inkscape:export-ydpi="7.0721951">
+         id="g3389-6">
         <path
-           d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-           sodipodi:ry="48.57143"
-           sodipodi:rx="48.57143"
-           sodipodi:cy="655.2193"
-           sodipodi:cx="197.14285"
-           id="path3036"
-           style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           sodipodi:type="arc" />
+           style="fill:#3465a4;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:13.64563655999999980;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+           id="path2380-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsccsc" />
         <path
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-           d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-           sodipodi:ry="23.991123"
-           sodipodi:rx="34.345188"
-           sodipodi:cy="672.79736"
-           sodipodi:cx="225.26402"
-           id="path3038"
-           style="fill:url(#radialGradient3054);fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
+           style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 10.999999,13 C 32,13 49,32 49,48"
+           id="path3892"
+           inkscape:connector-curvature="0"
+           transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+           sodipodi:nodetypes="cc" />
       </g>
     </g>
+    <g
+       transform="translate(38,0)"
+       id="g3827-0">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       transform="translate(59.322131,12.570289)"
+       id="g3797-7-2">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
+    <g
+       transform="translate(31.322131,2.570289)"
+       id="g3797-7-6">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-0"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-6"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle.svg
index e07fdab345..fad3ec3fd0 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle.svg
@@ -14,15 +14,23 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Sketcher_CreateCircle_from_3points_2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Create3PointCircle.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">
+   version="1.1">
   <defs
      id="defs2920">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3191"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -35,6 +43,17 @@
          offset="1"
          id="stop3148" />
     </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3183"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -44,71 +63,277 @@
        id="perspective2926" />
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-3">
+       xlink:href="#linearGradient3892"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3892">
       <stop
          style="stop-color:#ffffff;stop-opacity:1;"
          offset="0"
-         id="stop3146-1" />
+         id="stop3894" />
       <stop
          style="stop-color:#ffffff;stop-opacity:0;"
          offset="1"
-         id="stop3148-5" />
+         id="stop3896" />
     </linearGradient>
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3927"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       xlink:href="#linearGradient3850"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
        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
+       id="linearGradient3850">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3852" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3854" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3960"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient4041"
+       xlink:href="#linearGradient3836-0-7-7"
+       id="linearGradient3801-1-1-6"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080-3"
+       xlink:href="#linearGradient3836-0-7-7-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-6">
+      <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-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080-2"
+       xlink:href="#linearGradient3836-0-7-7-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3123"
+       xlink:href="#linearGradient3836-0-7-7-9"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080-36"
+       xlink:href="#linearGradient3836-0-7-7-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-26" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3123-1"
+       xlink:href="#linearGradient3836-0-7-7-0"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3836-9-3-6"
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient4013"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857-0"
+       xlink:href="#linearGradient3836-9-3-6-6"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4013-1"
+       xlink:href="#linearGradient3836-9-3-6-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857-2"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-23" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-7" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4013-5"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -117,19 +342,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.796875"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="8.7539763"
+     inkscape:cx="63.768565"
+     inkscape:cy="35.340924"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="1004"
-     inkscape:window-x="1278"
-     inkscape:window-y="-3"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2998"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -138,7 +372,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -152,153 +386,93 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1849.6321,471.37581 c -0.7907,-0.01 -1.5571,0.0286 -2.3561,0.0601 -25.5682,1.01049 -45.53,22.73679 -44.5271,48.49673 1.0029,25.75995 22.5675,45.84142 48.1357,44.83093 25.5684,-1.01049 45.5302,-22.73676 44.5272,-48.49673 -0.9716,-24.95495 -21.2685,-44.6072 -45.7797,-44.89103 z"
-         id="path3766"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1708.1168,421.87556 c -0.7907,-0.01 -1.5572,0.0285 -2.3562,0.0601 -25.5682,1.01049 -45.53,22.73679 -44.5271,48.49673 1.003,25.75995 22.5675,45.84143 48.1358,44.83094 25.5683,-1.0105 45.5301,-22.73676 44.5272,-48.49674 -0.9717,-24.95495 -21.2686,-44.60719 -45.7797,-44.89102 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         id="path4439"
-         d="m 1772.5872,462.89128 c -92.927,-20.82396 -185.3858,38.26786 -206.3658,131.89158 -20.9801,93.62373 37.4194,186.52127 130.3465,207.34524 75.1475,16.83976 149.9788,-18.57848 186.9613,-82.26025 22.1601,0.53673 42.1936,-15.03308 46.6764,-37.66936 4.0476,-20.43916 -5.8214,-40.40741 -23.0121,-49.9294 0.2729,-79.88196 -54.3372,-151.39035 -134.6063,-169.37781 z m -8.8486,33.21321 c 63.2118,14.16509 106.6124,69.69988 108.0011,132.346 -16.026,4.78886 -28.9747,18.13768 -32.4672,35.77269 -3.0471,15.3868 1.7841,30.48776 11.6995,41.08186 -30.2511,49.21502 -89.1167,76.25719 -148.2329,63.00988 -74.5676,-16.7098 -121.4277,-91.25122 -104.5926,-166.37798 16.8351,-75.12675 91.0245,-122.54225 165.5921,-105.83245 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssscscsscscsss" />
       <g
-         id="g3768"
-         transform="matrix(0.92458347,0.23655903,-0.23833258,0.93151536,283.08103,-353.46379)">
-        <g
-           id="g4428">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1705.7188,410.15625 c -99.7853,0 -180.7813,80.99602 -180.7813,180.78125 0,99.78525 80.996,180.78125 180.7813,180.78125 99.7852,0 180.7811,-80.99599 180.7812,-180.78125 l -0.094,-4.96875 c -2.6923,-98.00357 -82.647,-175.8125 -180.6874,-175.8125 z m -1.4376,35.71875 c 78.671,-10e-6 142.8396,62.42122 145,141.0625 l 0.063,4 c 0,80.07098 -64.9916,145.0625 -145.0626,145.0625 -80.0709,10e-6 -145.0624,-64.99154 -145.0624,-145.0625 0,-80.07095 64.9915,-145.0625 145.0624,-145.0625 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-          <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="g3177">
-            <path
-               sodipodi:type="arc"
-               style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-               id="path3179"
-               sodipodi:cx="197.14285"
-               sodipodi:cy="655.2193"
-               sodipodi:rx="48.57143"
-               sodipodi:ry="48.57143"
-               d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-            <path
-               sodipodi:type="arc"
-               style="fill:url(#radialGradient3927);fill-opacity:1;stroke:none"
-               id="path3181"
-               sodipodi:cx="225.26402"
-               sodipodi:cy="672.79736"
-               sodipodi:rx="34.345188"
-               sodipodi:ry="23.991123"
-               d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-               transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-          </g>
-          <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="g3185" />
-        </g>
+         id="g4428" />
+      <g
+         transform="translate(5.1846337e-7,13.695387)"
+         id="g4428-3">
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#2e3436;stroke-width:8.27354717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#d3d7cf;stroke-width:4.13677359;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765381;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4-1"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
       </g>
       <g
-         id="g3800"
-         transform="matrix(0.95436616,0,0,0.96152134,223.24434,447.07029)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4043);fill-opacity:1;stroke:none"
-                 id="path3794"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(5.4797266,0,0,5.4796456,1572.007,555.67515)"
+         id="g3797-7-2-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930072;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M 49.011949,5.7450981 A 8.7441901,8.743766 0.01920999 1 1 62.295154,17.119951 8.7441901,8.743766 0.01920999 1 1 49.011949,5.7450981 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient4013);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930024;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="m 50.905481,7.3707415 a 6.2483828,6.2480927 0 1 1 9.49182,8.1282445 6.2483828,6.2480927 0 0 1 -9.49182,-8.1282445 z" />
       </g>
       <g
-         id="g3800-6"
-         transform="matrix(0.95436616,0,0,0.96152134,77.860217,403.6492)">
-        <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(5.4797266,0,0,5.4796456,1524.0732,439.26438)"
+         id="g3797-7-2-3-8">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930072;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5-7"
+           d="M 49.011949,5.7450981 A 8.7441901,8.743766 0.01920999 1 1 62.295154,17.119951 8.7441901,8.743766 0.01920999 1 1 49.011949,5.7450981 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient4013-1);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930024;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6-9"
+           d="m 50.905481,7.3707415 a 6.2483828,6.2480927 0 1 1 9.49182,8.1282445 6.2483828,6.2480927 0 0 1 -9.49182,-8.1282445 z" />
+      </g>
+      <g
+         transform="matrix(5.4797266,0,0,5.4796456,1407.6624,391.33054)"
+         id="g3797-7-2-3-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930072;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5-2"
+           d="M 49.011949,5.7450981 A 8.7441901,8.743766 0.01920999 1 1 62.295154,17.119951 8.7441901,8.743766 0.01920999 1 1 49.011949,5.7450981 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient4013-5);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930024;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6-2"
+           d="m 50.905481,7.3707415 a 6.2483828,6.2480927 0 1 1 9.49182,8.1282445 6.2483828,6.2480927 0 0 1 -9.49182,-8.1282445 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle_Constr.svg
index 09ed2f8d77..c5cb014554 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle_Constr.svg
@@ -14,15 +14,23 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_Create3PointCircle_Constr.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">
+   version="1.1">
   <defs
      id="defs2920">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3191"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -35,6 +43,17 @@
          offset="1"
          id="stop3148" />
     </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3183"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -44,71 +63,277 @@
        id="perspective2926" />
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-3">
+       xlink:href="#linearGradient3892"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3892">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#729fcf;stop-opacity:1"
          offset="0"
-         id="stop3146-1" />
+         id="stop3894" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#3465a4;stop-opacity:1"
          offset="1"
-         id="stop3148-5" />
+         id="stop3896" />
     </linearGradient>
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3927"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       xlink:href="#linearGradient3850"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
        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
+       id="linearGradient3850">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3852" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop3854" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3960"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient4041"
+       xlink:href="#linearGradient3836-0-7-7"
+       id="linearGradient3801-1-1-6"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080-3"
+       xlink:href="#linearGradient3836-0-7-7-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-6">
+      <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-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080-2"
+       xlink:href="#linearGradient3836-0-7-7-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3123"
+       xlink:href="#linearGradient3836-0-7-7-9"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080-36"
+       xlink:href="#linearGradient3836-0-7-7-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-26" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3123-1"
+       xlink:href="#linearGradient3836-0-7-7-0"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3836-9-3-6"
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient4013"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857-3"
+       xlink:href="#linearGradient3836-9-3-6-6"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4013-3"
+       xlink:href="#linearGradient3836-9-3-6-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857-9"
+       xlink:href="#linearGradient3836-9-3-6-1"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-1">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-7" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4013-0"
+       xlink:href="#linearGradient3836-9-3-6-1"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -117,19 +342,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.9725647"
-     inkscape:cx="16.480633"
-     inkscape:cy="26.131818"
+     inkscape:zoom="17.507952"
+     inkscape:cx="21.979634"
+     inkscape:cy="46.501183"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2998"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -138,7 +372,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -152,141 +386,93 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1849.6321,471.37581 c -0.7907,-0.01 -1.5571,0.0286 -2.3561,0.0601 -25.5682,1.01049 -45.53,22.73679 -44.5271,48.49673 1.0029,25.75995 22.5675,45.84142 48.1357,44.83093 25.5684,-1.01049 45.5302,-22.73676 44.5272,-48.49673 -0.9716,-24.95495 -21.2685,-44.6072 -45.7797,-44.89103 z"
-         id="path3766"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1708.1168,421.87556 c -0.7907,-0.01 -1.5572,0.0285 -2.3562,0.0601 -25.5682,1.01049 -45.53,22.73679 -44.5271,48.49673 1.003,25.75995 22.5675,45.84143 48.1358,44.83094 25.5683,-1.0105 45.5301,-22.73676 44.5272,-48.49674 -0.9717,-24.95495 -21.2686,-44.60719 -45.7797,-44.89102 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         id="path4439"
-         d="m 1772.5872,462.89128 c -92.927,-20.82396 -185.3858,38.26786 -206.3658,131.89158 -20.9801,93.62373 37.4194,186.52127 130.3465,207.34524 75.1475,16.83976 149.9788,-18.57848 186.9613,-82.26025 22.1601,0.53673 42.1936,-15.03308 46.6764,-37.66936 4.0476,-20.43916 -5.8214,-40.40741 -23.0121,-49.9294 0.2729,-79.88196 -54.3372,-151.39035 -134.6063,-169.37781 z m -8.8486,33.21321 c 63.2118,14.16509 106.6124,69.69988 108.0011,132.346 -16.026,4.78886 -28.9747,18.13768 -32.4672,35.77269 -3.0471,15.3868 1.7841,30.48776 11.6995,41.08186 -30.2511,49.21502 -89.1167,76.25719 -148.2329,63.00988 -74.5676,-16.7098 -121.4277,-91.25122 -104.5926,-166.37798 16.8351,-75.12675 91.0245,-122.54225 165.5921,-105.83245 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ssscscsscscsss" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1762.4068,432.10624 c -92.2598,-23.60511 -186.4514,32.68359 -210.2334,125.63506 -23.7821,92.9515 31.8015,187.56085 124.0613,211.16596 92.2598,23.60509 186.4512,-32.6836 210.2334,-125.63508 l 1.0973,-4.65071 c 20.8682,-91.92871 -34.5122,-183.32293 -125.1587,-206.51528 z m -9.8421,32.93249 c 72.7379,18.61032 117.1901,91.93632 100.4448,165.70294 l -0.8951,3.74097 c -19.0835,74.58735 -94.6632,119.7536 -168.6956,100.81208 -74.0322,-18.94149 -118.6326,-94.85644 -99.5491,-169.44377 19.0835,-74.58732 94.6632,-119.75362 168.6954,-100.81213 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.55603504;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
       <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.93027975,-0.21307977,0.21502693,-0.93716489,1910.6984,1301.7368)"
-         id="g3177">
-        <circle
-           style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           id="path3179"
-           cx="197.14285"
-           cy="655.2193"
-           r="48.57143" />
-        <ellipse
-           style="fill:url(#radialGradient3927);fill-opacity:1;stroke:none"
-           id="path3181"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-           cx="225.26402"
-           cy="672.79736"
-           rx="34.345188"
-           ry="23.991123" />
+         id="g4428" />
+      <g
+         transform="translate(5.1846337e-7,13.695387)"
+         id="g4428-3">
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#0b1521;stroke-width:8.27354717000000051;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#d3d7cf;stroke-width:4.13677359;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765381;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4-1"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
       </g>
       <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.93321487,-0.19986455,0.20190845,-0.94007191,1765.3679,1256.9684)"
-         id="g3185" />
-      <g
-         id="g3800"
-         transform="matrix(0.95436616,0,0,0.96152134,223.24434,447.07029)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4043);fill-opacity:1;stroke:none"
-                 id="path3794"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(5.4797266,0,0,5.4796456,1572.007,555.67515)"
+         id="g3797-7-2-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930072;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M 49.011949,5.7450981 A 8.7441901,8.743766 0.01920999 1 1 62.295154,17.119951 8.7441901,8.743766 0.01920999 1 1 49.011949,5.7450981 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient4013);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930024;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="m 50.905481,7.3707415 a 6.2483828,6.2480927 0 1 1 9.49182,8.1282445 6.2483828,6.2480927 0 0 1 -9.49182,-8.1282445 z" />
       </g>
       <g
-         id="g3800-6"
-         transform="matrix(0.95436616,0,0,0.96152134,77.860217,403.6492)">
-        <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(5.4797266,0,0,5.4796456,1524.0732,439.26438)"
+         id="g3797-7-2-3-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930072;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5-6"
+           d="M 49.011949,5.7450981 A 8.7441901,8.743766 0.01920999 1 1 62.295154,17.119951 8.7441901,8.743766 0.01920999 1 1 49.011949,5.7450981 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient4013-3);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930024;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6-2"
+           d="m 50.905481,7.3707415 a 6.2483828,6.2480927 0 1 1 9.49182,8.1282445 6.2483828,6.2480927 0 0 1 -9.49182,-8.1282445 z" />
+      </g>
+      <g
+         transform="matrix(5.4797266,0,0,5.4796456,1407.6624,391.33054)"
+         id="g3797-7-2-3-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930072;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5-3"
+           d="M 49.011949,5.7450981 A 8.7441901,8.743766 0.01920999 1 1 62.295154,17.119951 8.7441901,8.743766 0.01920999 1 1 49.011949,5.7450981 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient4013-0);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930024;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6-6"
+           d="m 50.905481,7.3707415 a 6.2483828,6.2480927 0 1 1 9.49182,8.1282445 6.2483828,6.2480927 0 0 1 -9.49182,-8.1282445 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc.svg
index ff947c8be6..20c90aeb7d 100755
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreateArc.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -72,6 +72,124 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2877" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3801"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3801-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3801-7-5"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3801-7-2"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082-3"
+       xlink:href="#linearGradient3836-9-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -80,18 +198,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="33.546327"
-     inkscape:cy="31.348642"
+     inkscape:zoom="5.0968312"
+     inkscape:cx="91.311871"
+     inkscape:cy="49.923096"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="756"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3002"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -108,100 +234,73 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g3401"
+       id="g3401-3"
        inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
        inkscape:export-xdpi="6.7480335"
        inkscape:export-ydpi="6.7480335"
-       transform="matrix(0.146567,0,0,0.146567,70.402359,-55.12963)">
-      <path
-         id="path3354"
-         d="M -364.50944,453.1287 C -388.94448,453.8134 -408.85422,473.59105 -409.41567,498.30258 C -409.99521,523.81124 -389.75044,544.97867 -364.24179,545.55822 C -346.64282,545.95805 -331.09624,536.46434 -322.96374,522.15344 C -223.83656,538.85517 -145.15711,611.99129 -125.07893,705.34708 C -138.31267,713.78829 -146.91186,728.76112 -146.46143,745.58426 C -145.77851,771.09035 -124.53347,791.23286 -99.02736,790.54997 C -73.52127,789.86705 -53.378727,768.59224 -54.061654,743.08616 C -54.686016,719.76694 -72.49928,700.95504 -95.04231,698.41784 C -117.29957,592.82585 -205.97228,510.13099 -317.58094,491.84917 C -321.10618,470.32745 -339.54117,453.64191 -362.1303,453.1287 C -362.92745,453.11059 -363.72121,453.10661 -364.50944,453.1287 z M -369.3272,698.12045 C -394.83329,698.80337 -414.97585,720.07816 -414.29291,745.58426 C -413.60999,771.09035 -392.36492,791.23286 -366.85884,790.54997 C -341.35275,789.86705 -321.21022,768.59224 -321.89313,743.08616 C -322.57605,717.58007 -343.82109,697.43754 -369.3272,698.12045 z"
-         style="opacity:1;fill:#000000;fill-opacity:0.5098038;fill-rule:evenodd;stroke:none;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       transform="matrix(0.146567,0,0,0.146567,94.1836,-69.115448)">
       <g
-         id="g3389">
+         id="g3389-6">
         <path
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M -412,442.9375 L -412,474.96875 C -270.19202,475.99572 -155.4375,585.65879 -155.4375,720.65625 C -155.4375,720.81122 -155.43724,720.94582 -155.4375,721.09375 L -123.4375,721.40625 C -123.42736,720.43743 -123.4375,719.62509 -123.4375,718.65625 C -123.4375,566.46198 -252.7086,442.93751 -412,442.9375 z"
-           id="path2380" />
-        <g
-           id="g2331"
-           transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,-201.41759,1361.9423)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2333"
-             style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019000000044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2335"
-             style="fill:url(#radialGradient2370);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g2337"
-           transform="matrix(-0.999742,-2.2713514e-2,2.2713514e-2,-0.999742,-228.67433,1114.3337)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2339"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2341"
-             style="fill:url(#radialGradient2368);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g2372"
-           transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,80.010973,1361.9423)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2374"
-             style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019000000044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2376"
-             style="fill:url(#radialGradient2378);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
+           style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+           id="path2380-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsccsc" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 10.999999,13 C 32,13 49,32 49,48"
+           id="path3892"
+           inkscape:connector-curvature="0"
+           transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+           sodipodi:nodetypes="cc" />
       </g>
     </g>
+    <g
+       transform="translate(38,0)"
+       id="g3827-0">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-7-2">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
+    <g
+       transform="translate(31.322131,2.570289)"
+       id="g3797-7-6">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-0"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-6"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc_Constr.svg
index ac52eeed83..c093e49e6f 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc_Constr.svg
@@ -14,57 +14,24 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateArc_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateArc.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2871">
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2378"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2368"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144">
+       id="linearGradient3894">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#729fcf;stop-opacity:1"
          offset="0"
-         id="stop3146" />
+         id="stop3896" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#204a87;stop-opacity:1"
          offset="1"
-         id="stop3148" />
+         id="stop3898" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient2370"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -72,6 +39,115 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2877" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3801-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3801-7-5"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3801-7-2"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082-3"
+       xlink:href="#linearGradient3836-9-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3894"
+       id="linearGradient3900"
+       x1="-328.74796"
+       y1="758.12048"
+       x2="-485.67276"
+       y2="573.90442"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -80,18 +156,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.5722656"
-     inkscape:cx="29.230042"
-     inkscape:cy="29.51783"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="5.0968312"
+     inkscape:cx="8.0107177"
+     inkscape:cy="19.068035"
+     inkscape:current-layer="g3389-6"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3002"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -108,78 +192,74 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#000000;fill-opacity:0.5098038;fill-rule:evenodd;stroke:none;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-       d="m 16.977304,11.284084 c -3.581371,0.100355 -6.499481,2.999105 -6.581772,6.621 -0.08494,3.738728 2.882274,6.841175 6.621001,6.926118 2.579428,0.0586 4.858043,-1.332863 6.05,-3.430369 14.528773,2.447923 26.060584,13.167264 29.003382,26.850142 -1.939629,1.237203 -3.199987,3.431726 -3.133968,5.897443 0.100093,3.738351 3.213915,6.690579 6.952269,6.590489 3.738351,-0.100093 6.690583,-3.218278 6.590489,-6.956628 -0.09151,-3.417828 -2.702348,-6.175032 -6.006412,-6.546901 C 53.210113,31.759076 40.21362,19.638739 23.855473,16.959227 23.33879,13.804853 20.636828,11.359304 17.326007,11.284084 c -0.116836,-0.0027 -0.233175,-0.0032 -0.348703,0 z M 16.271179,47.19179 c -3.738351,0.100094 -6.6905854,3.218276 -6.5904889,6.956628 0.1000935,3.738351 3.2139199,6.690579 6.9522689,6.590489 3.738351,-0.100093 6.690582,-3.218278 6.59049,-6.956628 -0.100094,-3.738351 -3.213916,-6.690581 -6.95227,-6.590489 z"
-       id="path3354" />
-    <path
-       style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#4040ff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.85008866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-       d="m 10.016755,9.7903906 0,4.6947244 c 20.78437,0.15052 37.603596,16.223507 37.603596,36.00968 0,0.02271 3.8e-5,0.04244 0,0.06412 l 4.690144,0.0458 c 0.0015,-0.141997 0,-0.261059 0,-0.403059 0,-22.306658 -18.946877,-40.411269 -42.29374,-40.4112704 z"
-       id="path2380"
-       inkscape:connector-curvature="0" />
     <g
-       id="g2331"
-       transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,40.881187,144.48617)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-       inkscape:export-xdpi="7.0721951"
-       inkscape:export-ydpi="7.0721951">
-      <circle
-         id="path2333"
-         style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         cx="197.14285"
-         cy="655.2193"
-         r="48.57143" />
-      <ellipse
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         id="path2335"
-         style="fill:url(#radialGradient2370);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         cx="225.26402"
-         cy="672.79736"
-         rx="34.345188"
-         ry="23.991123" />
+       id="g3401-3"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+       inkscape:export-xdpi="6.7480335"
+       inkscape:export-ydpi="6.7480335"
+       transform="matrix(0.146567,0,0,0.146567,94.1836,-69.115448)">
+      <g
+         id="g3389-6">
+        <path
+           style="fill:url(#linearGradient3900);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:13.64563655999999980;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+           id="path2380-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsccsc" />
+        <path
+           style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 10.999999,13 C 32,13 49,32 49,48"
+           id="path3892"
+           inkscape:connector-curvature="0"
+           transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+           sodipodi:nodetypes="cc" />
+      </g>
     </g>
     <g
-       id="g2337"
-       transform="matrix(-0.14652919,-0.00332905,0.00332905,-0.14652919,36.886248,108.19492)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-       inkscape:export-xdpi="7.0721951"
-       inkscape:export-ydpi="7.0721951">
-      <circle
-         id="path2339"
-         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-         cx="197.14285"
-         cy="655.2193"
-         r="48.57143" />
-      <ellipse
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         id="path2341"
-         style="fill:url(#radialGradient2368);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         cx="225.26402"
-         cy="672.79736"
-         rx="34.345188"
-         ry="23.991123" />
+       transform="translate(38,0)"
+       id="g3827-0">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
     <g
-       id="g2372"
-       transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,82.129327,144.48617)"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-       inkscape:export-xdpi="7.0721951"
-       inkscape:export-ydpi="7.0721951">
-      <circle
-         id="path2374"
-         style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         cx="197.14285"
-         cy="655.2193"
-         r="48.57143" />
-      <ellipse
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-         id="path2376"
-         style="fill:url(#radialGradient2378);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         cx="225.26402"
-         cy="672.79736"
-         rx="34.345188"
-         ry="23.991123" />
+       transform="translate(31.322131,40.570289)"
+       id="g3797-7-2">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
+    <g
+       transform="translate(31.322131,2.570289)"
+       id="g3797-7-6">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-0"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-6"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline.svg
index 515b50e49b..158f69f927 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_BezierSpline_3.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateBSpline.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"
@@ -131,6 +131,104 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-3"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-2"
+       xlink:href="#linearGradient3836-9-3-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3171-7"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-9" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -139,19 +237,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="18.413181"
-     inkscape:cy="32"
+     inkscape:zoom="16.156586"
+     inkscape:cx="32.299386"
+     inkscape:cy="35.643068"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3112"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -160,7 +268,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -174,170 +282,24 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g5377"
-         transform="translate(14.441775,18.329945)">
-        <g
-           id="g5313"
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,274.7911,730.06047)">
-          <g
-             transform="translate(-10.941933,-540.84412)"
-             id="g5315">
-            <g
-               id="g5317">
-              <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="g5319" />
-              <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="g5321">
-                <g
-                   id="g5323" />
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,3.0150412,768.19287)"
-           id="g5329">
-          <g
-             id="g5331"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g5333">
-              <g
-                 id="g5335"
-                 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="g5337"
-                 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
-                   id="g5339" />
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,38.723634,505.10207)"
-           id="g5345">
-          <g
-             id="g5347"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g5349">
-              <g
-                 id="g5351"
-                 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="g5353"
-                 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
-                   id="g5355" />
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,321.44914,457.88857)"
-           id="g5361">
-          <g
-             id="g5363"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g5365">
-              <g
-                 id="g5367"
-                 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="g5369"
-                 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
-                   id="g5371">
-                  <g
-                     id="g5414"
-                     style="fill:#000000;fill-opacity:0.58431373;stroke:none">
-                    <path
-                       sodipodi:type="arc"
-                       style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                       id="path5325"
-                       sodipodi:cx="197.14285"
-                       sodipodi:cy="655.2193"
-                       sodipodi:rx="48.57143"
-                       sodipodi:ry="48.57143"
-                       d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                       transform="translate(74.329242,-293.42364)" />
-                    <path
-                       d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                       sodipodi:ry="48.57143"
-                       sodipodi:rx="48.57143"
-                       sodipodi:cy="655.2193"
-                       sodipodi:cx="197.14285"
-                       id="path5341"
-                       style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                       sodipodi:type="arc"
-                       transform="translate(371.20238,-311.65501)" />
-                    <path
-                       d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                       sodipodi:ry="48.57143"
-                       sodipodi:rx="48.57143"
-                       sodipodi:cy="655.2193"
-                       sodipodi:cx="197.14285"
-                       id="path5357"
-                       style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                       sodipodi:type="arc"
-                       transform="translate(309.49729,-27.21133)" />
-                    <path
-                       d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                       sodipodi:ry="48.57143"
-                       sodipodi:rx="48.57143"
-                       sodipodi:cy="655.2193"
-                       sodipodi:cx="197.14285"
-                       id="path5373"
-                       style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                       sodipodi:type="arc" />
-                  </g>
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.61715269;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1602.6152,783.99324 c 8.5799,-267.23254 279.1673,-5.75713 322.4728,-314.56891 l -46.7766,-10.63748 c -21.3975,271.69303 -300.5771,3.96135 -322.8682,319.07636 z"
-         id="path5311"
-         inkscape:connector-curvature="0" />
       <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1863.2773,467.6716 c -13.6954,260.21231 -260.2123,13.69538 -273.9077,273.90769"
+         id="path3266"
          inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1585.9515,763.99696 c 8.5799,-267.23254 279.1673,-5.75713 322.4728,-314.56892 l -46.7765,-10.63747 c -21.3976,271.69303 -300.5771,3.96134 -322.8683,319.07635 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82053852;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1863.2773,467.6716 c -13.6954,260.21231 -260.2123,13.69538 -273.9077,273.90769"
+         id="path3266-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1856.4296,467.6716 c -13.6954,253.36462 -253.3646,0 -273.9077,273.90769"
+         id="path3266-9-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
          inkscape:export-ydpi="7.2934141"
          inkscape:export-xdpi="7.2934141"
@@ -351,187 +313,67 @@
          transform="matrix(-0.96615783,0.54254853,-0.14293457,-0.72055656,2035.4163,979.09945)"
          id="g3185" />
       <g
-         id="g3800"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,274.7911,730.06047)">
+         id="g3194"
+         transform="translate(410.86155,0)">
         <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <g
-                 id="g3868">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2"
+           transform="matrix(6.8476923,0,0,6.8476923,1338.2504,416.75794)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1"
+             style="fill:url(#linearGradient3262);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           id="g3797-7-2-3"
+           transform="matrix(6.8476923,0,0,6.8476923,1310.8597,663.31215)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-5"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-6"
+             style="fill:url(#linearGradient3264);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
       </g>
       <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,3.0150412,768.19287)"
-         id="g3019">
+         transform="matrix(-1,0,0,-1,3041.8251,1222.9463)"
+         id="g3194-6">
         <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
-                 id="g3872">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2-0"
+           transform="matrix(-6.8476923,0,0,-6.8476923,1073.5871,587.02489)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-6"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-2"
+             style="fill:url(#linearGradient3131-2);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,38.723634,505.10207)"
-         id="g4638">
         <g
-           id="g4640"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4642">
-            <g
-               id="g4644"
-               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="g4646"
-               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
-                 id="g4648">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path4650"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient4654);fill-opacity:1;stroke:none"
-                   id="path4652"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,321.44914,457.88857)"
-         id="g4677">
-        <g
-           id="g4679"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4681">
-            <g
-               id="g4683"
-               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="g4685"
-               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
-                 id="g4687">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path4689"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient4693);fill-opacity:1;stroke:none"
-                   id="path4691"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2-3-6"
+           transform="matrix(-6.8476923,0,0,-6.8476923,1046.1964,833.5791)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-5-1"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-6-8"
+             style="fill:url(#linearGradient3171-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline_Constr.svg
index 04c6f5b338..ef1730412a 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline_Constr.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreateBSpline_Constr.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
@@ -131,6 +131,104 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-3"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-2"
+       xlink:href="#linearGradient3836-9-3-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3171-7"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-9" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -139,19 +237,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="18.413181"
-     inkscape:cy="32"
+     inkscape:zoom="8.078293"
+     inkscape:cx="53.435252"
+     inkscape:cy="43.40859"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="872"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3112"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -174,170 +282,24 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g5377"
-         transform="translate(14.441775,18.329945)">
-        <g
-           id="g5313"
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,274.7911,730.06047)">
-          <g
-             transform="translate(-10.941933,-540.84412)"
-             id="g5315">
-            <g
-               id="g5317">
-              <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="g5319" />
-              <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="g5321">
-                <g
-                   id="g5323" />
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,3.0150412,768.19287)"
-           id="g5329">
-          <g
-             id="g5331"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g5333">
-              <g
-                 id="g5335"
-                 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="g5337"
-                 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
-                   id="g5339" />
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,38.723634,505.10207)"
-           id="g5345">
-          <g
-             id="g5347"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g5349">
-              <g
-                 id="g5351"
-                 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="g5353"
-                 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
-                   id="g5355" />
-              </g>
-            </g>
-          </g>
-        </g>
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,321.44914,457.88857)"
-           id="g5361">
-          <g
-             id="g5363"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g5365">
-              <g
-                 id="g5367"
-                 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="g5369"
-                 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
-                   id="g5371">
-                  <g
-                     id="g5414"
-                     style="fill:#000000;fill-opacity:0.58431373;stroke:none">
-                    <path
-                       sodipodi:type="arc"
-                       style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                       id="path5325"
-                       sodipodi:cx="197.14285"
-                       sodipodi:cy="655.2193"
-                       sodipodi:rx="48.57143"
-                       sodipodi:ry="48.57143"
-                       d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                       transform="translate(74.329242,-293.42364)" />
-                    <path
-                       d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                       sodipodi:ry="48.57143"
-                       sodipodi:rx="48.57143"
-                       sodipodi:cy="655.2193"
-                       sodipodi:cx="197.14285"
-                       id="path5341"
-                       style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                       sodipodi:type="arc"
-                       transform="translate(371.20238,-311.65501)" />
-                    <path
-                       d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                       sodipodi:ry="48.57143"
-                       sodipodi:rx="48.57143"
-                       sodipodi:cy="655.2193"
-                       sodipodi:cx="197.14285"
-                       id="path5357"
-                       style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                       sodipodi:type="arc"
-                       transform="translate(309.49729,-27.21133)" />
-                    <path
-                       d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                       sodipodi:ry="48.57143"
-                       sodipodi:rx="48.57143"
-                       sodipodi:cy="655.2193"
-                       sodipodi:cx="197.14285"
-                       id="path5373"
-                       style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                       sodipodi:type="arc" />
-                  </g>
-                </g>
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <path
-         sodipodi:nodetypes="ccccc"
-         style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.61715269;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1602.6152,783.99324 c 8.5799,-267.23254 279.1673,-5.75713 322.4728,-314.56891 l -46.7766,-10.63748 c -21.3975,271.69303 -300.5771,3.96135 -322.8682,319.07636 z"
-         id="path5311"
-         inkscape:connector-curvature="0" />
       <path
+         style="fill:none;stroke:#0b1521;stroke-width:54.78153992000000017;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1863.2773,467.6716 c -13.6954,260.21231 -260.2123,13.69538 -273.9077,273.90769"
+         id="path3266"
          inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1585.9515,763.99696 c 8.5799,-267.23254 279.1673,-5.75713 322.4728,-314.56892 l -46.7765,-10.63747 c -21.3976,271.69303 -300.5771,3.96134 -322.8683,319.07635 z"
-         style="fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82053852;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:nodetypes="ccccc" />
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#3465a4;stroke-width:27.39076996000000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1863.2773,467.6716 c -13.6954,260.21231 -260.2123,13.69538 -273.9077,273.90769"
+         id="path3266-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:13.69538498000000004;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1856.4296,467.6716 c -13.6954,253.36462 -253.3646,0 -273.9077,273.90769"
+         id="path3266-9-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
          inkscape:export-ydpi="7.2934141"
          inkscape:export-xdpi="7.2934141"
@@ -351,187 +313,67 @@
          transform="matrix(-0.96615783,0.54254853,-0.14293457,-0.72055656,2035.4163,979.09945)"
          id="g3185" />
       <g
-         id="g3800"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,274.7911,730.06047)">
+         id="g3194"
+         transform="translate(410.86155,0)">
         <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <g
-                 id="g3868">
-                <path
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2"
+           transform="matrix(6.8476923,0,0,6.8476923,1338.2504,416.75794)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1"
+             style="fill:url(#linearGradient3262);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           id="g3797-7-2-3"
+           transform="matrix(6.8476923,0,0,6.8476923,1310.8597,663.31215)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-5"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-6"
+             style="fill:url(#linearGradient3264);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
       </g>
       <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,3.0150412,768.19287)"
-         id="g3019">
+         transform="matrix(-1,0,0,-1,3041.8251,1222.9463)"
+         id="g3194-6">
         <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
-                 id="g3872">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2-0"
+           transform="matrix(-6.8476923,0,0,-6.8476923,1073.5871,587.02489)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-6"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-2"
+             style="fill:url(#linearGradient3131-2);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,38.723634,505.10207)"
-         id="g4638">
         <g
-           id="g4640"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4642">
-            <g
-               id="g4644"
-               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="g4646"
-               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
-                 id="g4648">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path4650"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient4654);fill-opacity:1;stroke:none"
-                   id="path4652"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,321.44914,457.88857)"
-         id="g4677">
-        <g
-           id="g4679"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4681">
-            <g
-               id="g4683"
-               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="g4685"
-               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
-                 id="g4687">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path4689"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient4693);fill-opacity:1;stroke:none"
-                   id="path4691"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2-3-6"
+           transform="matrix(-6.8476923,0,0,-6.8476923,1046.1964,833.5791)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-5-1"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-6-8"
+             style="fill:url(#linearGradient3171-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle.svg
index 025f9ff12c..967db89680 100755
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreateCircle.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -61,6 +61,117 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2926" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3892"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3892">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3894" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3896" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3850"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3850">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3852" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3854" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7"
+       id="linearGradient3801-1-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7-7"
+       id="linearGradient3801-1-1-6"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -69,18 +180,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.4999999"
-     inkscape:cx="-16.119015"
-     inkscape:cy="24.817835"
-     inkscape:current-layer="g3177"
+     inkscape:zoom="7.2080077"
+     inkscape:cx="93.363059"
+     inkscape:cy="23.813158"
+     inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="756"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2998"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -102,69 +221,84 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         id="path4439"
-         d="M 1721.8125,442.99554 C 1622.0272,442.99554 1541.0312,523.99156 1541.0312,623.77679 C 1541.0312,723.56204 1622.0272,804.55804 1721.8125,804.55804 C 1802.506,804.55804 1870.9028,751.59593 1894.125,678.55804 C 1916.9058,674.06315 1933.8217,653.70619 1933.2188,629.71429 C 1932.6743,608.05112 1918.0084,590.03072 1898.25,584.27679 C 1880.2263,503.14655 1808.0056,442.99554 1721.8125,442.99554 z M 1720.375,478.71429 C 1788.2519,478.71428 1845.3515,525.20371 1861.125,588.46429 C 1845.8363,596.96884 1835.6553,613.46065 1836.125,632.15179 C 1836.5349,648.46005 1844.9346,662.68654 1857.5,671.18304 C 1837.8457,728.00851 1783.854,768.83929 1720.375,768.83929 C 1640.3041,768.8393 1575.3125,703.84775 1575.3125,623.77679 C 1575.3125,543.70584 1640.3041,478.71429 1720.375,478.71429 z M 1716.9688,577.77679 C 1716.1403,577.76727 1715.3372,577.80645 1714.5,577.83929 C 1687.7092,578.89022 1666.7929,601.48597 1667.8438,628.27679 C 1668.8947,655.06761 1691.4904,675.95272 1718.2812,674.90179 C 1745.0721,673.85086 1765.9884,651.25514 1764.9375,624.46429 C 1763.9194,598.51068 1742.652,578.07198 1716.9688,577.77679 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
-         id="g4428">
+         id="g4428" />
+      <g
+         transform="translate(5.1846337e-7,2.8784578e-6)"
+         id="g4428-3">
         <path
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 1705.7188,410.15625 C 1605.9335,410.15625 1524.9375,491.15227 1524.9375,590.9375 C 1524.9375,690.72275 1605.9335,771.71875 1705.7188,771.71875 C 1805.504,771.71875 1886.4999,690.72276 1886.5,590.9375 L 1886.4062,585.96875 C 1883.7139,487.96518 1803.7592,410.15625 1705.7188,410.15625 z M 1704.2812,445.875 C 1782.9522,445.87499 1847.1208,508.29622 1849.2812,586.9375 L 1849.3438,590.9375 C 1849.3438,671.00848 1784.3522,736 1704.2812,736 C 1624.2103,736.00001 1559.2188,671.00846 1559.2188,590.9375 C 1559.2188,510.86655 1624.2103,445.875 1704.2812,445.875 z"
-           id="path4425" />
+           sodipodi:type="arc"
+           style="fill:none;stroke:#2e3436;stroke-width:8.27354717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#d3d7cf;stroke-width:4.13677359;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765381;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4-1"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
         <g
-           id="g3177"
-           transform="matrix(-0.9996843,2.5125272e-2,-2.5125272e-2,-0.9996843,2082.1146,1248.1357)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-           inkscape:export-xdpi="7.2934141"
-           inkscape:export-ydpi="7.2934141">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3179"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3181"
-             style="fill:url(#radialGradient3183);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g3185"
-           transform="matrix(-0.9992315,3.9197078e-2,-3.9197078e-2,-0.9992315,1922.9598,1240.4934)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-           inkscape:export-xdpi="7.2934141"
-           inkscape:export-ydpi="7.2934141">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3187"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3189"
-             style="fill:url(#radialGradient3191);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+           transform="matrix(6.8476923,0,0,6.8476923,1781.1444,248.54544)"
+           id="g3827-1-9">
+          <g
+             transform="translate(31.322131,40.570289)"
+             id="g3797-9-4">
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="path4250-71-8"
+               d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:url(#linearGradient3801-1-1);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="path4250-7-3-8"
+               d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+          </g>
         </g>
       </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1844.9795,526.3583)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-8-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3080);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-8-2"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle_Constr.svg
index 59ffde7743..5838a1e44f 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle_Constr.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateCircle_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateCircle.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
@@ -61,6 +61,117 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2926" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3892"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3892">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3894" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop3896" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3850"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3850">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3852" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="1"
+         id="stop3854" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7"
+       id="linearGradient3801-1-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7-7"
+       id="linearGradient3801-1-1-6"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -69,18 +180,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.5722655"
-     inkscape:cx="34.653392"
-     inkscape:cy="27.648511"
-     inkscape:current-layer="g4428"
+     inkscape:zoom="14.416015"
+     inkscape:cx="34.735362"
+     inkscape:cy="26.134494"
+     inkscape:current-layer="g4428-3"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2998"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -103,69 +222,84 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         id="path4439"
-         d="M 1721.8125,442.99554 C 1622.0272,442.99554 1541.0312,523.99156 1541.0312,623.77679 C 1541.0312,723.56204 1622.0272,804.55804 1721.8125,804.55804 C 1802.506,804.55804 1870.9028,751.59593 1894.125,678.55804 C 1916.9058,674.06315 1933.8217,653.70619 1933.2188,629.71429 C 1932.6743,608.05112 1918.0084,590.03072 1898.25,584.27679 C 1880.2263,503.14655 1808.0056,442.99554 1721.8125,442.99554 z M 1720.375,478.71429 C 1788.2519,478.71428 1845.3515,525.20371 1861.125,588.46429 C 1845.8363,596.96884 1835.6553,613.46065 1836.125,632.15179 C 1836.5349,648.46005 1844.9346,662.68654 1857.5,671.18304 C 1837.8457,728.00851 1783.854,768.83929 1720.375,768.83929 C 1640.3041,768.8393 1575.3125,703.84775 1575.3125,623.77679 C 1575.3125,543.70584 1640.3041,478.71429 1720.375,478.71429 z M 1716.9688,577.77679 C 1716.1403,577.76727 1715.3372,577.80645 1714.5,577.83929 C 1687.7092,578.89022 1666.7929,601.48597 1667.8438,628.27679 C 1668.8947,655.06761 1691.4904,675.95272 1718.2812,674.90179 C 1745.0721,673.85086 1765.9884,651.25514 1764.9375,624.46429 C 1763.9194,598.51068 1742.652,578.07198 1716.9688,577.77679 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
-         id="g4428">
+         id="g4428" />
+      <g
+         transform="translate(5.1846337e-7,2.8784578e-6)"
+         id="g4428-3">
         <path
-           style="opacity:1;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 1705.7188,410.15625 C 1605.9335,410.15625 1524.9375,491.15227 1524.9375,590.9375 C 1524.9375,690.72275 1605.9335,771.71875 1705.7188,771.71875 C 1805.504,771.71875 1886.4999,690.72276 1886.5,590.9375 L 1886.4062,585.96875 C 1883.7139,487.96518 1803.7592,410.15625 1705.7188,410.15625 z M 1704.2812,445.875 C 1782.9522,445.87499 1847.1208,508.29622 1849.2812,586.9375 L 1849.3438,590.9375 C 1849.3438,671.00848 1784.3522,736 1704.2812,736 C 1624.2103,736.00001 1559.2188,671.00846 1559.2188,590.9375 C 1559.2188,510.86655 1624.2103,445.875 1704.2812,445.875 z"
-           id="path4425" />
+           sodipodi:type="arc"
+           style="fill:none;stroke:#0b1521;stroke-width:8.27354717000000051;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#d3d7cf;stroke-width:4.13677359;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765381;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4-1"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
         <g
-           id="g3177"
-           transform="matrix(-0.9996843,2.5125272e-2,-2.5125272e-2,-0.9996843,2082.1146,1248.1357)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-           inkscape:export-xdpi="7.2934141"
-           inkscape:export-ydpi="7.2934141">
-          <path
-             d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3179"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3181"
-             style="fill:url(#radialGradient3183);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g3185"
-           transform="matrix(-0.9992315,3.9197078e-2,-3.9197078e-2,-0.9992315,1922.9598,1240.4934)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-           inkscape:export-xdpi="7.2934141"
-           inkscape:export-ydpi="7.2934141">
-          <path
-             d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3187"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3189"
-             style="fill:url(#radialGradient3191);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+           transform="matrix(6.8476923,0,0,6.8476923,1781.1444,248.54544)"
+           id="g3827-1-9">
+          <g
+             transform="translate(31.322131,40.570289)"
+             id="g3797-9-4">
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="path4250-71-8"
+               d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:url(#linearGradient3801-1-1);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="path4250-7-3-8"
+               d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+          </g>
         </g>
       </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1844.9795,526.3583)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-8-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3080);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-8-2"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg
index 1b22b95bf6..7d4a67050a 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreateEllipse.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
@@ -23,6 +23,30 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs2920">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3890" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3892" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3882" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3884" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -109,6 +133,134 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3880"
+       id="linearGradient3886"
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3888"
+       id="linearGradient3894"
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3888"
+       id="linearGradient3901"
+       gradientUnits="userSpaceOnUse"
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3880"
+       id="linearGradient3903"
+       gradientUnits="userSpaceOnUse"
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </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
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-7"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
+    </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
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-1"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <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>
+    <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-9"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -117,19 +269,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="6.1640625"
+     inkscape:cx="-17.903833"
+     inkscape:cy="48.021161"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3072"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -152,183 +314,81 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="m 1876.0597,429.77721 c -0.7933,0.0219 -1.56,0.0905 -2.3598,0.15345 -25.5938,2.0169 -44.7188,24.14994 -42.6591,49.40342 2.0596,25.25348 24.5027,44.10722 50.0964,42.09031 25.5939,-2.01691 44.7189,-24.14993 42.6591,-49.40343 -1.9954,-24.46431 -23.1497,-42.94739 -47.7366,-42.24375 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1744.4042,565.93689 c -0.7934,0.0218 -1.5602,0.0904 -2.3599,0.15344 -25.5938,2.0169 -44.7187,24.14996 -42.659,49.40343 2.0596,25.25348 24.5025,44.1072 50.0963,42.0903 25.5939,-2.01691 44.7189,-24.14993 42.6592,-49.40343 -1.9956,-24.4643 -23.1497,-42.94738 -47.7366,-42.24374 z"
-         id="path3766"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1661.7622,478.15981 c -0.7932,0.0218 -1.5601,0.0904 -2.3598,0.15345 -25.5939,2.0169 -44.7188,24.14995 -42.6591,49.40342 2.0598,25.25348 24.5024,44.10723 50.0963,42.09032 25.594,-2.01692 44.7189,-24.14993 42.6592,-49.40344 -1.9955,-24.46432 -23.1498,-42.94739 -47.7366,-42.24374 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         id="path4439"
-         d="m 1713.3268,476.68131 c -100.1655,55.38349 -170.1851,161.20602 -156.2817,236.19334 13.9031,74.9874 109.5838,95.95727 209.7496,40.57369 81.0012,-44.78711 142.2749,-115.28006 155.4094,-183.05607 5.5762,-27.20526 2.0671,-61.33814 -8.0478,-83.74115 -29.3964,-50.96474 -114.3077,-57.80935 -200.8295,-9.96981 z m 3.5338,27.64 c 68.1358,-37.67356 131.9305,-34.42913 156.5781,4.35572 7.2225,24.93025 7.8201,45.37307 7.8866,64.17412 -11.8116,53.61227 -60.3201,114.26294 -124.0411,149.49559 -80.376,44.44149 -154.6709,31.67325 -165.8272,-28.49909 -11.1565,-60.17235 45.0275,-145.08482 125.4036,-189.52634 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssccssccsss" />
       <g
-         id="g3768"
-         transform="matrix(1.0075123,-0.53237817,0.10889871,0.76794087,-58.280308,1054.9072)">
-        <g
-           id="g4428">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 124.7524,-41.01889 153.2227,-75.28061 26.2171,-32.47234 31.4591,-91.69452 28.804,-128.25834 -2.6923,-98.00357 -91.2036,-181.25544 -189.244,-181.25544 z m 43.1124,46.90779 c 78.671,-10e-6 145.7618,83.15656 140.1859,145.45661 -12.5364,111.12065 -101.0834,129.61806 -151.354,132.80806 -78.9983,4.42259 -145.8735,-57.76902 -145.8735,-137.83998 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="csscccccccscc" />
-          <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="g3177" />
-          <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="g3185" />
-        </g>
+         id="g3896"
+         transform="translate(-4.8153656e-6,0)">
+        <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);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);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="g3800"
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,112.41292,612.18331)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4043);fill-opacity:1;stroke:none"
-                 id="path3794"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1807.9815,558.76004)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
       <g
-         id="g3800-6"
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,32.778145,529.17248)">
-        <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1732.6569,483.43542)"
+         id="g3797-9-4-5-6">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
       <g
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,242.57958,480.45361)"
-         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">
-              <path
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3033);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1958.6307,394.41542)"
+         id="g3797-9-4-5-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-8-6-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(#linearGradient3962-9);fill-opacity:1;stroke:#ef2929;stroke-width:2.9828577;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-8-2-0"
+           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_CreateEllipse_3points.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points.svg
index c81765c1a8..02a43277ce 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_CreateEllipse_2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateEllipse.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"
@@ -23,6 +23,30 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs2920">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3890" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3892" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3882" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3884" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -109,6 +133,134 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3880"
+       id="linearGradient3886"
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3888"
+       id="linearGradient3894"
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3888"
+       id="linearGradient3901"
+       gradientUnits="userSpaceOnUse"
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3880"
+       id="linearGradient3903"
+       gradientUnits="userSpaceOnUse"
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </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
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-7"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
+    </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
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-1"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <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>
+    <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-9"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -117,19 +269,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="6.1640625"
+     inkscape:cx="-17.579372"
+     inkscape:cy="46.723316"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3072"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -138,7 +300,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -152,183 +314,81 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="m 1876.0597,429.77721 c -0.7933,0.0219 -1.56,0.0905 -2.3598,0.15345 -25.5938,2.0169 -44.7188,24.14994 -42.6591,49.40342 2.0596,25.25348 24.5027,44.10722 50.0964,42.09031 25.5939,-2.01691 44.7189,-24.14993 42.6591,-49.40343 -1.9954,-24.46431 -23.1497,-42.94739 -47.7366,-42.24375 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1588.8774,687.02561 c -0.7934,0.0218 -1.5602,0.0904 -2.3599,0.15344 -25.5938,2.0169 -44.7187,24.14996 -42.659,49.40343 2.0596,25.25348 24.5025,44.1072 50.0963,42.0903 25.5939,-2.01691 44.7189,-24.14993 42.6592,-49.40343 -1.9956,-24.4643 -23.1497,-42.94738 -47.7366,-42.24374 z"
-         id="path3766"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1661.7622,478.15981 c -0.7932,0.0218 -1.5601,0.0904 -2.3598,0.15345 -25.5939,2.0169 -44.7188,24.14995 -42.6591,49.40342 2.0598,25.25348 24.5024,44.10723 50.0963,42.09032 25.594,-2.01692 44.7189,-24.14993 42.6592,-49.40344 -1.9955,-24.46432 -23.1498,-42.94739 -47.7366,-42.24374 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         id="path4439"
-         d="m 1713.3268,476.68131 c -100.1655,55.38349 -170.1851,161.20602 -156.2817,236.19334 13.9031,74.9874 109.5838,95.95727 209.7496,40.57369 81.0012,-44.78711 142.2749,-115.28006 155.4094,-183.05607 5.5762,-27.20526 2.0671,-61.33814 -8.0478,-83.74115 -29.3964,-50.96474 -114.3077,-57.80935 -200.8295,-9.96981 z m 3.5338,27.64 c 68.1358,-37.67356 131.9305,-34.42913 156.5781,4.35572 7.2225,24.93025 7.8201,45.37307 7.8866,64.17412 -11.8116,53.61227 -60.3201,114.26294 -124.0411,149.49559 -80.376,44.44149 -154.6709,31.67325 -165.8272,-28.49909 -11.1565,-60.17235 45.0275,-145.08482 125.4036,-189.52634 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssccssccsss" />
       <g
-         id="g3768"
-         transform="matrix(1.0075123,-0.53237817,0.10889871,0.76794087,-58.280308,1054.9072)">
-        <g
-           id="g4428">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 124.7524,-41.01889 153.2227,-75.28061 26.2171,-32.47234 31.4591,-91.69452 28.804,-128.25834 -2.6923,-98.00357 -91.2036,-181.25544 -189.244,-181.25544 z m 43.1124,46.90779 c 78.671,-10e-6 145.7618,83.15656 140.1859,145.45661 -12.5364,111.12065 -101.0834,129.61806 -151.354,132.80806 -78.9983,4.42259 -145.8735,-57.76902 -145.8735,-137.83998 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="csscccccccscc" />
-          <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="g3177" />
-          <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="g3185" />
-        </g>
+         id="g3896"
+         transform="translate(-4.8153656e-6,0)">
+        <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);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);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="g3800"
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,-43.113878,733.27203)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4043);fill-opacity:1;stroke:none"
-                 id="path3794"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1671.0275,695.71384)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
       <g
-         id="g3800-6"
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,32.778145,529.17248)">
-        <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1732.6569,483.43542)"
+         id="g3797-9-4-5-6">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
       <g
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,242.57958,480.45361)"
-         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">
-              <path
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3033);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1958.6307,394.41542)"
+         id="g3797-9-4-5-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-8-6-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(#linearGradient3962-9);fill-opacity:1;stroke:#ef2929;stroke-width:2.9828577;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-8-2-0"
+           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_CreateEllipse_3points_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points_Constr.svg
index 9ce25a74cd..31f9a2e721 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points_Constr.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateEllipse_3points_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateEllipse_Constr.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"
@@ -23,6 +23,30 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs2920">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3890" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3892" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3882" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop3884" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -76,39 +100,116 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient4041"
+       xlink:href="#linearGradient3888"
+       id="linearGradient3901"
        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
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
+       xlink:href="#linearGradient3880"
+       id="linearGradient3903"
        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
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836-0-7-7"
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3033"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3922-7"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
+    </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
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-1"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <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>
+    <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-9"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -117,19 +218,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.7933653"
-     inkscape:cx="9.020778"
-     inkscape:cy="25.232855"
+     inkscape:zoom="17.434602"
+     inkscape:cx="18.421936"
+     inkscape:cy="33.264933"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3072"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -152,176 +263,81 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="m 1876.0597,429.77721 c -0.7933,0.0219 -1.56,0.0905 -2.3598,0.15345 -25.5938,2.0169 -44.7188,24.14994 -42.6591,49.40342 2.0596,25.25348 24.5027,44.10722 50.0964,42.09031 25.5939,-2.01691 44.7189,-24.14993 42.6591,-49.40343 -1.9954,-24.46431 -23.1497,-42.94739 -47.7366,-42.24375 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1588.8774,687.02561 c -0.7934,0.0218 -1.5602,0.0904 -2.3599,0.15344 -25.5938,2.0169 -44.7187,24.14996 -42.659,49.40343 2.0596,25.25348 24.5025,44.1072 50.0963,42.0903 25.5939,-2.01691 44.7189,-24.14993 42.6592,-49.40343 -1.9956,-24.4643 -23.1497,-42.94738 -47.7366,-42.24374 z"
-         id="path3766"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1661.7622,478.15981 c -0.7932,0.0218 -1.5601,0.0904 -2.3598,0.15345 -25.5939,2.0169 -44.7188,24.14995 -42.6591,49.40342 2.0598,25.25348 24.5024,44.10723 50.0963,42.09032 25.594,-2.01692 44.7189,-24.14993 42.6592,-49.40344 -1.9955,-24.46432 -23.1498,-42.94739 -47.7366,-42.24374 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         id="path4439"
-         d="m 1713.3268,476.68131 c -100.1655,55.38349 -170.1851,161.20602 -156.2817,236.19334 13.9031,74.9874 109.5838,95.95727 209.7496,40.57369 81.0012,-44.78711 142.2749,-115.28006 155.4094,-183.05607 5.5762,-27.20526 2.0671,-61.33814 -8.0478,-83.74115 -29.3964,-50.96474 -114.3077,-57.80935 -200.8295,-9.96981 z m 3.5338,27.64 c 68.1358,-37.67356 131.9305,-34.42913 156.5781,4.35572 7.2225,24.93025 7.8201,45.37307 7.8866,64.17412 -11.8116,53.61227 -60.3201,114.26294 -124.0411,149.49559 -80.376,44.44149 -154.6709,31.67325 -165.8272,-28.49909 -11.1565,-60.17235 45.0275,-145.08482 125.4036,-189.52634 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssccssccsss" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1671.3894,474.10431 c -93.6954,51.11706 -139.7906,146.13536 -128.9241,222.76451 10.8665,76.62917 109.7969,107.37259 208.5132,50.95151 83.4735,-47.70907 121.2227,-97.91553 146.1758,-139.38347 22.8779,-38.89425 21.71,-87.16411 15.0532,-113.82945 -13.385,-73.82762 -111.6272,-90.63865 -210.4041,-38.44408 z m 48.5444,13.07031 c 79.262,-41.88274 155.9125,-13.74108 157.0791,37.07016 -0.5297,92.00819 -87.7276,153.3536 -138.0284,182.5663 -79.1102,45.45326 -153.2603,33.29668 -161.98,-28.19309 -8.7196,-61.48975 51.5513,-142.62013 132.2237,-185.24813 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.28941298;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="csscccccccscc" />
       <g
-         inkscape:export-ydpi="7.2934141"
-         inkscape:export-xdpi="7.2934141"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         transform="matrix(-1.0044581,0.55150482,-0.13417835,-0.75432229,2175.3961,904.92925)"
-         id="g3177" />
-      <g
-         inkscape:export-ydpi="7.2934141"
-         inkscape:export-xdpi="7.2934141"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         transform="matrix(-1.0024695,0.56207008,-0.14830656,-0.74648304,2014.2135,983.79096)"
-         id="g3185" />
-      <g
-         id="g3800"
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,-43.113878,733.27203)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4043);fill-opacity:1;stroke:none"
-                 id="path3794"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         id="g3896"
+         transform="translate(-4.8153656e-6,0)">
+        <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:#0b1521;stroke-width:9.45016002999999927;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;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);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);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="g3800-6"
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,32.778145,529.17248)">
-        <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1671.0275,695.71384)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
       <g
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,242.57958,480.45361)"
-         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">
-              <path
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3033);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1732.6569,483.43542)"
+         id="g3797-9-4-5-6">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
+      <g
+         transform="matrix(4.5913999,0,0,4.591325,1958.6307,394.41542)"
+         id="g3797-9-4-5-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-8-6-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(#linearGradient3962-9);fill-opacity:1;stroke:#ef2929;stroke-width:2.9828577;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-8-2-0"
+           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_CreateEllipse_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_Constr.svg
index fc5517e185..d302c13c10 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_Constr.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateEllipse_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateEllipse.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"
@@ -23,6 +23,30 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs2920">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3890" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3892" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3882" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop3884" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -76,39 +100,116 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient4041"
+       xlink:href="#linearGradient3888"
+       id="linearGradient3901"
        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
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
+       xlink:href="#linearGradient3880"
+       id="linearGradient3903"
        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
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836-0-7-7"
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3033"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3922-7"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
+    </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
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-1"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <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>
+    <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-9"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -117,19 +218,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.7933653"
-     inkscape:cx="16.395079"
-     inkscape:cy="31.023646"
-     inkscape:current-layer="g4470"
+     inkscape:zoom="17.434602"
+     inkscape:cx="18.307222"
+     inkscape:cy="33.723791"
+     inkscape:current-layer="g3896"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3072"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -152,176 +263,81 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="m 1876.0597,429.77721 c -0.7933,0.0219 -1.56,0.0905 -2.3598,0.15345 -25.5938,2.0169 -44.7188,24.14994 -42.6591,49.40342 2.0596,25.25348 24.5027,44.10722 50.0964,42.09031 25.5939,-2.01691 44.7189,-24.14993 42.6591,-49.40343 -1.9954,-24.46431 -23.1497,-42.94739 -47.7366,-42.24375 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1744.4042,565.93689 c -0.7934,0.0218 -1.5602,0.0904 -2.3599,0.15344 -25.5938,2.0169 -44.7187,24.14996 -42.659,49.40343 2.0596,25.25348 24.5025,44.1072 50.0963,42.0903 25.5939,-2.01691 44.7189,-24.14993 42.6592,-49.40343 -1.9956,-24.4643 -23.1497,-42.94738 -47.7366,-42.24374 z"
-         id="path3766"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1661.7622,478.15981 c -0.7932,0.0218 -1.5601,0.0904 -2.3598,0.15345 -25.5939,2.0169 -44.7188,24.14995 -42.6591,49.40342 2.0598,25.25348 24.5024,44.10723 50.0963,42.09032 25.594,-2.01692 44.7189,-24.14993 42.6592,-49.40344 -1.9955,-24.46432 -23.1498,-42.94739 -47.7366,-42.24374 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         id="path4439"
-         d="m 1713.3268,476.68131 c -100.1655,55.38349 -170.1851,161.20602 -156.2817,236.19334 13.9031,74.9874 109.5838,95.95727 209.7496,40.57369 81.0012,-44.78711 142.2749,-115.28006 155.4094,-183.05607 5.5762,-27.20526 2.0671,-61.33814 -8.0478,-83.74115 -29.3964,-50.96474 -114.3077,-57.80935 -200.8295,-9.96981 z m 3.5338,27.64 c 68.1358,-37.67356 131.9305,-34.42913 156.5781,4.35572 7.2225,24.93025 7.8201,45.37307 7.8866,64.17412 -11.8116,53.61227 -60.3201,114.26294 -124.0411,149.49559 -80.376,44.44149 -154.6709,31.67325 -165.8272,-28.49909 -11.1565,-60.17235 45.0275,-145.08482 125.4036,-189.52634 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="sssccssccsss" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1671.3894,474.10431 c -93.6954,51.11706 -139.7906,146.13536 -128.9241,222.76451 10.8665,76.62917 109.7969,107.37259 208.5132,50.95151 83.4735,-47.70907 121.2227,-97.91553 146.1758,-139.38347 22.8779,-38.89425 21.71,-87.16411 15.0532,-113.82945 -13.385,-73.82762 -111.6272,-90.63865 -210.4041,-38.44408 z m 48.5444,13.07031 c 79.262,-41.88274 155.9125,-13.74108 157.0791,37.07016 -0.5297,92.00819 -87.7276,153.3536 -138.0284,182.5663 -79.1102,45.45326 -153.2603,33.29668 -161.98,-28.19309 -8.7196,-61.48975 51.5513,-142.62013 132.2237,-185.24813 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.28941298;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="csscccccccscc" />
       <g
-         inkscape:export-ydpi="7.2934141"
-         inkscape:export-xdpi="7.2934141"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         transform="matrix(-1.0044581,0.55150482,-0.13417835,-0.75432229,2175.3961,904.92925)"
-         id="g3177" />
-      <g
-         inkscape:export-ydpi="7.2934141"
-         inkscape:export-xdpi="7.2934141"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         transform="matrix(-1.0024695,0.56207008,-0.14830656,-0.74648304,2014.2135,983.79096)"
-         id="g3185" />
-      <g
-         id="g3800"
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,112.41292,612.18331)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4043);fill-opacity:1;stroke:none"
-                 id="path3794"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         id="g3896"
+         transform="translate(-4.8153656e-6,0)">
+        <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:#0b1521;stroke-width:9.45016002999999927;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;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);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);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="g3800-6"
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,32.778145,529.17248)">
-        <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1807.9815,558.76004)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
       <g
-         transform="matrix(0.95686384,-0.03824836,0.03934821,0.94411711,242.57958,480.45361)"
-         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">
-              <path
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3033);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1732.6569,483.43542)"
+         id="g3797-9-4-5-6">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
+      <g
+         transform="matrix(4.5913999,0,0,4.591325,1958.6307,394.41542)"
+         id="g3797-9-4-5-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-8-6-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(#linearGradient3962-9);fill-opacity:1;stroke:#ef2929;stroke-width:2.9828577;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-8-2-0"
+           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_CreateFillet.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateFillet.svg
index 67cb87ccd1..52d21273eb 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateFillet.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateFillet.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreateFillet.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -186,6 +186,67 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3801-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="translate(-90,-5.9999999)" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082-3"
+       xlink:href="#linearGradient3836-9-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -194,18 +255,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="37.683611"
-     inkscape:cy="30.417292"
-     inkscape:current-layer="g2337"
+     inkscape:zoom="11.313709"
+     inkscape:cx="16.575075"
+     inkscape:cy="21.724436"
+     inkscape:current-layer="g3389-6"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="756"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3018"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -228,45 +298,6 @@
        inkscape:export-xdpi="6.7480335"
        inkscape:export-ydpi="6.7480335"
        transform="matrix(0.146567,0,0,0.146567,70.402359,-55.12963)">
-      <path
-         style="fill:#000000;fill-opacity:0.5098038;fill-rule:evenodd;stroke:none;stroke-width:0.85000002;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -421.653,419.0319 0,40.51049 c -17.40744,6.1389 -29.73085,22.98371 -29.21019,42.4294 0.59167,22.09832 17.43172,39.86184 38.80477,42.21619 0.91033,4.32399 1.84249,8.55307 2.98499,12.79278 l -8.1021,0 0,63.32428 20.04203,0 0,-29.84983 c 25.75198,58.89725 74.50113,106.39769 135.60351,131.97889 l -22.17416,0 0,20.04203 63.32428,0 0,-6.82282 c 6.20372,1.47825 12.39195,2.79489 18.76275,3.83784 3.29645,20.40162 20.81199,36.18636 42.21619,36.67264 19.38021,0.44028 36.0951,-11.87383 42.21619,-29.21019 l 54.15613,0 0,-28.99697 -54.36934,0 c -5.87854,-16.63066 -21.40339,-28.78578 -40.08406,-29.21019 -16.66091,-0.37853 -31.33304,8.62789 -39.01799,22.17416 -93.78256,-15.80491 -168.25279,-85.0023 -187.20108,-173.34223 12.47707,-7.98812 20.68068,-22.06243 20.25524,-37.95193 -0.49936,-18.65148 -12.59334,-34.25282 -29.21019,-40.08405 l 0,-40.51049 -28.99697,0 z m 4.47747,213.85271 0,63.32428 20.04203,0 0,-63.32428 -20.04203,0 z m 0,75.90386 0,13.64563 -29.63662,0 0,20.04203 29.63662,0 0,29.63662 20.04203,0 0,-29.63662 13.64564,0 0,-20.04203 -13.64564,0 0,-13.64563 -20.04203,0 z m 51.81078,13.64563 0,20.04203 63.53749,0 0,-20.04203 -63.53749,0 z"
-         id="path3667-51"
-         sodipodi:nodetypes="ccsccccccccccccsccccsccscccccccccccccccccccccccccc" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -242.4459,723.09851 0,-20.17969 -63.39081,0 0,20.17969 63.39081,0 z"
-         id="path3667"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -419.15686,537.52215 -20.1797,0 0,63.3908 20.1797,0 0,-63.3908 z"
-         id="path3667-5"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -414.83265,399.6778 -28.82813,0 0,90.55829 28.82813,0 0,-90.5583 z"
-         id="path3624-9"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path3671-7"
-         d="m -419.15686,613.39766 -20.1797,0 0,63.39081 20.1797,0 0,-63.39081 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.85000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 6 45.90625 L 6 47.90625 L 1.6875 47.90625 L 1.6875 50.84375 L 6 50.84375 L 6 55.1875 L 8.96875 55.1875 L 8.96875 50.84375 L 10.96875 50.84375 L 10.96875 47.90625 L 8.96875 47.90625 L 8.96875 45.90625 L 6 45.90625 z "
-         transform="matrix(6.8228182,0,0,6.8228182,-480.3425,376.13944)"
-         id="path3673-6" />
-      <path
-         id="path2380"
-         d="m -179.58516,723.68999 0,-28.82812 c -127.62718,-0.92428 -230.90625,-99.62104 -230.90625,-221.11875 0,-0.13948 -2.3e-4,-0.26062 0,-0.39375 l -28.8,-0.28125 c -0.009,0.87193 0,1.60304 0,2.475 0,136.97484 116.34399,248.14686 259.70625,248.14687 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -85.12179,727.42273 0,-28.82813 -90.5583,0 0,28.82813 90.5583,0 z"
-         id="path3624"
-         sodipodi:nodetypes="ccccc" />
       <g
          inkscape:export-ydpi="7.0721951"
          inkscape:export-xdpi="7.0721951"
@@ -274,58 +305,130 @@
          transform="matrix(-0.87233598,0.22142698,-0.22142698,-0.87233598,136.46852,1240.9273)"
          id="g2337"
          style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none">
-        <path
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.44377278999999969;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path2339"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3675);fill-opacity:1;stroke:none"
-           id="path2341"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+        <g
+           id="g3401-3"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+           inkscape:export-xdpi="6.7480335"
+           inkscape:export-ydpi="6.7480335"
+           transform="matrix(1.076958,0.27336665,-0.27336665,1.076958,916.44055,166.86771)">
+          <g
+             id="g3389-6">
+            <rect
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.6456356;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+               id="rect3083-62"
+               width="27.291325"
+               height="54.582546"
+               x="-574.18408"
+               y="-485.672"
+               transform="matrix(0,-1,1,0,0,0)" />
+            <rect
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+               id="rect3083-6"
+               width="40.936913"
+               height="54.582546"
+               x="280.98743"
+               y="-751.57739"
+               transform="scale(-1,-1)" />
+            <path
+               style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 61,55 0,-6 -9.999941,0.0205 C 30.215744,48.890477 15.000119,34.82717 15.000119,15.040998 15.000119,15.018288 15,3.0000006 15,3.0000006 l -5.9999999,0 c 0,0 0,11.8580004 0,12.0000004 C 9,37.306655 27.653134,54.999999 51,55 l 0,0 z"
+               id="path3077"
+               inkscape:connector-curvature="0"
+               transform="matrix(-6.8228185,4.776128e-8,-4.776128e-8,-6.8228185,-219.58206,922.14785)"
+               sodipodi:nodetypes="cccsccsccc" />
+            <path
+               style="fill:none;stroke:#ffffff;stroke-width:13.64563656;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m -560.72297,574.18408 c 150.102,0 252.44428,115.98792 252.44428,238.79865"
+               id="path3892"
+               inkscape:connector-curvature="0"
+               sodipodi:nodetypes="cc" />
+            <path
+               style="fill:none;stroke:#ffffff;stroke-width:1.99999999000000006;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="m 11,4 0,12"
+               id="path3079"
+               inkscape:connector-curvature="0"
+               transform="matrix(-6.8228185,4.776128e-8,-4.776128e-8,-6.8228185,-219.58206,922.14785)" />
+            <path
+               style="fill:none;stroke:#ffffff;stroke-width:1.99999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+               d="M 60,51 49,51"
+               id="path3081"
+               inkscape:connector-curvature="0"
+               transform="matrix(-6.8228185,4.776128e-8,-4.776128e-8,-6.8228185,-219.58206,922.14785)" />
+            <rect
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563751;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+               id="rect3083"
+               width="27.291277"
+               height="54.582546"
+               x="280.98743"
+               y="-560.53864"
+               transform="scale(-1,-1)" />
+            <rect
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+               id="rect3083-3"
+               width="27.291368"
+               height="54.582546"
+               x="280.98734"
+               y="-656.05823"
+               transform="scale(-1,-1)" />
+            <rect
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+               id="rect3083-7"
+               width="27.291306"
+               height="54.582546"
+               x="-574.18408"
+               y="-294.63324"
+               transform="matrix(0,-1,1,0,0,0)" />
+            <rect
+               style="fill:#d3d7cf;fill-opacity:1;stroke:none"
+               id="rect3083-5"
+               width="13.645644"
+               height="40.936916"
+               x="287.81024"
+               y="-553.71564"
+               transform="scale(-1,-1)" />
+            <rect
+               style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+               id="rect3083-35"
+               width="27.291306"
+               height="54.582546"
+               x="-574.18408"
+               y="-390.15253"
+               transform="matrix(0,-1,1,0,0,0)" />
+          </g>
+        </g>
+        <g
+           transform="matrix(-7.347889,-1.865131,1.865131,-7.347889,-431.71495,850.47877)"
+           id="g3827-0">
+          <g
+             transform="translate(31.322131,40.570289)"
+             id="g3797-7">
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="path4250-6"
+               d="M -116.1562,-0.41737399 A 8.993818,8.9934077 0.02042283 1 1 -102.49379,11.282241 8.993818,8.9934077 0.02042283 1 1 -116.1562,-0.41737399 z" />
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="path4250-7-0"
+               d="M -114.63359,0.89358801 A 6.9999997,7.0000001 0 1 1 -104,10 6.9999997,7.0000001 0 0 1 -114.63359,0.89358801 z" />
+          </g>
+        </g>
+        <g
+           transform="matrix(-7.347889,-1.865131,1.865131,-7.347889,221.16912,949.17081)"
+           id="g3797-7-6">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-6-0"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3082-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-0-6"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
       </g>
-      <g
-         inkscape:export-ydpi="7.0721951"
-         inkscape:export-xdpi="7.0721951"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-         transform="matrix(-0.89993249,0.01101938,-0.01101938,-0.89993249,-244.61134,1068.8036)"
-         id="g2372">
-        <path
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:6.44377327000000033;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path2374"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-           transform="matrix(-0.95204954,0.30594391,-0.30594391,-0.95204954,585.29297,1218.7059)" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3718);fill-opacity:1;stroke:none"
-           id="path2376"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-      </g>
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path3671"
-         d="m -323.97856,723.09851 0,-20.17969 -63.39081,0 0,20.17969 63.39081,0 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon.svg
index 73b66fae72..5e9fd02966 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon.svg
@@ -8,10 +8,44 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="64"
    height="64"
-   id="svg2">
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateHeptagon.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview40"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     inkscape:zoom="5.2149125"
+     inkscape:cx="-0.36048895"
+     inkscape:cy="17.253721"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3062"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -236,6 +270,66 @@
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4-6"
+       id="linearGradient3801-1-3-7-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9-5" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -245,47 +339,96 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <path
-     d="M 34.8125,6.875 A 2.50025,2.50025 0 0 0 34.09375,7 l -20.625,7 A 2.50025,2.50025 0 0 0 11.9375,15.5 L 4.53125,35.96875 A 2.50025,2.50025 0 0 0 4.75,38.125 l 11.375,18.5625 a 2.50025,2.50025 0 0 0 1.84375,1.15625 L 39.5625,60.5 A 2.50025,2.50025 0 0 0 41.625,59.8125 L 57.15625,44.59375 a 2.50025,2.50025 0 0 0 0.75,-2.03125 l -1.5625,-15.09375 a 7.2116405,7.0332467 0 0 0 4.0625,-6.03125 7.2116405,7.0332467 0 0 0 -11.4375,-5.96875 l -0.03125,0 L 36.25,7.28125 A 2.50025,2.50025 0 0 0 34.8125,6.875 z m -0.21875,5.25 11.5625,7.46875 A 7.2116405,7.0332467 0 0 0 46,20.875 a 7.2116405,7.0332467 0 0 0 5.40625,7.09375 l 1.40625,13.875 -13.84375,13.5625 -19.1875,-2.375 -10.15625,-16.5 6.59375,-18.1875 18.375,-6.21875 z m -3,15.125 A 7.2116405,7.0332467 0 0 0 24.625,34 7.2116405,7.0332467 0 1 0 39.03125,34.5625 7.2116405,7.0332467 0 0 0 31.59375,27.25 z"
-     id="path4782"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:0.84700072;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+     sodipodi:type="star"
+     style="fill:none;stroke:#2e3436;stroke-width:24.43471527;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064"
+     sodipodi:sides="7"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.2341971"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 60.999998,60.999998 -6.1838169,84.508631 -66.45203,46.639603 l -7.969418,-70.730539 50.330511,-50.330512 70.73054,7.969417 37.869028,60.2682136 z"
+     inkscape:transform-center-x="0.96613677"
+     inkscape:transform-center-y="-3.3365024"
+     transform="matrix(0.31413596,0.0860429,-0.08666285,0.3174932,30.916893,31.701158)" />
   <g
-     id="g4771">
-    <path
-       d="M 32.8125,2.375 A 2.50025,2.50025 0 0 0 32.09375,2.5 l -20.625,7 A 2.50025,2.50025 0 0 0 9.9375,11 L 2.53125,31.46875 A 2.50025,2.50025 0 0 0 2.75,33.625 l 11.375,18.5625 a 2.50025,2.50025 0 0 0 1.84375,1.15625 L 37.5625,56 A 2.50025,2.50025 0 0 0 39.625,55.3125 L 55.15625,40.09375 a 2.50025,2.50025 0 0 0 0.75,-2.03125 L 53.6875,16.40625 A 2.50025,2.50025 0 0 0 52.5625,14.5625 L 34.25,2.78125 A 2.50025,2.50025 0 0 0 32.8125,2.375 z m -0.21875,5.25 16.25,10.46875 1.96875,19.25 -13.84375,13.5625 -19.1875,-2.375 -10.15625,-16.5 6.59375,-18.1875 18.375,-6.21875 z"
-       id="path4763"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.847;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+     transform="translate(20,-20)"
+     id="g3827-1-3-4-3">
     <g
-       transform="matrix(0.99742747,0,0,0.97275418,11.139278,-982.6724)"
-       id="g3038">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8-5">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         id="path3040"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         id="path3042"
-         style="fill:url(#radialGradient4568);fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
+  </g>
+  <path
+     sodipodi:type="star"
+     style="fill:none;stroke:#d3d7cf;stroke-width:12.21735764;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064-9"
+     sodipodi:sides="7"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.2341971"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 60.999998,60.999998 -6.1838169,84.508631 -66.45203,46.639603 l -7.969418,-70.730539 50.330511,-50.330512 70.73054,7.969417 37.869028,60.2682136 z"
+     inkscape:transform-center-x="0.96613677"
+     inkscape:transform-center-y="-3.3365024"
+     transform="matrix(0.31413596,0.0860429,-0.08666285,0.3174932,30.916893,31.701158)" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1"
+     inkscape:transform-center-x="1.0032955"
+     inkscape:transform-center-y="-3.4648292"
+     d="M 5,41.129312 8.765699,17.097051 29.71397,5 52.070337,13.947485 59,37.201867"
+     id="path3064-9-1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1"
+     inkscape:transform-center-x="0.92897747"
+     inkscape:transform-center-y="-3.208175"
+     d="M 57,36.816544 44.300724,55.381596 22.04863,57 7,40.453067"
+     id="path3064-9-2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <g
+     transform="translate(40,-38)"
+     id="g3827-1-3-4">
     <g
-       transform="matrix(0.99742747,0,0,0.97275418,32.514946,-995.79158)"
-       id="g3044">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         id="path3046"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         id="path3048"
-         style="fill:url(#radialGradient4570);fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon_Constr.svg
index 5719a9d2b2..fc107afca7 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon_Constr.svg
@@ -14,8 +14,8 @@
    width="64"
    height="64"
    id="svg2"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateHeptagon_Constr.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateHeptagon.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -26,16 +26,26 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-height="1137"
      id="namedview40"
-     showgrid="false"
-     inkscape:zoom="11.494629"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="17.493094"
+     inkscape:cy="11.863236"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3062"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -260,6 +270,66 @@
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4-6"
+       id="linearGradient3801-1-3-7-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9-5" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -274,44 +344,91 @@
     </rdf:RDF>
   </metadata>
   <path
-     d="M 34.8125,6.875 A 2.50025,2.50025 0 0 0 34.09375,7 l -20.625,7 A 2.50025,2.50025 0 0 0 11.9375,15.5 L 4.53125,35.96875 A 2.50025,2.50025 0 0 0 4.75,38.125 l 11.375,18.5625 a 2.50025,2.50025 0 0 0 1.84375,1.15625 L 39.5625,60.5 A 2.50025,2.50025 0 0 0 41.625,59.8125 L 57.15625,44.59375 a 2.50025,2.50025 0 0 0 0.75,-2.03125 l -1.5625,-15.09375 a 7.2116405,7.0332467 0 0 0 4.0625,-6.03125 7.2116405,7.0332467 0 0 0 -11.4375,-5.96875 l -0.03125,0 L 36.25,7.28125 A 2.50025,2.50025 0 0 0 34.8125,6.875 z m -0.21875,5.25 11.5625,7.46875 A 7.2116405,7.0332467 0 0 0 46,20.875 a 7.2116405,7.0332467 0 0 0 5.40625,7.09375 l 1.40625,13.875 -13.84375,13.5625 -19.1875,-2.375 -10.15625,-16.5 6.59375,-18.1875 18.375,-6.21875 z m -3,15.125 A 7.2116405,7.0332467 0 0 0 24.625,34 7.2116405,7.0332467 0 1 0 39.03125,34.5625 7.2116405,7.0332467 0 0 0 31.59375,27.25 z"
-     id="path4782"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:0.84700072;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-  <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;stroke:#000000;stroke-width:0.847;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4763"
-     d="M 32.8125,2.375 A 2.50025,2.50025 0 0 0 32.09375,2.5 l -20.625,7 A 2.50025,2.50025 0 0 0 9.9375,11 L 2.53125,31.46875 A 2.50025,2.50025 0 0 0 2.75,33.625 l 11.375,18.5625 a 2.50025,2.50025 0 0 0 1.84375,1.15625 L 37.5625,56 A 2.50025,2.50025 0 0 0 39.625,55.3125 L 55.15625,40.09375 a 2.50025,2.50025 0 0 0 0.75,-2.03125 L 53.6875,16.40625 A 2.50025,2.50025 0 0 0 52.5625,14.5625 L 34.25,2.78125 A 2.50025,2.50025 0 0 0 32.8125,2.375 Z m -0.21875,5.25 16.25,10.46875 1.96875,19.25 -13.84375,13.5625 -19.1875,-2.375 -10.15625,-16.5 6.59375,-18.1875 18.375,-6.21875 z" />
+     sodipodi:type="star"
+     style="fill:none;stroke:#0b1521;stroke-width:24.43471527000000165;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064"
+     sodipodi:sides="7"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.2341971"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 60.999998,60.999998 -6.1838169,84.508631 -66.45203,46.639603 l -7.969418,-70.730539 50.330511,-50.330512 70.73054,7.969417 37.869028,60.2682136 z"
+     inkscape:transform-center-x="0.96613677"
+     inkscape:transform-center-y="-3.3365024"
+     transform="matrix(0.31413596,0.0860429,-0.08666285,0.3174932,30.916893,31.701158)" />
   <g
-     id="g3038"
-     transform="matrix(0.99742747,0,0,0.97275418,11.139278,-982.6724)">
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3040"
-       transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient4568);fill-opacity:1;stroke:none"
-       id="path3042"
-       transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-       d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+     transform="translate(20,-20)"
+     id="g3827-1-3-4-3">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8-5">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
+  <path
+     sodipodi:type="star"
+     style="fill:none;stroke:#3465a4;stroke-width:12.21735763999999946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064-9"
+     sodipodi:sides="7"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.2341971"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 60.999998,60.999998 -6.1838169,84.508631 -66.45203,46.639603 l -7.969418,-70.730539 50.330511,-50.330512 70.73054,7.969417 37.869028,60.2682136 z"
+     inkscape:transform-center-x="0.96613677"
+     inkscape:transform-center-y="-3.3365024"
+     transform="matrix(0.31413596,0.0860429,-0.08666285,0.3174932,30.916893,31.701158)" />
+  <path
+     style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+     inkscape:transform-center-x="1.0032955"
+     inkscape:transform-center-y="-3.4648292"
+     d="M 5,41.129312 8.765699,17.097051 29.71397,5 52.070337,13.947485 59,37.201867"
+     id="path3064-9-1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+     inkscape:transform-center-x="0.92897747"
+     inkscape:transform-center-y="-3.208175"
+     d="M 57,36.816544 44.300724,55.381596 22.04863,57 7,40.453067"
+     id="path3064-9-2"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
   <g
-     id="g3044"
-     transform="matrix(0.99742747,0,0,0.97275418,32.514946,-995.79158)">
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3046"
-       transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient4570);fill-opacity:1;stroke:none"
-       id="path3048"
-       transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-       d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+     transform="translate(40,-38)"
+     id="g3827-1-3-4">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon.svg
index d923d79ec6..cea045f0e5 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon.svg
@@ -8,10 +8,44 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="64"
    height="64"
-   id="svg2">
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateHeptagon.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview40"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="22.251541"
+     inkscape:cy="31.188477"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3062"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -196,6 +230,106 @@
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4568"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4570"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4796"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4798"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4-6"
+       id="linearGradient3801-1-3-7-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9-5" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -210,43 +344,93 @@
     </rdf:RDF>
   </metadata>
   <path
-     d="m 27.78125,1.96875 -1.0625,0.59375 -23.34375,12.75 -1.15625,0.65625 0,1.34375 0,24.5625 0,1.34375 1.15625,0.65625 23.3125,13.0625 1.125,0.65625 1.09375,-0.65625 23.3125,-13.40625 1.125,-0.625 0,-1.28125 0,-19.25 A 7.2116405,7.0332467 0 0 0 56.375,16.9375 7.2116405,7.0332467 0 0 0 44.6875,11.125 L 28.875,2.5625 27.78125,1.96875 z m 0.03125,5.09375 14.375,7.8125 a 7.2116405,7.0332467 0 0 0 -0.21875,1.5 7.2116405,7.0332467 0 0 0 6.90625,7.28125 l 0,16.65625 -21.0625,12.09375 -21.09375,-11.8125 0,-22 L 27.8125,7.0625 z M 27.5625,22.75 A 7.2116405,7.0332467 0 0 0 20.59375,29.5 7.2116405,7.0332467 0 1 0 35,30.0625 7.2116405,7.0332467 0 0 0 27.5625,22.75 z"
-     transform="translate(1.985,4.458)"
-     id="path3069"
-     style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     sodipodi:type="star"
+     style="fill:none;stroke:#2e3436;stroke-width:24.46091843;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064"
+     sodipodi:sides="6"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.3089969"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 60.999998,60.999998 -79.22947,21.229473 -57.999998,-57.999998 21.229472,-79.229471 79.22947,-21.229473 57.999998,57.999998 z"
+     inkscape:transform-center-x="2.5928771"
+     inkscape:transform-center-y="-2.3198451"
+     transform="matrix(0.3261306,-0.07958242,0.08663215,0.30683668,28.761712,31.318237)" />
   <g
-     id="g3034">
-    <path
-       d="M 27.770599,1.95537 26.705796,2.54693 3.3688662,15.3246 l -1.1535364,0.6506 0,1.331 0,24.5792 0,1.3311 1.1535364,0.6507 23.3073518,13.0733 1.123959,0.6507 1.094381,-0.6507 23.336929,-13.3988 1.123958,-0.6211 0,-1.3014 0,-24.4609 0,-1.331 L 52.172331,15.1766 28.86498,2.54693 27.770599,1.95537 z m 0.02957,5.11697 21.059434,11.41696 0,21.8285 L 27.800169,52.4151 6.7111564,40.584 l 0,-21.9763 L 27.800169,7.07234 z"
-       id="path3036"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.80167824;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+     transform="translate(18,-20)"
+     id="g3827-1-3-4-3">
     <g
-       transform="matrix(0.99742747,0,0,0.97275418,9.0959481,-982.6724)"
-       id="g3038">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8-5">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         id="path3040"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         id="path3042"
-         style="fill:url(#radialGradient3912);fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
+  </g>
+  <path
+     sodipodi:type="star"
+     style="fill:none;stroke:#d3d7cf;stroke-width:12.23045864999999921;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064-3"
+     sodipodi:sides="6"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.3089969"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 60.999998,60.999998 -79.22947,21.229473 -57.999998,-57.999998 21.229472,-79.229471 79.22947,-21.229473 57.999998,57.999998 z"
+     inkscape:transform-center-x="2.5928771"
+     inkscape:transform-center-y="-2.3198451"
+     transform="matrix(0.3261306,-0.07958242,0.08663215,0.30683668,28.761712,31.318237)" />
+  <path
+     transform="matrix(0.33971938,-0.08264328,0.09024183,0.31863808,28.710116,31.292016)"
+     style="fill:none;stroke:#ffffff;stroke-width:5.87967253;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1"
+     inkscape:transform-center-x="2.7009142"
+     inkscape:transform-center-y="-2.4090693"
+     d="m -76.22947,24.229473 21.229472,-79.229471 79.22947,-21.229473 57.999998,57.999998"
+     id="path3064-3-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     transform="matrix(0.31254183,-0.07652156,0.08302249,0.29503526,28.813307,31.344459)"
+     style="fill:none;stroke:#ffffff;stroke-width:6.37046432;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1"
+     inkscape:transform-center-x="2.484841"
+     inkscape:transform-center-y="-2.23062"
+     d="M 82.22947,-18.229473 60.999998,60.999998 -18.229472,82.229471 -76.22947,24.229473"
+     id="path3064-3-6-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <g
+     transform="translate(40,-32)"
+     id="g3827-1-3-4">
     <g
-       transform="matrix(0.99742747,0,0,0.97275418,30.471616,-995.79158)"
-       id="g3044">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         id="path3046"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         id="path3048"
-         style="fill:url(#radialGradient3022);fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon_Constr.svg
index 7609b97411..84368ba0d4 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon_Constr.svg
@@ -14,8 +14,8 @@
    width="64"
    height="64"
    id="svg2"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateHexagon_Constr.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateHexagon.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -26,16 +26,26 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     id="namedview36"
-     showgrid="false"
-     inkscape:zoom="11.494629"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:window-height="1137"
+     id="namedview40"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="22.251541"
+     inkscape:cy="31.188477"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3062"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -220,6 +230,106 @@
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4568"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4570"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4796"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4798"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4-6"
+       id="linearGradient3801-1-3-7-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9-5" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -234,45 +344,93 @@
     </rdf:RDF>
   </metadata>
   <path
-     d="m 27.78125,1.96875 -1.0625,0.59375 -23.34375,12.75 -1.15625,0.65625 0,1.34375 0,24.5625 0,1.34375 1.15625,0.65625 23.3125,13.0625 1.125,0.65625 1.09375,-0.65625 23.3125,-13.40625 1.125,-0.625 0,-1.28125 0,-19.25 A 7.2116405,7.0332467 0 0 0 56.375,16.9375 7.2116405,7.0332467 0 0 0 44.6875,11.125 L 28.875,2.5625 27.78125,1.96875 z m 0.03125,5.09375 14.375,7.8125 a 7.2116405,7.0332467 0 0 0 -0.21875,1.5 7.2116405,7.0332467 0 0 0 6.90625,7.28125 l 0,16.65625 -21.0625,12.09375 -21.09375,-11.8125 0,-22 L 27.8125,7.0625 z M 27.5625,22.75 A 7.2116405,7.0332467 0 0 0 20.59375,29.5 7.2116405,7.0332467 0 1 0 35,30.0625 7.2116405,7.0332467 0 0 0 27.5625,22.75 z"
-     transform="translate(1.985,4.458)"
-     id="path3069"
-     style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;stroke:#000000;stroke-width:0.80167824;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path3036"
-     d="M 27.770599,1.95537 26.705796,2.54693 3.3688662,15.3246 l -1.1535364,0.6506 0,1.331 0,24.5792 0,1.3311 1.1535364,0.6507 23.3073518,13.0733 1.123959,0.6507 1.094381,-0.6507 23.336929,-13.3988 1.123958,-0.6211 0,-1.3014 0,-24.4609 0,-1.331 L 52.172331,15.1766 28.86498,2.54693 27.770599,1.95537 Z m 0.02957,5.11697 21.059434,11.41696 0,21.8285 L 27.800169,52.4151 6.7111564,40.584 l 0,-21.9763 L 27.800169,7.07234 Z" />
+     sodipodi:type="star"
+     style="fill:none;stroke:#0b1521;stroke-width:24.46091842999999955;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064"
+     sodipodi:sides="6"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.3089969"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 60.999998,60.999998 -79.22947,21.229473 -57.999998,-57.999998 21.229472,-79.229471 79.22947,-21.229473 57.999998,57.999998 z"
+     inkscape:transform-center-x="2.5928771"
+     inkscape:transform-center-y="-2.3198451"
+     transform="matrix(0.3261306,-0.07958242,0.08663215,0.30683668,28.761712,31.318237)" />
   <g
-     id="g3038"
-     transform="matrix(0.99742747,0,0,0.97275418,9.0959481,-982.6724)">
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3040"
-       transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient3912);fill-opacity:1;stroke:none"
-       id="path3042"
-       transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-       d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+     transform="translate(18,-20)"
+     id="g3827-1-3-4-3">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8-5">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
+  <path
+     sodipodi:type="star"
+     style="fill:none;stroke:#3465a4;stroke-width:12.23045864999999921;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064-3"
+     sodipodi:sides="6"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.3089969"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 60.999998,60.999998 -79.22947,21.229473 -57.999998,-57.999998 21.229472,-79.229471 79.22947,-21.229473 57.999998,57.999998 z"
+     inkscape:transform-center-x="2.5928771"
+     inkscape:transform-center-y="-2.3198451"
+     transform="matrix(0.3261306,-0.07958242,0.08663215,0.30683668,28.761712,31.318237)" />
+  <path
+     transform="matrix(0.33971938,-0.08264328,0.09024183,0.31863808,28.710116,31.292016)"
+     style="fill:none;stroke:#729fcf;stroke-width:5.87967252999999967;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+     inkscape:transform-center-x="2.7009142"
+     inkscape:transform-center-y="-2.4090693"
+     d="m -76.22947,24.229473 21.229472,-79.229471 79.22947,-21.229473 57.999998,57.999998"
+     id="path3064-3-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     transform="matrix(0.31254183,-0.07652156,0.08302249,0.29503526,28.813307,31.344459)"
+     style="fill:none;stroke:#729fcf;stroke-width:6.37046431999999996;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+     inkscape:transform-center-x="2.484841"
+     inkscape:transform-center-y="-2.23062"
+     d="M 82.22947,-18.229473 60.999998,60.999998 -18.229472,82.229471 -76.22947,24.229473"
+     id="path3064-3-6-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
   <g
-     id="g3044"
-     transform="matrix(0.99742747,0,0,0.97275418,30.471616,-995.79158)">
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3046"
-       transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient3022);fill-opacity:1;stroke:none"
-       id="path3048"
-       transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-       d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+     transform="translate(40,-32)"
+     id="g3827-1-3-4">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine.svg
index a09621215a..05619b460e 100755
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreateLine.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -61,6 +61,66 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2734" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-6"
+       id="linearGradient3801-1-3-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -69,18 +129,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="-25.216024"
-     inkscape:cy="25.806874"
+     inkscape:zoom="3.6040039"
+     inkscape:cx="-46.432653"
+     inkscape:cy="-0.79979578"
      inkscape:current-layer="g3154"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="756"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2999"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -99,24 +169,8 @@
     <g
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
-      <g
-         transform="translate(43.714324,68.714247)"
-         id="g3255">
-        <path
-           id="rect3257"
-           d="M 246.91044,448.95693 C 225.9778,449.54289 208.91959,466.46188 208.4386,487.63259 C 208.32871,492.46948 209.11156,497.11973 210.60424,501.44168 L 52.207293,643.86391 C 45.051985,637.84843 35.757122,634.34569 25.684657,634.61538 C 3.8332069,635.20044 -13.4232,653.40137 -12.838133,675.25285 C -12.253066,697.10429 5.9478825,714.36071 27.799334,713.77564 C 49.650782,713.19057 66.90719,694.98964 66.322124,673.13817 C 66.2475,670.35107 65.871094,667.64635 65.252047,665.03615 L 225.40698,521.03429 C 231.58064,525.34231 239.0547,527.93349 247.13974,528.11719 C 268.99338,528.61369 287.12783,511.29516 287.62434,489.44153 C 288.12084,467.58789 270.80233,449.45343 248.94868,448.95693 C 248.26576,448.94142 247.58568,448.93803 246.91044,448.95693 z"
-           style="opacity:1;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000114;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
       <g
          id="g3242">
-        <rect
-           style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000114;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect2269"
-           width="30.000006"
-           height="330.00009"
-           x="534.10168"
-           y="119.87096"
-           transform="matrix(0.668591,0.7436304,-0.7436304,0.668591,0,0)" />
         <g
            id="g3154"
            transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)"
@@ -124,50 +178,51 @@
            inkscape:export-xdpi="7.0721951"
            inkscape:export-ydpi="7.0721951">
           <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2162"
-             style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019000000044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+             style="fill:#d3d7cf;stroke:#2e3436;stroke-width:12.33591747;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 162.40856,627.63483 187.86722,654.49428 -80.727347,909.08082 -106.186,882.22137 z"
+             id="path3061"
+             inkscape:connector-curvature="0" />
           <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3134"
-             style="fill:url(#radialGradient4272);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g3160"
-           transform="matrix(-0.999742,-2.2713514e-2,2.2713514e-2,-0.999742,475.0668,1137.8902)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3162"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3164"
-             style="fill:url(#radialGradient4274);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+             style="fill:none;stroke:#ffffff;stroke-width:12.33591747;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 173.54199,651.07562 -83.374613,894.59322"
+             id="path3063"
+             inkscape:connector-curvature="0" />
+          <g
+             transform="matrix(-6.1657491,-0.16508637,0.16508637,-6.1657491,251.65298,959.14094)"
+             id="g3827-1-3">
+            <g
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9-5">
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-71-6"
+                 d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-7-3-2"
+                 d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+            </g>
+          </g>
+          <g
+             transform="matrix(-6.1657491,-0.16508637,0.16508637,-6.1657491,-1.5804401,1199.1674)"
+             id="g3827-1-3-3">
+            <g
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9-5-5">
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-71-6-6"
+                 d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:url(#linearGradient3801-1-3-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-7-3-2-2"
+                 d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+            </g>
+          </g>
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine_Constr.svg
index 7d71e1cf74..464c07d543 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine_Constr.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateLine_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateLine.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
@@ -61,6 +61,66 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2734" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-6"
+       id="linearGradient3801-1-3-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -69,18 +129,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.123014"
-     inkscape:cx="13.676943"
-     inkscape:cy="25.806874"
-     inkscape:current-layer="g3242"
+     inkscape:zoom="5.0968312"
+     inkscape:cx="26.786269"
+     inkscape:cy="19.546454"
+     inkscape:current-layer="g3154"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2999"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -100,24 +170,8 @@
     <g
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
-      <g
-         transform="translate(43.714324,68.714247)"
-         id="g3255">
-        <path
-           id="rect3257"
-           d="M 246.91044,448.95693 C 225.9778,449.54289 208.91959,466.46188 208.4386,487.63259 C 208.32871,492.46948 209.11156,497.11973 210.60424,501.44168 L 52.207293,643.86391 C 45.051985,637.84843 35.757122,634.34569 25.684657,634.61538 C 3.8332069,635.20044 -13.4232,653.40137 -12.838133,675.25285 C -12.253066,697.10429 5.9478825,714.36071 27.799334,713.77564 C 49.650782,713.19057 66.90719,694.98964 66.322124,673.13817 C 66.2475,670.35107 65.871094,667.64635 65.252047,665.03615 L 225.40698,521.03429 C 231.58064,525.34231 239.0547,527.93349 247.13974,528.11719 C 268.99338,528.61369 287.12783,511.29516 287.62434,489.44153 C 288.12084,467.58789 270.80233,449.45343 248.94868,448.95693 C 248.26576,448.94142 247.58568,448.93803 246.91044,448.95693 z"
-           style="opacity:1;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000114;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      </g>
       <g
          id="g3242">
-        <rect
-           style="opacity:1;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000114;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect2269"
-           width="30.000006"
-           height="330.00009"
-           x="534.10168"
-           y="119.87096"
-           transform="matrix(0.668591,0.7436304,-0.7436304,0.668591,0,0)" />
         <g
            id="g3154"
            transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)"
@@ -125,50 +179,51 @@
            inkscape:export-xdpi="7.0721951"
            inkscape:export-ydpi="7.0721951">
           <path
-             d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2162"
-             style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019000000044;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+             style="fill:#3465a4;stroke:#0b1521;stroke-width:12.33591747000000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 162.40856,627.63483 187.86722,654.49428 -80.727347,909.08082 -106.186,882.22137 z"
+             id="path3061"
+             inkscape:connector-curvature="0" />
           <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3134"
-             style="fill:url(#radialGradient4272);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
-        </g>
-        <g
-           id="g3160"
-           transform="matrix(-0.999742,-2.2713514e-2,2.2713514e-2,-0.999742,475.0668,1137.8902)"
-           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-           inkscape:export-xdpi="7.0721951"
-           inkscape:export-ydpi="7.0721951">
-          <path
-             d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3162"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3164"
-             style="fill:url(#radialGradient4274);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+             style="fill:none;stroke:#729fcf;stroke-width:12.33591747000000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 173.54199,651.07562 -83.374613,894.59322"
+             id="path3063"
+             inkscape:connector-curvature="0" />
+          <g
+             transform="matrix(-6.1657491,-0.16508637,0.16508637,-6.1657491,251.65298,959.14094)"
+             id="g3827-1-3">
+            <g
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9-5">
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-71-6"
+                 d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-7-3-2"
+                 d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+            </g>
+          </g>
+          <g
+             transform="matrix(-6.1657491,-0.16508637,0.16508637,-6.1657491,-1.5804401,1199.1674)"
+             id="g3827-1-3-3">
+            <g
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9-5-5">
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-71-6-6"
+                 d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:url(#linearGradient3801-1-3-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-7-3-2-2"
+                 d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+            </g>
+          </g>
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon.svg
index 14a4266af5..be6bb7cc60 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon.svg
@@ -8,10 +8,44 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="64"
    height="64"
-   id="svg2">
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateHexagon.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview40"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="22.443299"
+     inkscape:cy="30.421446"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3062"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -222,7 +256,7 @@
        r="34.345188"
        fx="225.26402"
        fy="672.79736"
-       id="radialGradient4708"
+       id="radialGradient4796"
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
@@ -232,10 +266,70 @@
        r="34.345188"
        fx="225.26402"
        fy="672.79736"
-       id="radialGradient4710"
+       id="radialGradient4798"
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4-6"
+       id="linearGradient3801-1-3-7-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9-5" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -250,42 +344,93 @@
     </rdf:RDF>
   </metadata>
   <path
-     d="M 37.5,7.375 A 2.50025,2.50025 0 0 0 37.28125,7.40625 L 18.3125,10.4375 a 2.50025,2.50025 0 0 0 -1.625,1 L 5.40625,26.96875 a 2.50025,2.50025 0 0 0 -0.4375,1.84375 l 3,18.96875 A 2.50025,2.50025 0 0 0 9,49.40625 L 24.53125,60.6875 A 2.50025,2.50025 0 0 0 26.375,61.125 l 18.96875,-3 a 2.50025,2.50025 0 0 0 1.625,-1 L 58.25,41.59375 a 2.50025,2.50025 0 0 0 0.4375,-1.875 L 56.71875,27.28125 A 7.2116405,7.0332467 0 0 0 60.40625,21.4375 7.2116405,7.0332467 0 0 0 49.3125,15.25 L 39.125,7.84375 A 2.50025,2.50025 0 0 0 37.5,7.375 z m -0.46875,5.125 9.25,6.71875 A 7.2116405,7.0332467 0 0 0 46,20.875 a 7.2116405,7.0332467 0 0 0 5.78125,7.15625 l 1.8125,11.4375 -10.0625,13.875 -16.9375,2.6875 L 12.78125,46 10.0625,29.0625 20.125,15.21875 37.03125,12.5 z m -5.4375,14.75 A 7.2116405,7.0332467 0 0 0 24.625,34 7.2116405,7.0332467 0 1 0 39.03125,34.5625 7.2116405,7.0332467 0 0 0 31.59375,27.25 z"
-     id="path4694"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:0.84700072;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+     sodipodi:type="star"
+     style="fill:none;stroke:#2e3436;stroke-width:25.35809708;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064"
+     sodipodi:sides="8"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.1780972"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 60.999998,60.999998 3.0000003,85.024384 -54.999998,60.999998 -79.024384,3.0000003 -54.999998,-54.999998 2.9999997,-79.024384 60.999998,-54.999998 85.024384,2.9999997 z"
+     inkscape:transform-center-x="3.1144343"
+     inkscape:transform-center-y="-1.2318027"
+     transform="matrix(0.26750756,-0.18188602,0.18076832,0.24914847,30.655172,30.798213)" />
   <g
-     id="g4683">
-    <path
-       d="M 35.5,2.875 A 2.50025,2.50025 0 0 0 35.28125,2.90625 L 16.3125,5.9375 a 2.50025,2.50025 0 0 0 -1.625,1 L 3.40625,22.46875 a 2.50025,2.50025 0 0 0 -0.4375,1.84375 l 3,18.96875 A 2.50025,2.50025 0 0 0 7,44.90625 L 22.53125,56.1875 A 2.50025,2.50025 0 0 0 24.375,56.625 l 18.96875,-3 a 2.50025,2.50025 0 0 0 1.625,-1 L 56.25,37.09375 a 2.50025,2.50025 0 0 0 0.4375,-1.875 l -3,-18.96875 a 2.50025,2.50025 0 0 0 -1,-1.625 L 37.125,3.34375 A 2.50025,2.50025 0 0 0 35.5,2.875 z M 35.03125,8 l 13.875,10.09375 2.6875,16.875 -10.0625,13.875 -16.9375,2.6875 L 10.78125,41.5 8.0625,24.5625 18.125,10.71875 35.03125,8 z"
-       id="path4677"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.847;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+     transform="translate(20,-22)"
+     id="g3827-1-3-4-3">
     <g
-       transform="matrix(0.99742747,0,0,0.97275418,11.139278,-982.6724)"
-       id="g3038">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8-5">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         id="path3040"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         id="path3042"
-         style="fill:url(#radialGradient4568);fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
+  </g>
+  <path
+     sodipodi:type="star"
+     style="fill:none;stroke:#d3d7cf;stroke-width:12.67904764000000029;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064-3"
+     sodipodi:sides="8"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.1780972"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 60.999998,60.999998 3.0000003,85.024384 -54.999998,60.999998 -79.024384,3.0000003 -54.999998,-54.999998 2.9999997,-79.024384 60.999998,-54.999998 85.024384,2.9999997 z"
+     inkscape:transform-center-x="3.1144343"
+     inkscape:transform-center-y="-1.2318027"
+     transform="matrix(0.26750756,-0.18188602,0.18076832,0.24914847,30.655172,30.798213)" />
+  <path
+     transform="matrix(0.27779631,-0.18916147,0.18772095,0.25911442,30.603448,30.790141)"
+     style="fill:none;stroke:#ffffff;stroke-width:6.10020971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1"
+     inkscape:transform-center-x="3.2342207"
+     inkscape:transform-center-y="-1.2810751"
+     d="M -79.024384,3.0000003 -54.999998,-54.999998 2.9999997,-79.024384 60.999998,-54.999998 85.024384,2.9999997"
+     id="path3064-3-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     transform="matrix(0.25721881,-0.17461058,0.17381569,0.23918253,30.706896,30.806284)"
+     style="fill:none;stroke:#ffffff;stroke-width:6.59838581;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998;stroke-opacity:1"
+     inkscape:transform-center-x="2.9946493"
+     inkscape:transform-center-y="-1.1825306"
+     d="M 85.024384,2.9999997 60.999998,60.999998 3.0000003,85.024384 -54.999998,60.999998 -79.024384,3.0000003"
+     id="path3064-3-6-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <g
+     transform="translate(40,-36)"
+     id="g3827-1-3-4">
     <g
-       transform="matrix(0.99742747,0,0,0.97275418,32.514946,-995.79158)"
-       id="g3044">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         id="path3046"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         id="path3048"
-         style="fill:url(#radialGradient4570);fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon_Constr.svg
index d253f61301..a0a8297695 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon_Constr.svg
@@ -14,8 +14,8 @@
    width="64"
    height="64"
    id="svg2"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateOctagon_Constr.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateOctagon.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -26,16 +26,26 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-height="1137"
      id="namedview40"
-     showgrid="false"
-     inkscape:zoom="11.494629"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="22.443299"
+     inkscape:cy="30.421446"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3062"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -246,7 +256,7 @@
        r="34.345188"
        fx="225.26402"
        fy="672.79736"
-       id="radialGradient4708"
+       id="radialGradient4796"
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
@@ -256,10 +266,70 @@
        r="34.345188"
        fx="225.26402"
        fy="672.79736"
-       id="radialGradient4710"
+       id="radialGradient4798"
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4-6"
+       id="linearGradient3801-1-3-7-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9-5" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -274,44 +344,93 @@
     </rdf:RDF>
   </metadata>
   <path
-     d="M 37.5,7.375 A 2.50025,2.50025 0 0 0 37.28125,7.40625 L 18.3125,10.4375 a 2.50025,2.50025 0 0 0 -1.625,1 L 5.40625,26.96875 a 2.50025,2.50025 0 0 0 -0.4375,1.84375 l 3,18.96875 A 2.50025,2.50025 0 0 0 9,49.40625 L 24.53125,60.6875 A 2.50025,2.50025 0 0 0 26.375,61.125 l 18.96875,-3 a 2.50025,2.50025 0 0 0 1.625,-1 L 58.25,41.59375 a 2.50025,2.50025 0 0 0 0.4375,-1.875 L 56.71875,27.28125 A 7.2116405,7.0332467 0 0 0 60.40625,21.4375 7.2116405,7.0332467 0 0 0 49.3125,15.25 L 39.125,7.84375 A 2.50025,2.50025 0 0 0 37.5,7.375 z m -0.46875,5.125 9.25,6.71875 A 7.2116405,7.0332467 0 0 0 46,20.875 a 7.2116405,7.0332467 0 0 0 5.78125,7.15625 l 1.8125,11.4375 -10.0625,13.875 -16.9375,2.6875 L 12.78125,46 10.0625,29.0625 20.125,15.21875 37.03125,12.5 z m -5.4375,14.75 A 7.2116405,7.0332467 0 0 0 24.625,34 7.2116405,7.0332467 0 1 0 39.03125,34.5625 7.2116405,7.0332467 0 0 0 31.59375,27.25 z"
-     id="path4694"
-     style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:0.84700072;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
-  <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;stroke:#000000;stroke-width:0.847;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4677"
-     d="M 35.5,2.875 A 2.50025,2.50025 0 0 0 35.28125,2.90625 L 16.3125,5.9375 a 2.50025,2.50025 0 0 0 -1.625,1 L 3.40625,22.46875 a 2.50025,2.50025 0 0 0 -0.4375,1.84375 l 3,18.96875 A 2.50025,2.50025 0 0 0 7,44.90625 L 22.53125,56.1875 A 2.50025,2.50025 0 0 0 24.375,56.625 l 18.96875,-3 a 2.50025,2.50025 0 0 0 1.625,-1 L 56.25,37.09375 a 2.50025,2.50025 0 0 0 0.4375,-1.875 l -3,-18.96875 a 2.50025,2.50025 0 0 0 -1,-1.625 L 37.125,3.34375 A 2.50025,2.50025 0 0 0 35.5,2.875 Z M 35.03125,8 l 13.875,10.09375 2.6875,16.875 -10.0625,13.875 -16.9375,2.6875 L 10.78125,41.5 8.0625,24.5625 18.125,10.71875 35.03125,8 Z" />
+     sodipodi:type="star"
+     style="fill:none;stroke:#0b1521;stroke-width:25.35809708000000029;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064"
+     sodipodi:sides="8"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.1780972"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 60.999998,60.999998 3.0000003,85.024384 -54.999998,60.999998 -79.024384,3.0000003 -54.999998,-54.999998 2.9999997,-79.024384 60.999998,-54.999998 85.024384,2.9999997 z"
+     inkscape:transform-center-x="3.1144343"
+     inkscape:transform-center-y="-1.2318027"
+     transform="matrix(0.26750756,-0.18188602,0.18076832,0.24914847,30.655172,30.798213)" />
   <g
-     id="g3038"
-     transform="matrix(0.99742747,0,0,0.97275418,11.139278,-982.6724)">
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3040"
-       transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient4568);fill-opacity:1;stroke:none"
-       id="path3042"
-       transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-       d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+     transform="translate(20,-22)"
+     id="g3827-1-3-4-3">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8-5">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
+  <path
+     sodipodi:type="star"
+     style="fill:none;stroke:#3465a4;stroke-width:12.67904764000000029;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064-3"
+     sodipodi:sides="8"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.1780972"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 60.999998,60.999998 3.0000003,85.024384 -54.999998,60.999998 -79.024384,3.0000003 -54.999998,-54.999998 2.9999997,-79.024384 60.999998,-54.999998 85.024384,2.9999997 z"
+     inkscape:transform-center-x="3.1144343"
+     inkscape:transform-center-y="-1.2318027"
+     transform="matrix(0.26750756,-0.18188602,0.18076832,0.24914847,30.655172,30.798213)" />
+  <path
+     transform="matrix(0.27779631,-0.18916147,0.18772095,0.25911442,30.603448,30.790141)"
+     style="fill:none;stroke:#729fcf;stroke-width:6.10020970999999967;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+     inkscape:transform-center-x="3.2342207"
+     inkscape:transform-center-y="-1.2810751"
+     d="M -79.024384,3.0000003 -54.999998,-54.999998 2.9999997,-79.024384 60.999998,-54.999998 85.024384,2.9999997"
+     id="path3064-3-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     transform="matrix(0.25721881,-0.17461058,0.17381569,0.23918253,30.706896,30.806284)"
+     style="fill:none;stroke:#729fcf;stroke-width:6.59838580999999991;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+     inkscape:transform-center-x="2.9946493"
+     inkscape:transform-center-y="-1.1825306"
+     d="M 85.024384,2.9999997 60.999998,60.999998 3.0000003,85.024384 -54.999998,60.999998 -79.024384,3.0000003"
+     id="path3064-3-6-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
   <g
-     id="g3044"
-     transform="matrix(0.99742747,0,0,0.97275418,32.514946,-995.79158)">
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3046"
-       transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient4570);fill-opacity:1;stroke:none"
-       id="path3048"
-       transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-       d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+     transform="translate(40,-36)"
+     id="g3827-1-3-4">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon.svg
index 7e93cc4243..240362f9f6 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon.svg
@@ -8,10 +8,42 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="64"
    height="64"
-   id="svg2">
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreatePentagon.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview38"
+     showgrid="true"
+     inkscape:zoom="6.8343873"
+     inkscape:cx="-21.592439"
+     inkscape:cy="63.221147"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3015"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -216,6 +248,46 @@
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -225,47 +297,92 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <path
-     d="M 25.6875,7.375 A 2.50025,2.50025 0 0 0 24.03125,8.28125 L 4.90625,30.6875 A 2.50025,2.50025 0 0 0 4.6875,33.625 L 20.09375,58.75 a 2.50025,2.50025 0 0 0 2.71875,1.125 L 51.5,52.96875 A 2.50025,2.50025 0 0 0 53.40625,50.75 L 55.1875,27.90625 A 7.2116405,7.0332467 0 0 0 60.40625,21.4375 7.2116405,7.0332467 0 0 0 48,16.3125 L 26.90625,7.59375 A 2.50025,2.50025 0 0 0 25.9375,7.375 a 2.50025,2.50025 0 0 0 -0.25,0 z m 0.96875,5.5 19.34375,8 a 7.2116405,7.0332467 0 0 0 4.1875,6.65625 L 48.53125,48.5625 23.4375,54.59375 9.90625,32.5625 26.65625,12.875 z m 4.9375,14.375 A 7.2116405,7.0332467 0 0 0 24.625,34 7.2116405,7.0332467 0 1 0 39.03125,34.5625 7.2116405,7.0332467 0 0 0 31.59375,27.25 z"
-     id="path3915"
-     style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     sodipodi:type="star"
+     style="fill:none;stroke:#2e3436;stroke-width:7.80773497;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path3002"
+     sodipodi:sides="5"
+     sodipodi:cx="18"
+     sodipodi:cy="12"
+     sodipodi:r1="25.059929"
+     sodipodi:r2="20.273909"
+     sodipodi:arg1="1.0714496"
+     sodipodi:arg2="1.6997681"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 30,34.000001 0.78496017,30.211053 -4.6394802,1.255049 21.223072,-12.851798 42.631448,7.3856954 z"
+     transform="matrix(1.0301416,0.03861457,-0.03908769,1.0176726,10.684176,19.59953)"
+     inkscape:transform-center-x="-1.3261816"
+     inkscape:transform-center-y="-1.1571748" />
+  <path
+     sodipodi:type="star"
+     style="fill:none;stroke:#d3d7cf;stroke-width:3.90386748;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path3002-1"
+     sodipodi:sides="5"
+     sodipodi:cx="18"
+     sodipodi:cy="12"
+     sodipodi:r1="25.059929"
+     sodipodi:r2="20.273909"
+     sodipodi:arg1="1.0714496"
+     sodipodi:arg2="1.6997681"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 30,34.000001 0.78496017,30.211053 -4.6394802,1.255049 21.223072,-12.851798 42.631448,7.3856954 z"
+     transform="matrix(1.0301416,0.03861457,-0.03908769,1.0176726,10.684176,19.59953)"
+     inkscape:transform-center-x="-1.3261816"
+     inkscape:transform-center-y="-1.1571748" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:18.89999962;stroke-opacity:1;stroke-dasharray:none"
+     d="M 4.9999992,20 33.239599,6.106071 55.418505,28.47473"
+     id="path3790"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 7.2154926,22.98911 11.191387,49.5114 39.713682,54.25427 52.311917,30.3748"
+     id="path3792"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
   <g
-     id="g3904">
-    <path
-       d="M 23.94958,2.875 A 2.50025,2.50025 0 0 0 22.04333,3.78125 L 2.9183295,26.1875 a 2.50025,2.50025 0 0 0 -0.21875,2.9375 L 18.10583,54.25 a 2.50025,2.50025 0 0 0 2.71875,1.125 l 28.6875,-6.90625 A 2.50025,2.50025 0 0 0 51.41833,46.25 l 2.28125,-29.40625 a 2.50025,2.50025 0 0 0 -1.53125,-2.5 l -27.25,-11.25 A 2.50025,2.50025 0 0 0 23.94958,2.875 z m 0.71875,5.5 L 48.57458,18.25 46.54333,44.0625 21.44958,50.09375 7.9183295,28.0625 24.66833,8.375 z"
-       id="path3104"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.87;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+     transform="translate(40.005735,-24)"
+     id="g3827-1-3">
     <g
-       transform="matrix(0.99742747,0,0,0.97275418,11.139278,-982.6724)"
-       id="g3038">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         id="path3040"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         id="path3042"
-         style="fill:url(#radialGradient3902);fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
+  </g>
+  <g
+     transform="translate(16.005735,-19)"
+     id="g3827-1-3-4">
     <g
-       transform="matrix(0.99742747,0,0,0.97275418,32.514946,-995.79158)"
-       id="g3044">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         id="path3046"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         id="path3048"
-         style="fill:url(#radialGradient3900);fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon_Constr.svg
index fb80092740..c52274055c 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon_Constr.svg
@@ -14,8 +14,8 @@
    width="64"
    height="64"
    id="svg2"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreatePentagon_Constr.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreatePentagon.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -25,17 +25,25 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      id="namedview38"
-     showgrid="false"
-     inkscape:zoom="11.494629"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     showgrid="true"
+     inkscape:zoom="3.4171937"
+     inkscape:cx="133.07903"
+     inkscape:cy="48.763017"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3015"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -240,6 +248,46 @@
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -254,44 +302,87 @@
     </rdf:RDF>
   </metadata>
   <path
-     d="M 25.6875,7.375 A 2.50025,2.50025 0 0 0 24.03125,8.28125 L 4.90625,30.6875 A 2.50025,2.50025 0 0 0 4.6875,33.625 L 20.09375,58.75 a 2.50025,2.50025 0 0 0 2.71875,1.125 L 51.5,52.96875 A 2.50025,2.50025 0 0 0 53.40625,50.75 L 55.1875,27.90625 A 7.2116405,7.0332467 0 0 0 60.40625,21.4375 7.2116405,7.0332467 0 0 0 48,16.3125 L 26.90625,7.59375 A 2.50025,2.50025 0 0 0 25.9375,7.375 a 2.50025,2.50025 0 0 0 -0.25,0 z m 0.96875,5.5 19.34375,8 a 7.2116405,7.0332467 0 0 0 4.1875,6.65625 L 48.53125,48.5625 23.4375,54.59375 9.90625,32.5625 26.65625,12.875 z m 4.9375,14.375 A 7.2116405,7.0332467 0 0 0 24.625,34 7.2116405,7.0332467 0 1 0 39.03125,34.5625 7.2116405,7.0332467 0 0 0 31.59375,27.25 z"
-     id="path3915"
-     style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     sodipodi:type="star"
+     style="fill:none;stroke:#0b1521;stroke-width:7.80773497000000027;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path3002"
+     sodipodi:sides="5"
+     sodipodi:cx="18"
+     sodipodi:cy="12"
+     sodipodi:r1="25.059929"
+     sodipodi:r2="20.273909"
+     sodipodi:arg1="1.0714496"
+     sodipodi:arg2="1.6997681"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 30,34.000001 0.78496017,30.211053 -4.6394802,1.255049 21.223072,-12.851798 42.631448,7.3856954 z"
+     transform="matrix(1.0301416,0.03861457,-0.03908769,1.0176726,10.684176,19.59953)"
+     inkscape:transform-center-x="-1.3261816"
+     inkscape:transform-center-y="-1.1571748" />
   <path
+     sodipodi:type="star"
+     style="fill:none;stroke:#3465a4;stroke-width:3.90386748000000017;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path3002-1"
+     sodipodi:sides="5"
+     sodipodi:cx="18"
+     sodipodi:cy="12"
+     sodipodi:r1="25.059929"
+     sodipodi:r2="20.273909"
+     sodipodi:arg1="1.0714496"
+     sodipodi:arg2="1.6997681"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="M 30,34.000001 0.78496017,30.211053 -4.6394802,1.255049 21.223072,-12.851798 42.631448,7.3856954 z"
+     transform="matrix(1.0301416,0.03861457,-0.03908769,1.0176726,10.684176,19.59953)"
+     inkscape:transform-center-x="-1.3261816"
+     inkscape:transform-center-y="-1.1571748" />
+  <path
+     style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:18.89999961999999911;stroke-opacity:1;stroke-dasharray:none"
+     d="M 4.9999992,20 33.239599,6.106071 55.418505,28.47473"
+     id="path3790"
      inkscape:connector-curvature="0"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;stroke:#000000;stroke-width:0.87;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path3104"
-     d="M 23.94958,2.875 A 2.50025,2.50025 0 0 0 22.04333,3.78125 L 2.9183295,26.1875 a 2.50025,2.50025 0 0 0 -0.21875,2.9375 L 18.10583,54.25 a 2.50025,2.50025 0 0 0 2.71875,1.125 l 28.6875,-6.90625 A 2.50025,2.50025 0 0 0 51.41833,46.25 l 2.28125,-29.40625 a 2.50025,2.50025 0 0 0 -1.53125,-2.5 l -27.25,-11.25 A 2.50025,2.50025 0 0 0 23.94958,2.875 Z m 0.71875,5.5 L 48.57458,18.25 46.54333,44.0625 21.44958,50.09375 7.9183295,28.0625 24.66833,8.375 Z" />
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 7.2154926,22.98911 11.191387,49.5114 39.713682,54.25427 52.311917,30.3748"
+     id="path3792"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
   <g
-     id="g3038"
-     transform="matrix(0.99742747,0,0,0.97275418,11.139278,-982.6724)">
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3040"
-       transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient3902);fill-opacity:1;stroke:none"
-       id="path3042"
-       transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-       d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+     transform="translate(40.005735,-24)"
+     id="g3827-1-3">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
   <g
-     id="g3044"
-     transform="matrix(0.99742747,0,0,0.97275418,32.514946,-995.79158)">
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3046"
-       transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient3900);fill-opacity:1;stroke:none"
-       id="path3048"
-       transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-       d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+     transform="translate(16.005735,-19)"
+     id="g3827-1-3-4">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePoint.svg
index b69c7cc25f..293a62c541 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePoint.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreatePoint.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
@@ -98,6 +98,27 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3922"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1733561,0.02175327,0.02175328,1.1801291,55.592501,-17.013229)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -106,18 +127,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="33.923816"
-     inkscape:cy="23.749836"
-     inkscape:current-layer="g4289"
+     inkscape:zoom="28.832031"
+     inkscape:cx="29.022284"
+     inkscape:cy="36.345143"
+     inkscape:current-layer="g3906"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="657"
-     inkscape:window-height="716"
-     inkscape:window-x="710"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -137,36 +168,31 @@
     <g
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
-      <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162-2"
-         style="opacity:0.67000002;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.09976673;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(-1.135537,-0.02584694,0.0257987,-1.13766,378.69194,1376.1392)" />
-      <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162"
-         style="fill:#ff2100;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.09976673;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(-1.135537,-0.02584692,0.02579869,-1.13766,366.91582,1358.1743)" />
-      <path
-         transform="matrix(-0.9802212,0.57489869,-0.57382585,-0.98205382,757.04461,1123.2494)"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path3164"
-         style="fill:url(#radialGradient3767);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+      <g
+         style="stroke:#3465a4;stroke-width:0.97375208"
+         id="g4312"
+         transform="matrix(12.667234,0.1943747,-0.1943834,12.666657,-1553.0403,-2583.642)">
+        <g
+           style="stroke:#3465a4;stroke-width:6.49510956"
+           transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
+           id="g4248">
+          <g
+             transform="translate(-3.7314339,-3.2817175)"
+             id="g3906"
+             style="stroke-width:6.49510956">
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:#3465a4;fill-opacity:1;stroke:#280000;stroke-width:6.49510956000000039;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="path4250"
+               d="m 145.08885,535.18229 a 48.571431,48.571431 0 1 1 -97.142854,0 48.571431,48.571431 0 1 1 97.142854,0 z" />
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#ef2929;stroke-width:6.49510956000000039;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="path4250-7"
+               d="m 138.55997,535.14385 a 42.216398,42.21834 49.289969 1 1 -84.435028,0.002 42.216398,42.21834 49.289969 0 1 84.435028,-0.002 z" />
+          </g>
+        </g>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline.svg
index 4f6f943691..16ba48ebc8 100755
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2772"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreatePolyline.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -127,6 +127,86 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7"
+       id="linearGradient3801-1-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-4"
+       id="linearGradient3801-1-2"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-51" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -135,18 +215,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="24.098813"
-     inkscape:cy="30.229358"
+     inkscape:zoom="3.3469498"
+     inkscape:cx="43.958206"
+     inkscape:cy="28.933148"
      inkscape:current-layer="g3244"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="756"
+     inkscape:window-width="800"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3012"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2777">
     <rdf:RDF>
@@ -166,127 +254,117 @@
        id="g3244"
        transform="matrix(0.9205539,0,0,0.9205539,1.1497621,0.9652214)">
       <path
-         id="rect2404"
-         d="M 58.946023,5.4147727 C 54.610489,5.4147727 51.071023,8.954238 51.071023,13.289773 C 51.071023,15.753808 52.231407,17.943166 54.008523,19.383523 L 45.727273,43.539773 C 44.47726,43.507182 43.271856,43.784535 42.196023,44.289773 L 33.633523,33.008523 C 34.241883,31.947938 34.612153,30.720242 34.664773,29.414773 C 34.839386,25.082756 31.465541,21.433135 27.133523,21.258523 C 22.801506,21.08391 19.151887,24.457756 18.977273,28.789773 C 18.89222,30.899875 19.646541,32.85554 20.946023,34.321023 L 14.696023,45.164773 C 14.341909,45.106699 14.002347,45.0489 13.633523,45.039773 C 9.2993157,44.932515 5.6782807,48.361816 5.5710227,52.696023 C 5.4637647,57.03023 8.8930657,60.651265 13.227273,60.758523 C 17.56148,60.865781 21.182516,57.43648 21.289773,53.102273 C 21.34462,50.885962 20.451616,48.848219 19.008523,47.383523 L 25.133523,36.758523 C 25.581526,36.857487 26.034146,36.926902 26.508523,36.946023 C 27.764999,36.996669 28.965303,36.74174 30.039773,36.258523 L 38.664773,47.633523 C 38.195329,48.488468 37.850763,49.418803 37.727273,50.446023 C 37.209789,54.750563 40.297734,58.678539 44.602273,59.196023 C 48.906813,59.713507 52.803539,56.625563 53.321023,52.321023 C 53.663437,49.472754 52.439429,46.80006 50.321023,45.164773 L 58.508523,21.102273 C 58.652657,21.11016 58.799931,21.133523 58.946023,21.133523 C 63.281557,21.133523 66.789773,17.625306 66.789773,13.289773 C 66.789773,8.954239 63.281557,5.4147727 58.946023,5.4147727 z"
-         style="opacity:0.49377597;fill:#030303;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93788773;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2.17260504;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 42.278083,54.088916 -5.47923,3.529867 -15.615392,-28.265339 5.47923,-3.529866 z"
+         id="path3061-2-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:2.17260504;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 40.030505,54.352905 25.307928,28.000741"
+         id="path3063-7-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2.17260504;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 14.595964,59.190407 8.3002375,57.503472 18.745204,26.947417 25.04093,28.634351 z"
+         id="path3061-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:2.17260504;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 10.765537,56.697148 20.477061,28.878353"
+         id="path3063-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#d3d7cf;stroke:#2e3436;stroke-width:2.17260504;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 43.072929,58.42206 36.777202,56.735126 53.506884,7.8835655 59.80261,9.5705002 z"
+         id="path3061"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:2.17260504;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 39.242502,55.928802 55.23874,9.8145023"
+         id="path3063"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
-         transform="matrix(0.1617047,0,0,0.1617047,-68.554249,-58.596732)"
-         id="g4301">
-        <rect
-           transform="matrix(0.8668894,0.4985005,-0.4985005,0.8668894,0,0)"
-           y="191.68196"
-           x="736.7525"
-           height="146.82083"
-           width="30.000004"
-           id="rect4264"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000257;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <rect
-           transform="matrix(0.9463805,0.3230542,-0.3230542,0.9463805,0,0)"
-           y="156.68855"
-           x="843.52881"
-           height="269.46069"
-           width="30.000063"
-           id="rect4268"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.8000102;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <rect
-           transform="matrix(-0.7974337,0.6034066,-0.6034066,-0.7974337,0,0)"
-           y="-958.38055"
-           x="-148.08578"
-           height="217.16235"
-           width="30.000015"
-           id="rect4270"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000257;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         transform="matrix(1.0863025,0,0,1.0863025,42.20934,-44.506537)"
+         id="g3827-1"
+         style="stroke:#ef2929">
         <g
-           id="g2180"
-           transform="matrix(-0.9996939,-2.473928e-2,2.473928e-2,-0.9996939,660.87286,1337.2581)">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9"
+           style="stroke:#ef2929">
           <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2182"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
           <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2184"
-             style="fill:url(#radialGradient3263);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
         </g>
+      </g>
+      <g
+         transform="matrix(1.0863025,0,0,1.0863025,27.001105,-1.0485228)"
+         id="g3827-1-3">
         <g
-           id="g2186"
-           transform="matrix(-0.9991886,-4.0274961e-2,4.0274961e-2,-0.9991886,733.45111,1192.8469)">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5">
           <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2188"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-6"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
           <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2190"
-             style="fill:url(#radialGradient3265);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-2"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
         </g>
+      </g>
+      <g
+         transform="matrix(1.0863025,0,0,1.0863025,9.6202655,-29.292387)"
+         id="g3827-1-9"
+         style="stroke:#ef2929">
         <g
-           id="g2196"
-           transform="matrix(-0.9928512,-0.1193588,0.1193588,-0.9928512,796.09873,1342.1425)">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-4"
+           style="stroke:#ef2929">
           <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2198"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-8"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
           <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2200"
-             style="fill:url(#radialGradient3267);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-1);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-8"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
         </g>
+      </g>
+      <g
+         transform="matrix(1.0863025,0,0,1.0863025,-1.2489895,-1.0485227)"
+         id="g3827-1-7"
+         style="stroke:#ef2929">
         <g
-           id="g2204"
-           transform="matrix(-1,0,0,-1,958.57143,1087.5815)">
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-1"
+           style="stroke:#ef2929">
           <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path2206"
-             style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-1"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
           <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path2208"
-             style="fill:url(#radialGradient3269);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             sodipodi:type="arc" />
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-2);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-5"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline_Constr.svg
index dcebc8ac81..92fa6ffe7b 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline_Constr.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2772"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreatePolyline_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreatePolyline.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
@@ -127,6 +127,86 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7"
+       id="linearGradient3801-1-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-4"
+       id="linearGradient3801-1-2"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-51" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -135,18 +215,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.5722656"
-     inkscape:cx="6.5373172"
-     inkscape:cy="24.17279"
+     inkscape:zoom="4.7333018"
+     inkscape:cx="-1.806678"
+     inkscape:cy="24.473584"
      inkscape:current-layer="g3244"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-width="800"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3012"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2777">
     <rdf:RDF>
@@ -167,104 +255,118 @@
        id="g3244"
        transform="matrix(0.9205539,0,0,0.9205539,1.1497621,0.9652214)">
       <path
-         id="rect2404"
-         d="M 58.946023,5.4147727 C 54.610489,5.4147727 51.071023,8.954238 51.071023,13.289773 C 51.071023,15.753808 52.231407,17.943166 54.008523,19.383523 L 45.727273,43.539773 C 44.47726,43.507182 43.271856,43.784535 42.196023,44.289773 L 33.633523,33.008523 C 34.241883,31.947938 34.612153,30.720242 34.664773,29.414773 C 34.839386,25.082756 31.465541,21.433135 27.133523,21.258523 C 22.801506,21.08391 19.151887,24.457756 18.977273,28.789773 C 18.89222,30.899875 19.646541,32.85554 20.946023,34.321023 L 14.696023,45.164773 C 14.341909,45.106699 14.002347,45.0489 13.633523,45.039773 C 9.2993157,44.932515 5.6782807,48.361816 5.5710227,52.696023 C 5.4637647,57.03023 8.8930657,60.651265 13.227273,60.758523 C 17.56148,60.865781 21.182516,57.43648 21.289773,53.102273 C 21.34462,50.885962 20.451616,48.848219 19.008523,47.383523 L 25.133523,36.758523 C 25.581526,36.857487 26.034146,36.926902 26.508523,36.946023 C 27.764999,36.996669 28.965303,36.74174 30.039773,36.258523 L 38.664773,47.633523 C 38.195329,48.488468 37.850763,49.418803 37.727273,50.446023 C 37.209789,54.750563 40.297734,58.678539 44.602273,59.196023 C 48.906813,59.713507 52.803539,56.625563 53.321023,52.321023 C 53.663437,49.472754 52.439429,46.80006 50.321023,45.164773 L 58.508523,21.102273 C 58.652657,21.11016 58.799931,21.133523 58.946023,21.133523 C 63.281557,21.133523 66.789773,17.625306 66.789773,13.289773 C 66.789773,8.954239 63.281557,5.4147727 58.946023,5.4147727 z"
-         style="opacity:0.49377597;fill:#030303;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.93788773;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         style="display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.93788767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-         id="rect4264"
-         width="4.8511415"
-         height="23.741617"
-         x="30.496887"
-         y="14.373313"
-         transform="matrix(0.86688942,0.49850049,-0.49850049,0.86688942,0,0)" />
-      <rect
-         style="display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.93788892;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-         id="rect4268"
-         width="4.851151"
-         height="43.573059"
-         x="52.59425"
-         y="-7.9707904"
-         transform="matrix(0.94638047,0.32305418,-0.32305418,0.94638047,0,0)" />
-      <rect
-         style="display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.93788767;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-         id="rect4270"
-         width="4.8511434"
-         height="35.116173"
-         x="-4.6363521"
-         y="-66.881546"
-         transform="matrix(-0.7974337,0.60340657,-0.60340657,-0.7974337,0,0)" />
+         style="fill:#3465a4;stroke:#0b1521;stroke-width:2.17260504000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 42.278083,54.088916 -5.47923,3.529867 -15.615392,-28.265339 5.47923,-3.529866 z"
+         id="path3061-2-6"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2.17260504000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 40.030505,54.352905 25.307928,28.000741"
+         id="path3063-7-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#3465a4;stroke:#0b1521;stroke-width:2.17260504000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 14.595964,59.190407 8.3002375,57.503472 18.745204,26.947417 25.04093,28.634351 z"
+         id="path3061-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2.17260504000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 10.765537,56.697148 20.477061,28.878353"
+         id="path3063-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:#3465a4;stroke:#0b1521;stroke-width:2.17260504000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 43.072929,58.42206 36.777202,56.735126 53.506884,7.8835655 59.80261,9.5705002 z"
+         id="path3061"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:2.17260504000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 39.242502,55.928802 55.23874,9.8145023"
+         id="path3063"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
-         transform="matrix(-0.1616552,-0.00400046,0.00400046,-0.1616552,38.311999,157.64419)"
-         id="g2180">
-        <circle
-           r="48.57143"
-           cy="655.2193"
-           cx="197.14285"
-           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-           id="path2182" />
-        <ellipse
-           ry="23.991123"
-           rx="34.345188"
-           cy="672.79736"
-           cx="225.26402"
-           style="fill:url(#radialGradient3263);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path2184"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+         transform="matrix(1.0863025,0,0,1.0863025,42.20934,-44.506537)"
+         id="g3827-1"
+         style="stroke:#ef2929">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9"
+           style="stroke:#ef2929">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
       </g>
       <g
-         transform="matrix(-0.16157349,-0.00651265,0.00651265,-0.16157349,50.048243,134.29222)"
-         id="g2186">
-        <circle
-           r="48.57143"
-           cy="655.2193"
-           cx="197.14285"
-           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-           id="path2188" />
-        <ellipse
-           ry="23.991123"
-           rx="34.345188"
-           cy="672.79736"
-           cx="225.26402"
-           style="fill:url(#radialGradient3265);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path2190"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+         transform="matrix(1.0863025,0,0,1.0863025,27.001105,-1.0485228)"
+         id="g3827-1-3">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-6"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-2"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
       </g>
       <g
-         transform="matrix(-0.16054871,-0.01930088,0.01930088,-0.16054871,60.178657,158.43402)"
-         id="g2196">
-        <circle
-           r="48.57143"
-           cy="655.2193"
-           cx="197.14285"
-           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-           id="path2198" />
-        <ellipse
-           ry="23.991123"
-           rx="34.345188"
-           cy="672.79736"
-           cx="225.26402"
-           style="fill:url(#radialGradient3267);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path2200"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+         transform="matrix(1.0863025,0,0,1.0863025,9.6202655,-29.292387)"
+         id="g3827-1-9"
+         style="stroke:#ef2929">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-4"
+           style="stroke:#ef2929">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-8"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-1);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-8"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
       </g>
       <g
-         transform="matrix(-0.1617047,0,0,-0.1617047,86.451257,117.27031)"
-         id="g2204">
-        <circle
-           r="48.57143"
-           cy="655.2193"
-           cx="197.14285"
-           style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-           id="path2206" />
-        <ellipse
-           ry="23.991123"
-           rx="34.345188"
-           cy="672.79736"
-           cx="225.26402"
-           style="fill:url(#radialGradient3269);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path2208"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+         transform="matrix(1.0863025,0,0,1.0863025,-1.2489895,-1.0485227)"
+         id="g3827-1-7"
+         style="stroke:#ef2929">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-1"
+           style="stroke:#ef2929">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-1"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-2);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-5"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle.svg
index 9a25a5e56c..cdfa7ea764 100755
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2825"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreateRectangle.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -61,6 +61,46 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2833" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -69,18 +109,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="19.051709"
-     inkscape:cy="34.738515"
+     inkscape:zoom="3.6040039"
+     inkscape:cx="-63.446633"
+     inkscape:cy="75.009044"
      inkscape:current-layer="g3527"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="756"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2830">
     <rdf:RDF>
@@ -102,65 +150,68 @@
        inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
        id="g3527"
        transform="matrix(0.1367702,0,0,0.1367702,-125.84674,-47.962092)">
-      <path
-         style="opacity:0.56084744;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 1325.7276,414.66071 C 1303.3778,414.66071 1284.5351,429.78547 1278.8839,450.34821 L 993.13393,450.34821 L 993.13393,685.56696 C 974.47613,692.34696 961.13393,710.23195 961.13393,731.22321 C 961.13393,758.03464 982.91623,779.78571 1009.7276,779.78571 C 1031.3589,779.78571 1049.6658,765.62019 1055.9464,746.06696 L 1340.2902,746.06696 L 1340.2902,509.56696 C 1359.9944,503.37596 1374.2902,484.96212 1374.2902,463.22321 C 1374.2902,436.41179 1352.5391,414.66071 1325.7276,414.66071 z M 1025.3214,482.87946 L 1281.2902,482.87946 C 1286.2964,494.17047 1295.4855,503.20013 1306.8839,508.00446 L 1306.8839,713.62946 L 1054.9776,713.62946 C 1049.7913,700.30906 1038.9165,689.8362 1025.3214,685.22321 L 1025.3214,482.87946 z"
-         id="path2734" />
-      <path
-         id="rect2233"
-         d="M 968.5625,425.21875 L 968.5625,720.9375 L 1315.7188,720.9375 L 1315.7188,425.21875 L 968.5625,425.21875 z M 1000.75,457.75 L 1282.3125,457.75 L 1282.3125,688.5 L 1000.75,688.5 L 1000.75,457.75 z"
-         style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <g
-         inkscape:export-ydpi="6.5019679"
-         inkscape:export-xdpi="6.5019679"
+         inkscape:export-ydpi="6.5895667"
+         inkscape:export-xdpi="6.5895667"
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
-         transform="matrix(-1,0,0,-1,1182.2857,1361.2958)"
-         id="g2209">
+         id="g3527-3"
+         transform="matrix(0.92000004,0,0,0.99852826,92.32808,1.1079335)">
         <path
-           sodipodi:type="arc"
-           style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path2211"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
+           id="rect2233"
+           d="m 971.31349,415.98457 0,336.82629 365.57671,0 0,-336.82629 z m 43.86921,44.36492 274.0236,-0.43105 0,248.95857 -274.0236,0.0646 z"
+           style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:15.25683403;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccc" />
         <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient2215);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path2213"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 55.913045,10.935149 -46.7391286,0 0,43.063378"
+           id="path3040"
+           inkscape:connector-curvature="0"
+           transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:2.08668017;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+           d="m 13,51 39.685575,0.03219 -0.06987,-36.128755"
+           id="path3042"
+           inkscape:connector-curvature="0"
+           transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+           sodipodi:nodetypes="ccc" />
       </g>
       <g
-         inkscape:export-ydpi="6.5019679"
-         inkscape:export-xdpi="6.5019679"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
-         transform="matrix(-1,0,0,-1,1498.2857,1093.2958)"
-         id="g2217">
-        <path
-           sodipodi:type="arc"
-           style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path2219"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient2229);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path2221"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+         transform="matrix(7.3115342,0,0,7.3115342,1212.6361,58.175299)"
+         id="g3827-1">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+         id="g3827-1-3">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-6"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-2"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle_Constr.svg
index 2943dcb369..8fc15c88a4 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle_Constr.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2825"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateRectangle_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateRectangle.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
@@ -61,6 +61,46 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2833" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -69,18 +109,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.0615072"
-     inkscape:cx="-49.198328"
-     inkscape:cy="25.594878"
+     inkscape:zoom="7.2080078"
+     inkscape:cx="15.852272"
+     inkscape:cy="26.736776"
      inkscape:current-layer="g3527"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
      inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2830">
     <rdf:RDF>
@@ -103,65 +151,68 @@
        inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
        id="g3527"
        transform="matrix(0.1367702,0,0,0.1367702,-125.84674,-47.962092)">
-      <path
-         style="opacity:0.56084744;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         d="M 1325.7276,414.66071 C 1303.3778,414.66071 1284.5351,429.78547 1278.8839,450.34821 L 993.13393,450.34821 L 993.13393,685.56696 C 974.47613,692.34696 961.13393,710.23195 961.13393,731.22321 C 961.13393,758.03464 982.91623,779.78571 1009.7276,779.78571 C 1031.3589,779.78571 1049.6658,765.62019 1055.9464,746.06696 L 1340.2902,746.06696 L 1340.2902,509.56696 C 1359.9944,503.37596 1374.2902,484.96212 1374.2902,463.22321 C 1374.2902,436.41179 1352.5391,414.66071 1325.7276,414.66071 z M 1025.3214,482.87946 L 1281.2902,482.87946 C 1286.2964,494.17047 1295.4855,503.20013 1306.8839,508.00446 L 1306.8839,713.62946 L 1054.9776,713.62946 C 1049.7913,700.30906 1038.9165,689.8362 1025.3214,685.22321 L 1025.3214,482.87946 z"
-         id="path2734" />
-      <path
-         id="rect2233"
-         d="M 968.5625,425.21875 L 968.5625,720.9375 L 1315.7188,720.9375 L 1315.7188,425.21875 L 968.5625,425.21875 z M 1000.75,457.75 L 1282.3125,457.75 L 1282.3125,688.5 L 1000.75,688.5 L 1000.75,457.75 z"
-         style="fill:#4040ff;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <g
-         inkscape:export-ydpi="6.5019679"
-         inkscape:export-xdpi="6.5019679"
+         inkscape:export-ydpi="6.5895667"
+         inkscape:export-xdpi="6.5895667"
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
-         transform="matrix(-1,0,0,-1,1182.2857,1361.2958)"
-         id="g2209">
+         id="g3527-3"
+         transform="matrix(0.92000004,0,0,0.99852826,92.32808,1.1079335)">
         <path
-           sodipodi:type="arc"
-           style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path2211"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
+           id="rect2233"
+           d="m 971.31349,415.98457 0,336.82629 365.57671,0 0,-336.82629 z m 43.86921,44.36492 274.0236,-0.43105 0,248.95857 -274.0236,0.0646 z"
+           style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:15.25683403000000027;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccccc" />
         <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient2215);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path2213"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+           style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 55.913045,10.935149 -46.7391286,0 0,43.063378"
+           id="path3040"
+           inkscape:connector-curvature="0"
+           transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+           sodipodi:nodetypes="ccc" />
+        <path
+           style="fill:none;stroke:#729fcf;stroke-width:2.08668017000000017;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+           d="m 13,51 39.685575,0.03219 -0.06987,-36.128755"
+           id="path3042"
+           inkscape:connector-curvature="0"
+           transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+           sodipodi:nodetypes="ccc" />
       </g>
       <g
-         inkscape:export-ydpi="6.5019679"
-         inkscape:export-xdpi="6.5019679"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
-         transform="matrix(-1,0,0,-1,1498.2857,1093.2958)"
-         id="g2217">
-        <path
-           sodipodi:type="arc"
-           style="opacity:1;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path2219"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient2229);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path2221"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+         transform="matrix(7.3115342,0,0,7.3115342,1212.6361,58.175299)"
+         id="g3827-1">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+         id="g3827-1-3">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-9-5">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-71-6"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-3-2"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot.svg
index 6a0c985b3d..dc149fe7cb 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot.svg
@@ -14,10 +14,34 @@
    height="64"
    id="svg4564"
    version="1.1"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreateSlot.svg">
   <defs
      id="defs4566">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3838">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3840" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3842" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3830">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3832" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3834" />
+    </linearGradient>
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144-3"
@@ -64,6 +88,86 @@
          offset="1"
          id="stop3148-9" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3830"
+       id="linearGradient3836"
+       x1="36"
+       y1="1037.3622"
+       x2="32"
+       y2="1005.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3844"
+       x1="36"
+       y1="1039.3622"
+       x2="32"
+       y2="1003.3622"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144-3"
+       id="radialGradient3846"
+       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-0"
+       id="radialGradient3848"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -72,17 +176,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="15.578125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="7.7890625"
+     inkscape:cx="-20.969414"
+     inkscape:cy="33.623382"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1867"
-     inkscape:window-height="1176"
-     inkscape:window-x="53"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     showgrid="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="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3014"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4569">
     <rdf:RDF>
@@ -100,147 +214,65 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-988.36218)">
+    <path
+       transform="matrix(0.84999999,0,0,0.85,5.1500002,995.01218)"
+       style="fill:none;stroke:#2e3436;stroke-width:9.4117651;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1"
+       d="m 42.176471,11 c 11.045695,0 20,8.954305 20,20 0,11.045695 -8.954305,20 -20,20 m 0,-40 L 21,11 C 9.954305,11 1,19.954305 1,31 1,42.045695 9.954305,51 21,51 l 21.176471,0"
+       id="path3016"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsc" />
+    <path
+       style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+       d="m 41,1004.3622 c 9.388841,0 17,7.6111 17,17 0,9.3888 -7.611159,17 -17,17 m 0,-34 -18,0 c -9.388841,0 -17,7.6111 -17,17 0,9.3888 7.611159,17 17,17 l 18,0"
+       id="path3016-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsc" />
+    <path
+       style="fill:none;stroke:url(#linearGradient3844);stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+       d="m 41.346154,1003.3622 c 9.749951,0 17.653847,8.0588 17.653847,17.9999 0,9.9411 -7.903896,18 -17.653847,18 m 0,-35.9999 -18.692307,0 c -9.749951,0 -17.6538467,8.0588 -17.6538467,17.9999 0,9.9411 7.9038957,18 17.6538467,18 l 18.692307,0"
+       id="path3016-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsc" />
+    <path
+       style="fill:none;stroke:url(#linearGradient3836);stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+       d="m 40.653846,1005.3622 c 9.027732,0 16.346154,7.1634 16.346154,16 0,8.8365 -7.318422,16 -16.346154,16 m 0,-32 -17.307692,0 c -9.027732,0 -16.346154,7.1634 -16.346154,16 0,8.8365 7.318422,16 16.346154,16 l 17.307692,0"
+       id="path3016-3-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsc" />
     <g
-       id="g3864">
+       transform="translate(12,969.36218)"
+       id="g3827-1-3-4">
       <g
-         transform="translate(-82.839357,-9.4600504)"
-         id="g3858">
-        <g
-           id="g3839">
-          <path
-             inkscape:connector-curvature="0"
-             style="fill:#000000;fill-opacity:0.58431373;stroke:none"
-             d="m 126.53125,20.65625 c -2.94629,0.1156 -5.37466,2.0247 -6.34375,4.625 -4.61813,-0.062 -8.76384,-0.1875 -14,-0.1875 -7.201462,0 -19.15625,6.72915 -19.15625,20.40625 0,13.9012 12.191573,20.625 18.40625,20.625 l 20.6875,0 c 7.69497,0 18.85754,-6.28855 19.15625,-19.96875 0.22671,-10.3823 -5.62398,-15.9819 -11.375,-18.6875 -0.15355,-3.9144 -3.46059,-6.966 -7.375,-6.8125 z m -18.90625,9.0625 c 4.58541,0 8.31276,0.083 12.40625,0.125 0.92111,3.003 3.77588,5.1289 7.0625,5 2.07952,-0.0816 3.91567,-1.05395 5.15625,-2.53125 0.51381,0.2791 1.03693,0.57235 1.53125,0.90625 0.90824,0.6135 1.77189,1.33345 2.5625,2.15625 0.79064,0.8227 1.49993,1.7581 2.09375,2.8125 0.59382,1.0543 1.08841,2.22295 1.40625,3.53125 0.31785,1.3083 0.4748,2.7278 0.4375,4.3125 -0.0312,1.3248 -0.20829,2.57155 -0.5,3.71875 -0.2917,1.1471 -0.71338,2.2144 -1.21875,3.1875 -0.50535,0.973 -1.10908,1.85395 -1.78125,2.65625 -0.67217,0.8023 -1.39541,1.52125 -2.1875,2.15625 -0.7921,0.635 -1.63482,1.18515 -2.5,1.65625 -0.86518,0.4711 -1.76484,0.8768 -2.65625,1.1875 -1.7828,0.6213 -3.54971,0.90625 -5.15625,0.90625 L 107,61.5 c -1.29749,0 -2.90844,-0.31195 -4.59375,-0.96875 -1.68532,-0.6568 -3.464137,-1.64435 -5.0625,-2.96875 -0.799175,-0.6623 -1.530343,-1.4189 -2.21875,-2.25 -0.688407,-0.8312 -1.325459,-1.7486 -1.84375,-2.75 -0.518291,-1.0015 -0.929923,-2.0769 -1.21875,-3.25 -0.288812,-1.1732 -0.4375,-2.43505 -0.4375,-3.78125 0,-1.3244 0.152397,-2.56225 0.4375,-3.71875 0.285118,-1.1566 0.703131,-2.22945 1.21875,-3.21875 0.515604,-0.9893 1.120997,-1.89605 1.8125,-2.71875 0.691503,-0.8227 1.468465,-1.56195 2.28125,-2.21875 0.812785,-0.6568 1.651815,-1.22725 2.53125,-1.71875 0.87945,-0.4916 1.796,-0.923 2.6875,-1.25 1.78298,-0.6541 3.52775,-0.96875 5.03125,-0.96875 z"
-             transform="translate(0,988.36218)"
-             id="path4460-0" />
-          <g
-             transform="matrix(0.1460346,0,0,0.1460346,-78.197983,893.47417)"
-             id="g4510-9"
-             style="fill:none;stroke:#000000;stroke-width:0.99976307;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-        </g>
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-5-8">
         <path
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-           sodipodi:ry="48.57143"
-           sodipodi:rx="48.57143"
-           sodipodi:cy="655.2193"
-           sodipodi:cx="197.14285"
-           id="path3187-6-4-3"
-           style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc"
-           transform="matrix(-0.14592237,0.00572413,-0.00572413,-0.14592237,138.19924,1128.1503)" />
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-6-8"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-2-2"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
-      <path
-         sodipodi:nodetypes="sssszss"
-         inkscape:connector-curvature="0"
-         id="path4141-3"
-         d="m 21.636261,1002.1827 c 6.503928,0 11.165893,0.1984 17.559594,0.1984 5.179687,0 18.781569,3.9712 18.45245,18.4524 -0.275129,12.106 -10.571488,17.6588 -17.658796,17.6588 -6.75391,0 -13.323773,0 -19.047687,0 -5.723913,0 -16.9643573,-5.9524 -16.9643573,-18.254 0,-12.1032 11.0260363,-18.0556 17.6587963,-18.0556 z"
-         style="fill:none;stroke:#ffffff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    </g>
+    <g
+       transform="translate(34.005735,952.36218)"
+       id="g3827-1-3">
       <g
-         style="fill:none"
-         id="g4018"
-         transform="matrix(0.1460346,0,0,0.1460346,-243.67723,868.9543)">
-        <g
-           style="fill:none;stroke-width:3.50565672;stroke-miterlimit:4;stroke-dasharray:none"
-           id="g3166"
-           transform="matrix(1.6544676,0,0,1.6544676,2011.7064,-680.69863)">
-          <path
-             style="fill:none;stroke:#000000;stroke-width:3.50565672;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -115.61227,953.38013 a 84.277296,84.277296 0 1 0 -0.55827,168.55277"
-             id="path3154"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:3.50565672;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -116.17054,1121.9329 83.692929,0"
-             id="path3156"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:3.50565672;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -115.61227,953.38013 74.580844,0.49405"
-             id="path3158"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:3.50565672;stroke-miterlimit:4;stroke-dasharray:none"
-             d="M -32.477611,1121.9329 A 84.277296,84.277296 0 0 0 -41.031426,953.87418"
-             id="path3160"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           style="fill:none;stroke-width:4.36553478;stroke-miterlimit:4;stroke-dasharray:none"
-           id="g3166-5"
-           transform="matrix(1.3730689,0,0,1.2855474,1987.8595,-296.92716)">
-          <path
-             style="fill:none;stroke:#000000;stroke-width:4.36553478;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -115.61227,953.38013 a 84.277296,84.277296 0 1 0 -0.55827,168.55277"
-             id="path3154-2"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:4.36553478;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -116.17054,1121.9329 83.692929,0"
-             id="path3156-7"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:4.36553478;stroke-miterlimit:4;stroke-dasharray:none"
-             d="m -115.61227,953.38013 74.580844,0.49405"
-             id="path3158-6"
-             inkscape:connector-curvature="0" />
-          <path
-             style="fill:none;stroke:#000000;stroke-width:4.36553478;stroke-miterlimit:4;stroke-dasharray:none"
-             d="M -32.477611,1121.9329 A 84.277296,84.277296 0 0 0 -41.031426,953.87418"
-             id="path3160-7"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-      <g
-         id="g3185-6"
-         transform="matrix(-0.14592237,0.00572413,-0.00572413,-0.14592237,53.810078,1114.8202)"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         inkscape:export-xdpi="7.2934141"
-         inkscape:export-ydpi="7.2934141">
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-5">
         <path
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-           sodipodi:ry="48.57143"
-           sodipodi:rx="48.57143"
-           sodipodi:cy="655.2193"
-           sodipodi:cx="197.14285"
-           id="path3187-4"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
         <path
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           sodipodi:ry="23.991123"
-           sodipodi:rx="34.345188"
-           sodipodi:cy="672.79736"
-           sodipodi:cx="225.26402"
-           id="path3189-2"
-           style="fill:url(#radialGradient4572);fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
-      </g>
-      <g
-         id="g3185-9"
-         transform="matrix(-0.14592237,0.00572413,-0.00572413,-0.14592237,73.651419,1097.3598)"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         inkscape:export-xdpi="7.2934141"
-         inkscape:export-ydpi="7.2934141">
-        <path
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-           sodipodi:ry="48.57143"
-           sodipodi:rx="48.57143"
-           sodipodi:cy="655.2193"
-           sodipodi:cx="197.14285"
-           id="path3187-2"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-        <path
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           sodipodi:ry="23.991123"
-           sodipodi:rx="34.345188"
-           sodipodi:cy="672.79736"
-           sodipodi:cx="225.26402"
-           id="path3189-3"
-           style="fill:url(#radialGradient4574);fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-2"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot_Constr.svg
index 89ea523fbc..64523d1b33 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot_Constr.svg
@@ -14,10 +14,34 @@
    height="64"
    id="svg4564"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateSlot_Constr.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateSlot.svg">
   <defs
      id="defs4566">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3838">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3840" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3842" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3830">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="0"
+         id="stop3832" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop3834" />
+    </linearGradient>
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144-3"
@@ -64,6 +88,86 @@
          offset="1"
          id="stop3148-9" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3830"
+       id="linearGradient3836"
+       x1="36"
+       y1="1037.3622"
+       x2="32"
+       y2="1005.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3838"
+       id="linearGradient3844"
+       x1="36"
+       y1="1039.3622"
+       x2="32"
+       y2="1003.3622"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144-3"
+       id="radialGradient3846"
+       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-0"
+       id="radialGradient3848"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -72,17 +176,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="6.0699921"
-     inkscape:cx="33.348027"
-     inkscape:cy="13.578673"
+     inkscape:zoom="15.578125"
+     inkscape:cx="33.736141"
+     inkscape:cy="31.813359"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="false"
+     showgrid="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3014"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4569">
     <rdf:RDF>
@@ -100,122 +214,66 @@
      inkscape:groupmode="layer"
      id="layer1"
      transform="translate(0,-988.36218)">
+    <path
+       transform="matrix(0.84999999,0,0,0.85,5.1500002,995.01218)"
+       style="fill:none;stroke:#0b1521;stroke-width:9.41176510000000022;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+       d="m 42.176471,11 c 11.045695,0 20,8.954305 20,20 0,11.045695 -8.954305,20 -20,20 m 0,-40 L 21,11 C 9.954305,11 1,19.954305 1,31 1,42.045695 9.954305,51 21,51 l 21.176471,0"
+       id="path3016"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsc" />
+    <path
+       style="fill:none;stroke:#3465a4;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+       d="m 41,1004.3622 c 9.388841,0 17,7.6111 17,17 0,9.3888 -7.611159,17 -17,17 m 0,-34 -18,0 c -9.388841,0 -17,7.6111 -17,17 0,9.3888 7.611159,17 17,17 l 18,0"
+       id="path3016-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsc" />
+    <path
+       style="fill:none;stroke:url(#linearGradient3844);stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+       d="m 41.346154,1003.3622 c 9.749951,0 17.653847,8.0588 17.653847,17.9999 0,9.9411 -7.903896,18 -17.653847,18 m 0,-35.9999 -18.692307,0 c -9.749951,0 -17.6538467,8.0588 -17.6538467,17.9999 0,9.9411 7.9038957,18 17.6538467,18 l 18.692307,0"
+       id="path3016-3-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsc" />
+    <path
+       style="fill:none;stroke:url(#linearGradient3836);stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;stroke-opacity:1"
+       d="m 40.653846,1005.3622 c 9.027732,0 16.346154,7.1634 16.346154,16 0,8.8365 -7.318422,16 -16.346154,16 m 0,-32 -17.307692,0 c -9.027732,0 -16.346154,7.1634 -16.346154,16 0,8.8365 7.318422,16 16.346154,16 l 17.307692,0"
+       id="path3016-3-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csccsc" />
     <g
-       id="g3858"
-       transform="translate(-82.839357,-9.4600504)">
+       transform="translate(12,969.36218)"
+       id="g3827-1-3-4">
       <g
-         id="g3839">
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-5-8">
         <path
-           id="path4460-0"
-           transform="translate(0,988.36218)"
-           d="m 126.53125,20.65625 c -2.94629,0.1156 -5.37466,2.0247 -6.34375,4.625 -4.61813,-0.062 -8.76384,-0.1875 -14,-0.1875 -7.201462,0 -19.15625,6.72915 -19.15625,20.40625 0,13.9012 12.191573,20.625 18.40625,20.625 l 20.6875,0 c 7.69497,0 18.85754,-6.28855 19.15625,-19.96875 0.22671,-10.3823 -5.62398,-15.9819 -11.375,-18.6875 -0.15355,-3.9144 -3.46059,-6.966 -7.375,-6.8125 z m -18.90625,9.0625 c 4.58541,0 8.31276,0.083 12.40625,0.125 0.92111,3.003 3.77588,5.1289 7.0625,5 2.07952,-0.0816 3.91567,-1.05395 5.15625,-2.53125 0.51381,0.2791 1.03693,0.57235 1.53125,0.90625 0.90824,0.6135 1.77189,1.33345 2.5625,2.15625 0.79064,0.8227 1.49993,1.7581 2.09375,2.8125 0.59382,1.0543 1.08841,2.22295 1.40625,3.53125 0.31785,1.3083 0.4748,2.7278 0.4375,4.3125 -0.0312,1.3248 -0.20829,2.57155 -0.5,3.71875 -0.2917,1.1471 -0.71338,2.2144 -1.21875,3.1875 -0.50535,0.973 -1.10908,1.85395 -1.78125,2.65625 -0.67217,0.8023 -1.39541,1.52125 -2.1875,2.15625 -0.7921,0.635 -1.63482,1.18515 -2.5,1.65625 -0.86518,0.4711 -1.76484,0.8768 -2.65625,1.1875 -1.7828,0.6213 -3.54971,0.90625 -5.15625,0.90625 L 107,61.5 c -1.29749,0 -2.90844,-0.31195 -4.59375,-0.96875 -1.68532,-0.6568 -3.464137,-1.64435 -5.0625,-2.96875 -0.799175,-0.6623 -1.530343,-1.4189 -2.21875,-2.25 -0.688407,-0.8312 -1.325459,-1.7486 -1.84375,-2.75 -0.518291,-1.0015 -0.929923,-2.0769 -1.21875,-3.25 -0.288812,-1.1732 -0.4375,-2.43505 -0.4375,-3.78125 0,-1.3244 0.152397,-2.56225 0.4375,-3.71875 0.285118,-1.1566 0.703131,-2.22945 1.21875,-3.21875 0.515604,-0.9893 1.120997,-1.89605 1.8125,-2.71875 0.691503,-0.8227 1.468465,-1.56195 2.28125,-2.21875 0.812785,-0.6568 1.651815,-1.22725 2.53125,-1.71875 0.87945,-0.4916 1.796,-0.923 2.6875,-1.25 1.78298,-0.6541 3.52775,-0.96875 5.03125,-0.96875 z"
-           style="fill:#000000;fill-opacity:0.58431373;stroke:none"
-           inkscape:connector-curvature="0" />
-        <g
-           style="fill:none;stroke:#000000;stroke-width:0.99976307;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="g4510-9"
-           transform="matrix(0.1460346,0,0,0.1460346,-78.197983,893.47417)" />
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-6-8"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-2-2"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
-      <circle
-         r="48.57143"
-         cy="655.2193"
-         cx="197.14285"
-         transform="matrix(-0.14592237,0.00572413,-0.00572413,-0.14592237,138.19924,1128.1503)"
-         style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
-         id="path3187-6-4-3" />
-    </g>
-    <path
-       style="fill:none;stroke:#4040ff;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 21.636261,1002.1827 c 6.503928,0 11.165893,0.1984 17.559594,0.1984 5.179687,0 18.781569,3.9712 18.45245,18.4524 -0.275129,12.106 -10.571488,17.6588 -17.658796,17.6588 -6.75391,0 -13.323773,0 -19.047687,0 -5.723913,0 -16.9643573,-5.9524 -16.9643573,-18.254 0,-12.1032 11.0260363,-18.0556 17.6587963,-18.0556 z"
-       id="path4141-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sssszss" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3154"
-       d="m 22.168485,999.89446 a 20.362196,20.362196 0 1 0 -0.134883,40.72394"
-       style="fill:none;stroke:#000000;stroke-width:0.847;stroke-miterlimit:4;stroke-dasharray:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3156"
-       d="m 22.033602,1040.6184 20.221007,0"
-       style="fill:none;stroke:#000000;stroke-width:0.847;stroke-miterlimit:4;stroke-dasharray:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3158"
-       d="m 22.168485,999.89446 18.019441,0.11934"
-       style="fill:none;stroke:#000000;stroke-width:0.847;stroke-miterlimit:4;stroke-dasharray:none" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3160"
-       d="m 42.254609,1040.6184 a 20.362196,20.362196 0 0 0 -2.066683,-40.6046"
-       style="fill:none;stroke:#000000;stroke-width:0.847;stroke-miterlimit:4;stroke-dasharray:none" />
-    <g
-       style="fill:none;stroke-width:4.36553478;stroke-miterlimit:4;stroke-dasharray:none"
-       id="g3166-5"
-       transform="matrix(0.20051557,0,0,0.1877344,46.619037,825.59266)">
-      <path
-         style="fill:none;stroke:#000000;stroke-width:4.36553478;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -115.61227,953.38013 a 84.277296,84.277296 0 1 0 -0.55827,168.55277"
-         id="path3154-2"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:4.36553478;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -116.17054,1121.9329 83.692929,0"
-         id="path3156-7"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:4.36553478;stroke-miterlimit:4;stroke-dasharray:none"
-         d="m -115.61227,953.38013 74.580844,0.49405"
-         id="path3158-6"
-         inkscape:connector-curvature="0" />
-      <path
-         style="fill:none;stroke:#000000;stroke-width:4.36553478;stroke-miterlimit:4;stroke-dasharray:none"
-         d="M -32.477611,1121.9329 A 84.277296,84.277296 0 0 0 -41.031426,953.87418"
-         id="path3160-7"
-         inkscape:connector-curvature="0" />
     </g>
     <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.14592237,0.00572413,-0.00572413,-0.14592237,53.810078,1114.8202)"
-       id="g3185-6">
-      <circle
-         r="48.57143"
-         cy="655.2193"
-         cx="197.14285"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3187-4" />
-      <ellipse
-         ry="23.991123"
-         rx="34.345188"
-         cy="672.79736"
-         cx="225.26402"
-         style="fill:url(#radialGradient4572);fill-opacity:1;stroke:none"
-         id="path3189-2"
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-    </g>
-    <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.14592237,0.00572413,-0.00572413,-0.14592237,73.651419,1097.3598)"
-       id="g3185-9">
-      <circle
-         r="48.57143"
-         cy="655.2193"
-         cx="197.14285"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3187-2" />
-      <ellipse
-         ry="23.991123"
-         rx="34.345188"
-         cy="672.79736"
-         cx="225.26402"
-         style="fill:url(#radialGradient4574);fill-opacity:1;stroke:none"
-         id="path3189-3"
-         transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+       transform="translate(34.005735,952.36218)"
+       id="g3827-1-3">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-9-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-2"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare.svg
index f306183f7e..e6762d8bf1 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare.svg
@@ -8,10 +8,42 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="64"
    height="64"
-   id="svg2">
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateSquare.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview44"
+     showgrid="true"
+     inkscape:zoom="10.429825"
+     inkscape:cx="20.645749"
+     inkscape:cy="23.886283"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3021"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -276,6 +308,46 @@
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -285,47 +357,71 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <path
-     d="m 16.875,9.875 -0.59375,2.4375 -8.25,34.5 -0.59375,2.4375 2.4375,0.5625 34.5,8.28125 2.4375,0.5625 0.5625,-2.4375 L 54.09375,28.125 A 7.2116405,7.0332467 0 0 0 60.40625,21.4375 7.2116405,7.0332467 0 0 0 47.25,17.15625 L 19.28125,10.46875 16.875,9.875 z m 3.6875,6.0625 25.5,6.0625 a 7.2116405,7.0332467 0 0 0 3.15625,5 L 43.125,52.625 13.46875,45.5625 20.5625,15.9375 z M 31.59375,27.25 A 7.2116405,7.0332467 0 0 0 24.625,34 7.2116405,7.0332467 0 1 0 39.03125,34.5625 7.2116405,7.0332467 0 0 0 31.59375,27.25 z"
-     id="path4595"
-     style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
   <g
-     id="g4584">
+     inkscape:export-ydpi="6.5895667"
+     inkscape:export-xdpi="6.5895667"
+     inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
+     id="g3527-3"
+     transform="matrix(0.11218194,0.0299818,-0.0326248,0.12144445,-81.403524,-70.601384)">
     <path
-       d="m 14.875,5.375 -0.59375,2.4375 -8.25,34.5 -0.59375,2.4375 2.4375,0.5625 34.5,8.28125 2.4375,0.5625 0.5625,-2.4375 8.25,-34.46875 0.59375,-2.4375 -2.4375,-0.59375 -34.5,-8.25 L 14.875,5.375 z M 18.5625,11.4375 48.1875,18.5 41.125,48.125 11.46875,41.0625 18.5625,11.4375 z"
-       id="path4578"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.847;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+       id="rect2233"
+       d="m 971.31349,415.98457 0,336.82629 365.57671,0 0,-336.82629 z m 43.86921,44.36492 274.0236,-0.43105 0,248.95857 -274.0236,0.0646 z"
+       style="fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:16.55097198;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2.16964698;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 55.830146,11.067962 9.1739164,10.935149 9.143254,53.893093"
+       id="path3040-3"
+       inkscape:connector-curvature="0"
+       transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2.26367974;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 13,51 39.685575,0.03219 -0.06987,-36.128755"
+       id="path3042-6"
+       inkscape:connector-curvature="0"
+       transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+       sodipodi:nodetypes="ccc" />
+  </g>
+  <g
+     transform="translate(40.00574,-28.005445)"
+     id="g3827-1">
     <g
-       transform="matrix(0.99742747,0,0,0.97275418,11.139278,-982.6724)"
-       id="g3038">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         id="path3040"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         id="path3042"
-         style="fill:url(#radialGradient4568);fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
+  </g>
+  <g
+     transform="translate(16,-16)"
+     id="g3827-1-3">
     <g
-       transform="matrix(0.99742747,0,0,0.97275418,32.514946,-995.79158)"
-       id="g3044">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5">
       <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         id="path3046"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         id="path3048"
-         style="fill:url(#radialGradient4570);fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare_Constr.svg
index f211a5a64b..42bb25ef38 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare_Constr.svg
@@ -14,8 +14,8 @@
    width="64"
    height="64"
    id="svg2"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateSquare_Constr.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateSquare.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -26,16 +26,24 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
+     inkscape:window-height="1137"
      id="namedview44"
-     showgrid="false"
-     inkscape:zoom="11.494629"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     showgrid="true"
+     inkscape:zoom="10.429825"
+     inkscape:cx="20.645749"
+     inkscape:cy="23.886283"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="g3527-3">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3021"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -300,6 +308,46 @@
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -313,45 +361,67 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <path
-     d="m 16.875,9.875 -0.59375,2.4375 -8.25,34.5 -0.59375,2.4375 2.4375,0.5625 34.5,8.28125 2.4375,0.5625 0.5625,-2.4375 L 54.09375,28.125 A 7.2116405,7.0332467 0 0 0 60.40625,21.4375 7.2116405,7.0332467 0 0 0 47.25,17.15625 L 19.28125,10.46875 16.875,9.875 z m 3.6875,6.0625 25.5,6.0625 a 7.2116405,7.0332467 0 0 0 3.15625,5 L 43.125,52.625 13.46875,45.5625 20.5625,15.9375 z M 31.59375,27.25 A 7.2116405,7.0332467 0 0 0 24.625,34 7.2116405,7.0332467 0 1 0 39.03125,34.5625 7.2116405,7.0332467 0 0 0 31.59375,27.25 z"
-     id="path4595"
-     style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
-     inkscape:connector-curvature="0"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;stroke:#000000;stroke-width:0.847;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path4578"
-     d="m 14.875,5.375 -0.59375,2.4375 -8.25,34.5 -0.59375,2.4375 2.4375,0.5625 34.5,8.28125 2.4375,0.5625 0.5625,-2.4375 8.25,-34.46875 0.59375,-2.4375 -2.4375,-0.59375 -34.5,-8.25 L 14.875,5.375 Z M 18.5625,11.4375 48.1875,18.5 41.125,48.125 11.46875,41.0625 18.5625,11.4375 Z" />
   <g
-     id="g3038"
-     transform="matrix(0.99742747,0,0,0.97275418,11.139278,-982.6724)">
+     inkscape:export-ydpi="6.5895667"
+     inkscape:export-xdpi="6.5895667"
+     inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/rectangle.png"
+     id="g3527-3"
+     transform="matrix(0.11218194,0.0299818,-0.0326248,0.12144445,-81.403524,-70.601384)">
     <path
+       id="rect2233"
+       d="m 971.31349,415.98457 0,336.82629 365.57671,0 0,-336.82629 z m 43.86921,44.36492 274.0236,-0.43105 0,248.95857 -274.0236,0.0646 z"
+       style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:16.55097197999999992;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
        inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3040"
-       transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
+       sodipodi:nodetypes="cccccccccc" />
     <path
+       style="fill:none;stroke:#729fcf;stroke-width:2.16964698000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 55.830146,11.067962 9.1739164,10.935149 9.143254,53.893093"
+       id="path3040-3"
        inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient4568);fill-opacity:1;stroke:none"
-       id="path3042"
-       transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-       d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+       transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2.26367974000000016;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 13,51 39.685575,0.03219 -0.06987,-36.128755"
+       id="path3042-6"
+       inkscape:connector-curvature="0"
+       transform="matrix(7.3115342,0,0,7.3115342,920.13275,350.67648)"
+       sodipodi:nodetypes="ccc" />
   </g>
   <g
-     id="g3044"
-     transform="matrix(0.99742747,0,0,0.97275418,32.514946,-995.79158)">
-    <path
-       inkscape:connector-curvature="0"
-       style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3046"
-       transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient4570);fill-opacity:1;stroke:none"
-       id="path3048"
-       transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-       d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+     transform="translate(40.00574,-28.005445)"
+     id="g3827-1">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
+  </g>
+  <g
+     transform="translate(16,-16)"
+     id="g3827-1-3">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateText.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateText.svg
index 4b7627e60e..c11ba4e152 100755
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateText.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateText.svg
@@ -7,18 +7,30 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="64px"
    height="64px"
    id="svg4594"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_CreateText.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs4596">
+    <linearGradient
+       id="linearGradient3010">
+      <stop
+         id="stop3012"
+         offset="0"
+         style="stop-color:#ef2929;stop-opacity:1" />
+      <stop
+         id="stop3014"
+         offset="1"
+         style="stop-color:#a40000;stop-opacity:1" />
+    </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -26,6 +38,36 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective4602" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3792"
+       id="linearGradient3806"
+       x1="4115.4229"
+       y1="1473.5258"
+       x2="4157.8677"
+       y2="1734.2576"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3792">
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="0"
+         id="stop3794" />
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="1"
+         id="stop3796" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(12.126952,12.126971)"
+       y2="1734.2576"
+       x2="4157.8677"
+       y1="1473.5258"
+       x1="4115.4229"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3009"
+       xlink:href="#linearGradient3010"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -34,18 +76,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.9445436"
-     inkscape:cx="-67.876651"
-     inkscape:cy="7.2926147"
+     inkscape:zoom="7.7781744"
+     inkscape:cx="13.788061"
+     inkscape:cy="16.489966"
      inkscape:current-layer="g3491"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="756"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2986"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata4599">
     <rdf:RDF>
@@ -67,14 +117,24 @@
        inkscape:export-xdpi="7.820137"
        inkscape:export-ydpi="7.820137"
        transform="matrix(0.1649204,0,0,0.1649204,-643.71716,-232.01446)">
-      <path
-         id="path3489"
-         d="M 4176.0736,1682.8371 L 4054.9798,1682.8371 L 4029.3939,1720.3371 C 4025.8782,1725.5455 4023.86,1729.647 4023.3392,1732.6418 C 4022.1673,1738.371 4025.6829,1742.3423 4033.8861,1744.5558 L 4032.7142,1750.8058 L 3944.433,1750.8058 L 3945.6048,1744.5558 C 3951.0736,1743.5142 3955.4356,1741.6913 3958.6908,1739.0871 C 3961.946,1736.4829 3966.1126,1731.4048 3971.1908,1723.8527 L 4110.058,1518.9699 C 4114.4849,1512.4597 4117.089,1507.2514 4117.8705,1503.3449 C 4119.1724,1497.3556 4116.3078,1493.0587 4109.2767,1490.4543 L 4110.4486,1484.2043 L 4204.9798,1484.2043 L 4203.808,1490.4543 C 4195.6046,1492.6681 4190.9822,1496.5092 4189.9408,1501.9777 C 4189.1593,1505.754 4189.5499,1510.0509 4191.1127,1514.8683 L 4251.4642,1720.3371 C 4254.0681,1729.0611 4256.6722,1735.0507 4259.2767,1738.3058 C 4261.8806,1741.4309 4265.7868,1743.5142 4270.9955,1744.5558 L 4269.8236,1750.8058 L 4171.7767,1750.8058 L 4172.9486,1744.5558 C 4181.9327,1743.1236 4187.076,1739.0871 4188.3783,1732.4465 C 4188.8989,1729.7121 4188.378,1725.6757 4186.8158,1720.3371 L 4176.0736,1682.8371 M 4166.5033,1646.3137 L 4142.2845,1551.3918 L 4079.5892,1646.3137 L 4166.5033,1646.3137"
-         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;opacity:0.62711864;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Copperplate Gothic Bold;-inkscape-font-specification:'Copperplate Gothic Bold, Bold'" />
       <path
          id="text2714"
-         d="M 4155.865,1658.6792 L 4034.7712,1658.6792 L 4009.1853,1696.1792 C 4005.6696,1701.3876 4003.6514,1705.4891 4003.1306,1708.4839 C 4001.9587,1714.2131 4005.4743,1718.1844 4013.6775,1720.3979 L 4012.5056,1726.6479 L 3924.2244,1726.6479 L 3925.3962,1720.3979 C 3930.865,1719.3563 3935.227,1717.5334 3938.4822,1714.9292 C 3941.7374,1712.325 3945.904,1707.2469 3950.9822,1699.6948 L 4089.8494,1494.812 C 4094.2763,1488.3018 4096.8804,1483.0935 4097.6619,1479.187 C 4098.9638,1473.1977 4096.0992,1468.9008 4089.0681,1466.2964 L 4090.24,1460.0464 L 4184.7712,1460.0464 L 4183.5994,1466.2964 C 4175.396,1468.5102 4170.7736,1472.3513 4169.7322,1477.8198 C 4168.9507,1481.5961 4169.3413,1485.893 4170.9041,1490.7104 L 4231.2556,1696.1792 C 4233.8595,1704.9032 4236.4636,1710.8928 4239.0681,1714.1479 C 4241.672,1717.273 4245.5782,1719.3563 4250.7869,1720.3979 L 4249.615,1726.6479 L 4151.5681,1726.6479 L 4152.74,1720.3979 C 4161.7241,1718.9657 4166.8674,1714.9292 4168.1697,1708.2886 C 4168.6903,1705.5542 4168.1694,1701.5178 4166.6072,1696.1792 L 4155.865,1658.6792 M 4146.2947,1622.1558 L 4122.0759,1527.2339 L 4059.3806,1622.1558 L 4146.2947,1622.1558"
-         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Copperplate Gothic Bold;-inkscape-font-specification:'Copperplate Gothic Bold, Bold'" />
+         d="m 4163.931,1667.5588 -109.1436,0 -33.4751,40.7475 c -3.5156,5.2084 -2.3852,4.766 -2.9061,7.7608 0,6.0635 3.9239,9.9135 12.1271,12.127 l 0,12.1271 -97.0165,0 0,-12.1271 c 5.4688,-1.0416 14.9354,-3.4593 18.1906,-6.0635 3.2552,-2.6042 6.0635,-6.0635 12.1271,-12.1271 l 139.4611,-200.0965 c 4.4269,-6.5102 5.2821,-8.2206 6.0636,-12.1271 1.3019,-5.9893 0.9676,-9.5226 -6.0636,-12.127 l 0,-12.1271 97.0165,0 0,12.1271 c -12.127,0 -17.1492,0.595 -18.1906,6.0635 -0.7814,3.7763 -0.6531,6.3037 0.9097,11.1211 l 60.3514,205.4688 c 2.6039,8.724 2.8333,10.5692 5.4378,13.8243 2.6038,3.1251 6.9183,5.0219 12.1271,6.0635 l 0,12.1271 -97.0165,0 0,-12.1271 c 8.984,-1.4322 10.8247,-5.4864 12.127,-12.127 0.5207,-2.7344 1.5623,-6.7885 0,-12.1271 l -12.127,-36.3812 m 0,-36.3812 -24.2542,-97.0165 -72.7623,97.0165 97.0165,0"
+         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:url(#linearGradient3009);fill-opacity:1;stroke:#302b00;stroke-width:12.1270628;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Copperplate Gothic Bold;-inkscape-font-specification:'Copperplate Gothic Bold, Bold'"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccscccccccccccccccccccccc" />
+      <path
+         id="text2714-1"
+         d="m 4171.6736,1655.4317 -122.0514,0 -36.1634,43.7572 c -8.9781,11.6058 -6.5744,17.6706 -7.5981,18.9453 0,5.6501 9.2106,8.5485 16.6543,10.6111 l 1.2403,-0.1379 -78.1114,-0.4134 -3.7208,2.894 c 4.9624,-0.9706 23.3368,-5.4284 26.2906,-7.855 2.9538,-2.4267 7.4313,-8.4063 12.2445,-15.4346 l 117.1771,-168.125 c 4.017,-6.0664 15.8176,-22.4055 19.0072,-28.5262 3.3863,-5.5809 9.1466,-22.5163 2.7664,-24.9431 l -10.1979,-0.5513 85.1396,0 -13.0918,-0.6889 c -11.004,0 -10.7379,5.2398 -11.5452,9.233 -0.7089,3.5189 0.6477,7.8032 2.0659,12.2922 l 55.59,189.1168 c 2.3628,8.1291 2.4331,9.7107 3.832,14.9489 3.6029,9.9401 1.3166,12.3967 6.043,13.3673 l 17.6394,4.272 -84.8894,0 12.5404,-6.2013 c 4.9827,-8.914 5.1626,-6.4905 6.3444,-12.6783 0.4724,-2.548 -2.579,-12.6647 -3.9966,-17.6393 l -12.9335,-35.4166 m 4.4614,-18.4109 -33.3601,-122.5662 -89.8152,122.4284 122.0295,0.024"
+         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:none;stroke:#ef2929;stroke-width:12.12706279999999914;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Copperplate Gothic Bold;-inkscape-font-specification:'Copperplate Gothic Bold, Bold'"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccscccccccccccccccccccccc" />
+      <path
+         id="text2714-7"
+         d="m 4163.931,1667.5588 -109.1436,0 -33.4751,40.7475 c -3.5156,5.2084 -2.3852,4.766 -2.9061,7.7608 0,6.0635 3.9239,9.9135 12.1271,12.127 l 0,12.1271 -97.0165,0 0,-12.1271 c 5.4688,-1.0416 14.9354,-3.4593 18.1906,-6.0635 3.2552,-2.6042 6.0635,-6.0635 12.1271,-12.1271 l 139.4611,-200.0965 c 4.4269,-6.5102 5.2821,-8.2206 6.0636,-12.1271 1.3019,-5.9893 0.9676,-9.5226 -6.0636,-12.127 l 0,-12.1271 97.0165,0 0,12.1271 c -12.127,0 -17.1492,0.595 -18.1906,6.0635 -0.7814,3.7763 -0.6531,6.3037 0.9097,11.1211 l 60.3514,205.4688 c 2.6039,8.724 2.8333,10.5692 5.4378,13.8243 2.6038,3.1251 6.9183,5.0219 12.1271,6.0635 l 0,12.1271 -97.0165,0 0,-12.1271 c 8.984,-1.4322 10.8247,-5.4864 12.127,-12.127 0.5206,-2.7344 1.5623,-6.7885 0,-12.1271 l -12.127,-36.3812 m 0,-36.3812 -24.2542,-97.0165 -72.7623,97.0165 97.0165,0"
+         style="font-size:40px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:none;stroke:#280000;stroke-width:12.12706279999999914;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;font-family:Copperplate Gothic Bold;-inkscape-font-specification:'Copperplate Gothic Bold, Bold'"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccscccccccccccccccccccccc" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle.svg
index 50447ee59f..c1e3e28445 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle.svg
@@ -8,10 +8,44 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="64"
    height="64"
-   id="svg2">
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreatePentagon_Constr.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     id="namedview38"
+     showgrid="true"
+     inkscape:zoom="13.668775"
+     inkscape:cx="20.906428"
+     inkscape:cy="33.647499"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3015"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -216,86 +250,46 @@
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4502"
-       xlink:href="#linearGradient3144"
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4504"
-       xlink:href="#linearGradient3144"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4514"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4516"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4524"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4527"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.12943197,0.07094777,-0.05081613,-0.08817552,115.30612,62.485709)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4530"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4533"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.12943197,0.07094777,-0.05081613,-0.08817552,93.930453,75.604887)" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -310,45 +304,72 @@
     </rdf:RDF>
   </metadata>
   <path
-     d="m 53,14.125 a 7.2116405,7.0332469 0 0 0 -6.59375,4.71875 L 9.71875,19.8125 A 2.50025,2.50025 0 0 0 7.65625,23.625 L 30.375,60.65625 a 2.50025,2.50025 0 0 0 4.3125,-0.125 L 52.28125,28.125 a 7.2116405,7.0332469 0 0 0 8.125,-6.6875 A 7.2116405,7.0332469 0 0 0 53,14.125 z m -6.46875,9.71875 a 7.2116405,7.0332469 0 0 0 1.28125,2 L 32.375,54.34375 14.1875,24.6875 46.53125,23.84375 z M 31.625,27.25 a 7.2116405,7.0332469 0 0 0 -7,6.75 7.2116405,7.0332469 0 1 0 14.40625,0.5625 A 7.2116405,7.0332469 0 0 0 31.625,27.25 z"
-     id="path4486"
-     style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+     transform="matrix(-0.027425,-1.1715668,1.1535604,-0.02611723,17.601696,50.034992)"
+     style="fill:none;stroke:#2e3436;stroke-width:6.87972689;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     inkscape:transform-center-x="2.6867498"
+     inkscape:transform-center-y="-0.57856054"
+     d="M 30.000002,34 -7.0537788,11.447042 30.965741,-9.3211076 z"
+     id="path3002"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
   <g
-     id="g4474">
-    <path
-       d="M 51.125,14.15625 7.71875,15.3125 A 2.50025,2.50025 0 0 0 5.65625,19.125 L 28.375,56.15625 a 2.50025,2.50025 0 0 0 4.3125,-0.125 L 53.40625,17.84375 A 2.50025,2.50025 0 0 0 51.125,14.15625 z m -4.1875,5.125 -16.5625,30.5625 -18.1875,-29.65625 34.75,-0.90625 z"
-       id="path3960"
-       style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.847;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+     transform="translate(19.005735,-23.005445)"
+     id="g3827-1-3-4">
     <g
-       id="g3904">
-      <g
-         transform="matrix(0.99742747,0,0,0.97275418,11.139278,-982.6724)"
-         id="g3038">
-        <path
-           d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-           transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-           id="path3040"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-           transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-           id="path3042"
-           style="fill:url(#radialGradient3902);fill-opacity:1;stroke:none" />
-      </g>
-      <g
-         transform="matrix(0.99742747,0,0,0.97275418,32.514946,-995.79158)"
-         id="g3044">
-        <path
-           d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-           transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-           id="path3046"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z"
-           transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-           id="path3048"
-           style="fill:url(#radialGradient3900);fill-opacity:1;stroke:none" />
-      </g>
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
+  </g>
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     inkscape:transform-center-x="2.6867498"
+     inkscape:transform-center-y="-0.57856054"
+     d="M 55.999999,14 31,58 6.0000001,14 z"
+     id="path3002-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     inkscape:transform-center-x="2.7942188"
+     inkscape:transform-center-y="-0.60485719"
+     d="m 6,13 50,0"
+     id="path3002-3-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#ffffff;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     inkscape:transform-center-x="2.4718089"
+     inkscape:transform-center-y="-0.5391118"
+     d="M 53,17 31.000001,56 9,17"
+     id="path3002-3-6-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <g
+     transform="translate(40.005735,-36)"
+     id="g3827-1-3">
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle_Constr.svg
index 234b9296a4..6721eb6522 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle_Constr.svg
@@ -14,8 +14,8 @@
    width="64"
    height="64"
    id="svg2"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_CreateTriangle_Constr.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateTriangle.svg">
   <sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -26,16 +26,26 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     id="namedview47"
-     showgrid="false"
-     inkscape:zoom="11.494629"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:window-height="1137"
+     id="namedview38"
+     showgrid="true"
+     inkscape:zoom="13.668775"
+     inkscape:cx="20.906428"
+     inkscape:cy="33.647499"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
+     inkscape:current-layer="svg2"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3015"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
@@ -240,86 +250,46 @@
        xlink:href="#linearGradient3144"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4502"
-       xlink:href="#linearGradient3144"
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4504"
-       xlink:href="#linearGradient3144"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4514"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4516"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4524"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4527"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.12943197,0.07094777,-0.05081613,-0.08817552,115.30612,62.485709)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4530"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
-    <radialGradient
-       cx="225.26402"
-       cy="672.79736"
-       r="34.345188"
-       fx="225.26402"
-       fy="672.79736"
-       id="radialGradient4533"
-       xlink:href="#linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.12943197,0.07094777,-0.05081613,-0.08817552,93.930453,75.604887)" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
   </defs>
   <metadata
      id="metadata7">
@@ -334,47 +304,72 @@
     </rdf:RDF>
   </metadata>
   <path
-     d="m 53,14.125 a 7.2116405,7.0332469 0 0 0 -6.59375,4.71875 L 9.71875,19.8125 A 2.50025,2.50025 0 0 0 7.65625,23.625 L 30.375,60.65625 a 2.50025,2.50025 0 0 0 4.3125,-0.125 L 52.28125,28.125 a 7.2116405,7.0332469 0 0 0 8.125,-6.6875 A 7.2116405,7.0332469 0 0 0 53,14.125 z m -6.46875,9.71875 a 7.2116405,7.0332469 0 0 0 1.28125,2 L 32.375,54.34375 14.1875,24.6875 46.53125,23.84375 z M 31.625,27.25 a 7.2116405,7.0332469 0 0 0 -7,6.75 7.2116405,7.0332469 0 1 0 14.40625,0.5625 A 7.2116405,7.0332469 0 0 0 31.625,27.25 z"
-     id="path4486"
-     style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  <path
+     transform="matrix(-0.027425,-1.1715668,1.1535604,-0.02611723,17.601696,50.034992)"
+     style="fill:none;stroke:#0b1521;stroke-width:6.87972688999999971;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     inkscape:transform-center-x="2.6867498"
+     inkscape:transform-center-y="-0.57856054"
+     d="M 30.000002,34 -7.0537788,11.447042 30.965741,-9.3211076 z"
+     id="path3002"
      inkscape:connector-curvature="0"
-     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;stroke:#000000;stroke-width:0.847;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
-     id="path3960"
-     d="M 51.125,14.15625 7.71875,15.3125 A 2.50025,2.50025 0 0 0 5.65625,19.125 L 28.375,56.15625 a 2.50025,2.50025 0 0 0 4.3125,-0.125 L 53.40625,17.84375 A 2.50025,2.50025 0 0 0 51.125,14.15625 Z m -4.1875,5.125 -16.5625,30.5625 -18.1875,-29.65625 34.75,-0.90625 z" />
+     sodipodi:nodetypes="cccc" />
   <g
-     id="g3904">
+     transform="translate(19.005735,-23.005445)"
+     id="g3827-1-3-4">
     <g
-       id="g3038"
-       transform="matrix(0.99742747,0,0,0.97275418,11.139278,-982.6724)">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
       <path
          inkscape:connector-curvature="0"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3040"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:url(#radialGradient3902);fill-opacity:1;stroke:none"
-         id="path3042"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
+  </g>
+  <path
+     style="fill:none;stroke:#3465a4;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     inkscape:transform-center-x="2.6867498"
+     inkscape:transform-center-y="-0.57856054"
+     d="M 55.999999,14 31,58 6.0000001,14 z"
+     id="path3002-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     inkscape:transform-center-x="2.7942188"
+     inkscape:transform-center-y="-0.60485719"
+     d="m 6,13 50,0"
+     id="path3002-3-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#729fcf;stroke-width:1.99999988000000006;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+     inkscape:transform-center-x="2.4718089"
+     inkscape:transform-center-y="-0.5391118"
+     d="M 53,17 31.000001,56 9,17"
+     id="path3002-3-6-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <g
+     transform="translate(40.005735,-36)"
+     id="g3827-1-3">
     <g
-       id="g3044"
-       transform="matrix(0.99742747,0,0,0.97275418,32.514946,-995.79158)">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5">
       <path
          inkscape:connector-curvature="0"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3046"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z" />
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
          inkscape:connector-curvature="0"
-         style="fill:url(#radialGradient3900);fill-opacity:1;stroke:none"
-         id="path3048"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         d="m 259.60921,672.79736 a 34.34519,23.991124 0 1 1 -68.69038,0 34.34519,23.991124 0 1 1 68.69038,0 z" />
+         style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline.svg
index be7873673b..b3f913ff8b 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_Create_periodic_BSpline.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Create_Periodic_BSpline.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"
@@ -131,6 +131,201 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-2"
+       xlink:href="#linearGradient3836-9-3-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3171-7"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-9" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-7"
+       id="linearGradient3264-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
+       xlink:href="#linearGradient3836-9-3-6-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-4"
+       id="linearGradient3264-9"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-8" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148-2"
+       xlink:href="#linearGradient3836-9-3-6-4"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-1"
+       id="linearGradient3264-17"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-1">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148-27"
+       xlink:href="#linearGradient3836-9-3-6-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-2"
+       id="linearGradient3264-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148-6"
+       xlink:href="#linearGradient3836-9-3-6-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -140,18 +335,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="6.7933653"
-     inkscape:cx="-9.5103836"
-     inkscape:cy="38.19822"
-     inkscape:current-layer="g4470"
+     inkscape:cx="36.38966"
+     inkscape:cy="14.713889"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3058"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -169,320 +374,78 @@
      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
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,261.20436,241.80915)"
-         id="g5315">
-        <g
-           id="g5317">
-          <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="g5319" />
-          <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="g5321">
-            <g
-               id="g5323" />
-          </g>
-        </g>
-      </g>
-      <g
-         id="g5331"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,-10.571702,279.94155)">
-        <g
-           id="g5333">
-          <g
-             id="g5335"
-             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="g5337"
-             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
-               id="g5339" />
-          </g>
-        </g>
-      </g>
-      <g
-         id="g5347"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,25.136891,16.850747)">
-        <g
-           id="g5349">
-          <g
-             id="g5351"
-             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="g5353"
-             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
-               id="g5355" />
-          </g>
-        </g>
-      </g>
-      <g
-         id="g5365"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,307.8624,-30.362753)">
-        <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="g5367" />
-        <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="g5369">
-          <g
-             id="g5371">
-            <g
-               style="fill:#000000;fill-opacity:0.58431373;stroke:none"
-               id="g5414">
-              <circle
-                 r="48.57143"
-                 cy="655.2193"
-                 cx="197.14285"
-                 transform="translate(74.329242,-293.42364)"
-                 id="path5325"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;enable-background:accumulate" />
-              <circle
-                 r="48.57143"
-                 cy="655.2193"
-                 cx="197.14285"
-                 transform="translate(371.20238,-311.65501)"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;enable-background:accumulate"
-                 id="path5341" />
-              <circle
-                 r="48.57143"
-                 cy="655.2193"
-                 cx="197.14285"
-                 transform="translate(309.49729,-27.21133)"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;enable-background:accumulate"
-                 id="path5357" />
-              <circle
-                 r="48.57143"
-                 cy="655.2193"
-                 cx="197.14285"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;enable-background:accumulate"
-                 id="path5373" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <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.9680744,0.53235022,-0.12931811,-0.72812354,2190.7606,902.97673)"
-         id="g3177" />
-      <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.96615783,0.54254853,-0.14293457,-0.72055656,2035.4163,979.09945)"
-         id="g3185" />
-      <g
-         id="g3800"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,284.87108,728.04448)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <g
-                 id="g3868">
-                <circle
-                   id="path3792"
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   id="path3794"
-                   style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,12.087009,763.15288)"
-         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
-                 id="g3872">
-                <circle
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   id="path3029"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,331.04279,453.69421)"
-         id="g4638">
-        <g
-           id="g4640"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4642">
-            <g
-               id="g4644"
-               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="g4646"
-               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
-                 id="g4648">
-                <circle
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   id="path4650"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   style="fill:url(#radialGradient4654);fill-opacity:1;stroke:none"
-                   id="path4652"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,48.716226,501.24114)"
-         id="g4677">
-        <g
-           id="g4679"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4681">
-            <g
-               id="g4683"
-               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="g4685"
-               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
-                 id="g4687">
-                <circle
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   id="path4689"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   style="fill:url(#radialGradient4693);fill-opacity:1;stroke:none"
-                   id="path4691"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g4262"
-         transform="translate(-7.0559795,16.127953)">
-        <path
-           sodipodi:nodetypes="csscccccccscc"
-           style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           d="m 1720.3568,529.3341 c -93.6953,51.11706 -114.5906,59.44762 -103.7241,136.07676 10.8665,76.62917 74.7001,59.12737 144.0013,28.77559 33.8061,-14.80602 54.6949,-11.2278 79.648,-52.69574 35.9819,-25.79027 48.9261,-50.87621 42.2693,-77.54154 -13.385,-73.82763 -3.7717,-142.04651 -102.5486,-89.85194 z m 84.8324,-23.21758 c 25.8382,-29.78677 33.9448,1.37887 36.1194,38.07815 -0.5297,92.0082 -14.1437,37.43394 -59.4047,80.75861 -79.1101,45.45325 -106.0577,78.99261 -118.636,18.17476 -13.7596,-66.52973 37.4393,-21.66048 95.9357,-82.43243 z"
-           id="path4425-6-7"
-           inkscape:connector-curvature="0" />
-        <path
-           sodipodi:nodetypes="csscccccccscc"
-           style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.28941298;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           d="m 1708.2936,519.94559 c -93.6953,51.11706 -114.5906,59.44762 -103.7241,136.07676 10.8665,76.62917 74.7001,59.12737 144.0013,28.77559 33.8061,-14.80602 54.6949,-11.2278 79.648,-52.69574 35.9819,-25.79027 48.9261,-50.87621 42.2693,-77.54154 -13.385,-73.82763 -3.7717,-142.04651 -102.5486,-89.85194 z m 84.8324,-23.21758 c 25.8382,-29.78677 33.9448,1.37887 36.1194,38.07815 -0.5297,92.0082 -14.1437,37.43394 -59.4047,80.75861 -79.1101,45.45325 -106.0577,78.99261 -118.636,18.17476 -13.7596,-66.52973 37.4393,-21.66048 95.9357,-82.43243 z"
-           id="path4425-6"
-           inkscape:connector-curvature="0" />
-      </g>
+       id="g3797-7-2-3"
+       transform="matrix(0.80022917,0,0,0.80021784,25.46442,44.851557)">
+      <path
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+         id="path4250-6-9-5"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -24.310395,7.1675632 a 6.5606921,6.5607986 0 1 1 9.966243,8.5350468 6.5606921,6.5607986 0 0 1 -9.966243,-8.5350468 z"
+         id="path4250-7-0-1-6"
+         style="fill:url(#linearGradient3148);fill-opacity:1;stroke:#ef2929;stroke-width:1.87449825;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
     </g>
+    <g
+       id="g3797-7-2-3-4"
+       transform="matrix(0.80022917,0,0,0.80021784,65.46443,38.851563)">
+      <path
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+         id="path4250-6-9-5-5"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -24.310395,7.1675632 a 6.5606921,6.5607986 0 1 1 9.966243,8.5350468 6.5606921,6.5607986 0 0 1 -9.966243,-8.5350468 z"
+         id="path4250-7-0-1-6-5"
+         style="fill:url(#linearGradient3148-2);fill-opacity:1;stroke:#ef2929;stroke-width:1.87449825;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g3797-7-2-3-61"
+       transform="matrix(0.80022917,0,0,0.80021784,69.46444,0.85155725)">
+      <path
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+         id="path4250-6-9-5-4"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -24.310395,7.1675632 a 6.5606921,6.5607986 0 1 1 9.966243,8.5350468 6.5606921,6.5607986 0 0 1 -9.966243,-8.5350468 z"
+         id="path4250-7-0-1-6-2"
+         style="fill:url(#linearGradient3148-27);fill-opacity:1;stroke:#ef2929;stroke-width:1.87449825;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g3797-7-2-3-8"
+       transform="matrix(0.80022917,0,0,0.80021784,29.46443,6.8515633)">
+      <path
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+         id="path4250-6-9-5-57"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -24.310395,7.1675632 a 6.5606921,6.5607986 0 1 1 9.966243,8.5350468 6.5606921,6.5607986 0 0 1 -9.966243,-8.5350468 z"
+         id="path4250-7-0-1-6-6"
+         style="fill:url(#linearGradient3148-6);fill-opacity:1;stroke:#ef2929;stroke-width:1.87449825;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18.03683,43.097253 C 7.277747,32.892933 20.57411,32.375692 26.13296,26.610578 31.69181,20.845465 40.2819,7.5075263 43.65006,17.778432 47.01821,28.049338 52.82174,28.55336 40.5588,36.914749 28.29587,45.276138 28.79591,53.301572 18.03683,43.097253 z"
+       id="path3234"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zzzzz" />
+    <path
+       style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18.03683,43.097253 C 7.277747,32.892933 20.57411,32.375692 26.13296,26.610578 31.69181,20.845465 40.2819,7.5075265 43.65006,17.778432 47.01821,28.049338 52.82174,28.55336 40.5588,36.914749 28.29587,45.276138 28.79591,53.301572 18.03683,43.097253 z"
+       id="path3234-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zzzzz" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2.05327535;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18.491345,42.043833 C 7.133576,31.855558 20.48062,31.367001 25.88039,25.610953 31.28016,19.854905 40.17426,6.3907366 44.24134,17.056613 48.30842,27.72249 52.29783,27.799354 40.64055,35.742789 28.98327,43.686224 29.84911,52.232107 18.491345,42.043833 z"
+       id="path3234-1-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zzzzz" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline_Constr.svg
index 851eed083a..72893f5749 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline_Constr.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_Create_Periodic_BSpline_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Create_Periodic_BSpline.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"
@@ -131,6 +131,201 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-2"
+       xlink:href="#linearGradient3836-9-3-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3171-7"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-9" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-7"
+       id="linearGradient3264-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148"
+       xlink:href="#linearGradient3836-9-3-6-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-4"
+       id="linearGradient3264-9"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-8" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148-2"
+       xlink:href="#linearGradient3836-9-3-6-4"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-1"
+       id="linearGradient3264-17"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-1">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148-27"
+       xlink:href="#linearGradient3836-9-3-6-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6-2"
+       id="linearGradient3264-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.93724177,0,0,0.93725692,-1.2227671,0.70650014)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3148-6"
+       xlink:href="#linearGradient3836-9-3-6-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -139,19 +334,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.486915"
-     inkscape:cx="68.109637"
-     inkscape:cy="7.3544134"
-     inkscape:current-layer="g4470"
+     inkscape:zoom="9.6072693"
+     inkscape:cx="36.811827"
+     inkscape:cy="31.653007"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3058"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -169,316 +374,78 @@
      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
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,261.20436,241.80915)"
-         id="g5315">
-        <g
-           id="g5317">
-          <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="g5319" />
-          <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="g5321">
-            <g
-               id="g5323" />
-          </g>
-        </g>
-      </g>
-      <g
-         id="g5331"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,-10.571702,279.94155)">
-        <g
-           id="g5333">
-          <g
-             id="g5335"
-             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="g5337"
-             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
-               id="g5339" />
-          </g>
-        </g>
-      </g>
-      <g
-         id="g5347"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,25.136891,16.850747)">
-        <g
-           id="g5349">
-          <g
-             id="g5351"
-             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="g5353"
-             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
-               id="g5355" />
-          </g>
-        </g>
-      </g>
-      <g
-         id="g5365"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,307.8624,-30.362753)">
-        <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="g5367" />
-        <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="g5369">
-          <g
-             id="g5371">
-            <g
-               style="fill:#000000;fill-opacity:0.58431373;stroke:none"
-               id="g5414">
-              <circle
-                 r="48.57143"
-                 cy="655.2193"
-                 cx="197.14285"
-                 transform="translate(74.329242,-293.42364)"
-                 id="path5325"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;enable-background:accumulate" />
-              <circle
-                 r="48.57143"
-                 cy="655.2193"
-                 cx="197.14285"
-                 transform="translate(371.20238,-311.65501)"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;enable-background:accumulate"
-                 id="path5341" />
-              <circle
-                 r="48.57143"
-                 cy="655.2193"
-                 cx="197.14285"
-                 transform="translate(309.49729,-27.21133)"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;enable-background:accumulate"
-                 id="path5357" />
-              <circle
-                 r="48.57143"
-                 cy="655.2193"
-                 cx="197.14285"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:6.34382486;marker:none;enable-background:accumulate"
-                 id="path5373" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <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.9680744,0.53235022,-0.12931811,-0.72812354,2190.7606,902.97673)"
-         id="g3177" />
-      <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.96615783,0.54254853,-0.14293457,-0.72055656,2035.4163,979.09945)"
-         id="g3185" />
-      <g
-         id="g3800"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,284.87108,728.04448)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <g
-                 id="g3868">
-                <circle
-                   id="path3792"
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   id="path3794"
-                   style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,12.087009,763.15288)"
-         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
-                 id="g3872">
-                <circle
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   id="path3029"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,331.04279,453.69421)"
-         id="g4638">
-        <g
-           id="g4640"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4642">
-            <g
-               id="g4644"
-               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="g4646"
-               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
-                 id="g4648">
-                <circle
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   id="path4650"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   style="fill:url(#radialGradient4654);fill-opacity:1;stroke:none"
-                   id="path4652"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,48.716226,501.24114)"
-         id="g4677">
-        <g
-           id="g4679"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4681">
-            <g
-               id="g4683"
-               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="g4685"
-               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
-                 id="g4687">
-                <circle
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   id="path4689"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   style="fill:url(#radialGradient4693);fill-opacity:1;stroke:none"
-                   id="path4691"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
+       id="g3797-7-2-3"
+       transform="matrix(0.80022917,0,0,0.80021784,25.46442,44.851557)">
       <path
-         inkscape:connector-curvature="0"
-         id="path4425-6-7"
-         d="m 1713.3008,545.46205 c -93.6953,51.11706 -114.5906,59.44762 -103.7241,136.07676 10.8665,76.62917 74.7001,59.12737 144.0013,28.77559 33.8061,-14.80602 54.6949,-11.2278 79.648,-52.69574 35.9819,-25.79027 48.9261,-50.87621 42.2693,-77.54154 -13.385,-73.82763 -3.7717,-142.04651 -102.5486,-89.85194 z m 84.8324,-23.21758 c 25.8382,-29.78677 33.9448,1.37887 36.1194,38.07815 -0.5297,92.0082 -14.1437,37.43394 -59.4047,80.75861 -79.1101,45.45325 -106.0577,78.99261 -118.636,18.17476 -13.7596,-66.52973 37.4393,-21.66048 95.9357,-82.43243 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="csscccccccscc" />
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+         id="path4250-6-9-5"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
       <path
-         inkscape:connector-curvature="0"
-         id="path4425-6"
-         d="m 1701.2376,536.07354 c -93.6953,51.11706 -114.5906,59.44762 -103.7241,136.07676 10.8665,76.62917 74.7001,59.12737 144.0013,28.77559 33.8061,-14.80602 54.6949,-11.2278 79.648,-52.69574 35.9819,-25.79027 48.9261,-50.87621 42.2693,-77.54154 -13.385,-73.82763 -3.7717,-142.04651 -102.5486,-89.85194 z m 84.8324,-23.21758 c 25.8382,-29.78677 33.9448,1.37887 36.1194,38.07815 -0.5297,92.0082 -14.1437,37.43394 -59.4047,80.75861 -79.1101,45.45325 -106.0577,78.99261 -118.636,18.17476 -13.7596,-66.52973 37.4393,-21.66048 95.9357,-82.43243 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.28941298;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="csscccccccscc" />
+         d="m -24.310395,7.1675632 a 6.5606921,6.5607986 0 1 1 9.966243,8.5350468 6.5606921,6.5607986 0 0 1 -9.966243,-8.5350468 z"
+         id="path4250-7-0-1-6"
+         style="fill:url(#linearGradient3148);fill-opacity:1;stroke:#ef2929;stroke-width:1.87449825;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
     </g>
+    <g
+       id="g3797-7-2-3-4"
+       transform="matrix(0.80022917,0,0,0.80021784,65.46443,38.851563)">
+      <path
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+         id="path4250-6-9-5-5"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -24.310395,7.1675632 a 6.5606921,6.5607986 0 1 1 9.966243,8.5350468 6.5606921,6.5607986 0 0 1 -9.966243,-8.5350468 z"
+         id="path4250-7-0-1-6-5"
+         style="fill:url(#linearGradient3148-2);fill-opacity:1;stroke:#ef2929;stroke-width:1.87449825;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g3797-7-2-3-61"
+       transform="matrix(0.80022917,0,0,0.80021784,69.46444,0.85155725)">
+      <path
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+         id="path4250-6-9-5-4"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -24.310395,7.1675632 a 6.5606921,6.5607986 0 1 1 9.966243,8.5350468 6.5606921,6.5607986 0 0 1 -9.966243,-8.5350468 z"
+         id="path4250-7-0-1-6-2"
+         style="fill:url(#linearGradient3148-27);fill-opacity:1;stroke:#ef2929;stroke-width:1.87449825;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g3797-7-2-3-8"
+       transform="matrix(0.80022917,0,0,0.80021784,29.46443,6.8515633)">
+      <path
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+         id="path4250-6-9-5-57"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+      <path
+         d="m -24.310395,7.1675632 a 6.5606921,6.5607986 0 1 1 9.966243,8.5350468 6.5606921,6.5607986 0 0 1 -9.966243,-8.5350468 z"
+         id="path4250-7-0-1-6-6"
+         style="fill:url(#linearGradient3148-6);fill-opacity:1;stroke:#ef2929;stroke-width:1.87449825;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18.03683,43.097253 C 7.277747,32.892933 20.57411,32.375692 26.13296,26.610578 31.69181,20.845465 40.2819,7.5075263 43.65006,17.778432 47.01821,28.049338 52.82174,28.55336 40.5588,36.914749 28.29587,45.276138 28.79591,53.301572 18.03683,43.097253 z"
+       id="path3234"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zzzzz" />
+    <path
+       style="fill:none;stroke:#3465a4;stroke-width:4;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18.03683,43.097253 C 7.277747,32.892933 20.57411,32.375692 26.13296,26.610578 31.69181,20.845465 40.2819,7.5075265 43.65006,17.778432 47.01821,28.049338 52.82174,28.55336 40.5588,36.914749 28.29587,45.276138 28.79591,53.301572 18.03683,43.097253 z"
+       id="path3234-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zzzzz" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2.05327534999999980;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18.491345,42.043833 C 7.133576,31.855558 20.48062,31.367001 25.88039,25.610953 31.28016,19.854905 40.17426,6.3907366 44.24134,17.056613 48.30842,27.72249 52.29783,27.799354 40.64055,35.742789 28.98327,43.686224 29.84911,52.232107 18.491345,42.043833 z"
+       id="path3234-1-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zzzzz" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_DraftLine.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_DraftLine.svg
index 6e417fc5e3..548b708bd8 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_DraftLine.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_DraftLine.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -12,9 +13,10 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_DraftLine.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2728">
     <inkscape:perspective
@@ -32,17 +34,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.803388"
-     inkscape:cx="52.106799"
-     inkscape:cy="32.565624"
+     inkscape:zoom="6.9320421"
+     inkscape:cx="55.91978"
+     inkscape:cy="35.613295"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1092"
-     inkscape:window-height="722"
-     inkscape:window-x="69"
-     inkscape:window-y="42" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2991"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -58,69 +69,69 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <rect
-       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2417"
-       width="12.874425"
-       height="5.7095275"
-       x="-31.970634"
-       y="41.550884"
-       transform="matrix(0.6758378,-0.7370504,0.7370504,0.6758378,0,0)" />
-    <rect
-       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2419"
-       width="12.874425"
-       height="5.7095275"
-       x="-15.457787"
-       y="41.606861"
-       transform="matrix(0.6758378,-0.7370504,0.7370504,0.6758378,0,0)" />
-    <rect
-       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2421"
-       width="12.874425"
-       height="5.7095275"
-       x="0.6632368"
-       y="41.718811"
-       transform="matrix(0.6758378,-0.7370504,0.7370504,0.6758378,0,0)" />
-    <rect
-       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2423"
-       width="12.874425"
-       height="5.7095275"
-       x="16.56035"
-       y="41.606857"
-       transform="matrix(0.6758378,-0.7370504,0.7370504,0.6758378,0,0)" />
-    <rect
-       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2425"
-       width="12.874425"
-       height="5.7095275"
-       x="-29.875095"
-       y="50.469898"
-       transform="matrix(0.6758378,-0.7370504,0.7370504,0.6758378,0,0)" />
-    <rect
-       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2427"
-       width="12.874425"
-       height="5.7095275"
-       x="-13.362247"
-       y="50.525875"
-       transform="matrix(0.6758378,-0.7370504,0.7370504,0.6758378,0,0)" />
-    <rect
-       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2429"
-       width="12.874425"
-       height="5.7095275"
-       x="2.7587762"
-       y="50.637821"
-       transform="matrix(0.6758378,-0.7370504,0.7370504,0.6758378,0,0)" />
-    <rect
-       style="fill:#323232;fill-opacity:1;fill-rule:evenodd;stroke:#323232;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       id="rect2431"
-       width="12.874425"
-       height="5.7095275"
-       x="18.65589"
-       y="50.525867"
-       transform="matrix(0.6758378,-0.7370504,0.7370504,0.6758378,0,0)" />
+    <g
+       id="g2997"
+       transform="matrix(0.66666664,0.66666665,-0.66666664,0.66666665,7.000002,-38.999999)">
+      <rect
+         y="3"
+         x="69"
+         height="12"
+         width="6"
+         id="rect2993"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2995"
+         d="m 71,4 0,10"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g2997-1"
+       transform="matrix(0.66666664,0.66666665,-0.66666664,0.66666665,-4.999998,-26.999999)">
+      <rect
+         y="3"
+         x="69"
+         height="12"
+         width="6"
+         id="rect2993-7"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2995-4"
+         d="m 71,4 0,10"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g2997-0"
+       transform="matrix(0.66666664,0.66666665,-0.66666664,0.66666665,-16.999998,-14.999999)">
+      <rect
+         y="3"
+         x="69"
+         height="12"
+         width="6"
+         id="rect2993-9"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2995-48"
+         d="m 71,4 0,10"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g2997-0-8"
+       transform="matrix(0.66666664,0.66666665,-0.66666664,0.66666665,-28.999998,-2.9999988)">
+      <rect
+         y="3"
+         x="69"
+         height="12"
+         width="6"
+         id="rect2993-9-2"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path2995-48-4"
+         d="m 71,4 0,10"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_EditSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_EditSketch.svg
index 2e92cb42eb..b7b1265d4b 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_EditSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_EditSketch.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.0 r9654"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_LeaveSketch.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -175,6 +175,47 @@
          offset="1"
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.93570344,0.35278756,-0.35278756,0.93570344,13.795598,-24.167017)"
+       y2="44"
+       x2="48"
+       y1="22"
+       x1="43"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3023"
+       xlink:href="#linearGradient3895"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </linearGradient>
+    <linearGradient
+       y2="44"
+       x2="48"
+       y1="22"
+       x1="43"
+       gradientTransform="matrix(0.00239211,0.99999714,-0.99999714,0.00239211,-0.10300017,-24.117089)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3895"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895"
+       id="linearGradient3837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.00239211,0.99999714,-0.99999714,0.00239211,-0.10300017,-24.117089)"
+       x1="25.976294"
+       y1="34.916225"
+       x2="53.988174"
+       y2="29.983219" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -183,18 +224,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.046875"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="16.09375"
+     inkscape:cx="33.594611"
+     inkscape:cy="42.542123"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1092"
-     inkscape:window-height="722"
-     inkscape:window-x="69"
-     inkscape:window-y="42"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3018"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -211,68 +260,59 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <g
-       inkscape:label="Layer 1"
-       id="g3363"
-       transform="matrix(-0.4354254,0,0,-0.6347203,47.20712,47.435633)">
-      <g
-         transform="matrix(0.1731146,0,0,0.1731146,-635.22048,-168.53671)"
-         inkscape:export-ydpi="8.71"
-         inkscape:export-xdpi="8.71"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/upgrade.png"
-         id="g3853">
-        <path
-           style="opacity:0.60792954;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 3875.9311,1028.0961 -149.5,155.5625 84.8437,0 0,139.4063 127.2813,0 0,-139.4063 76.7813,0 -139.4063,-155.5625 z"
-           id="path3849"
-           inkscape:connector-curvature="0" />
-        <path
-           style="fill:url(#linearGradient3847);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 3848.6875,999.84375 -149.5,155.56245 84.8437,0 0,139.4063 127.2813,0 0,-139.4063 76.7813,0 -139.4063,-155.56245 z"
-           id="rect3066"
-           inkscape:connector-curvature="0" />
-      </g>
-    </g>
     <g
        inkscape:label="Layer 1"
        id="g3436"
        transform="translate(107.50353,10.589633)" />
-    <rect
-       style="fill:#323232;fill-opacity:1;stroke:#323232;stroke-width:0.99242818;stroke-opacity:1"
-       id="rect3450"
-       width="13.890088"
-       height="3.7927058"
-       x="7.0579472"
-       y="34.724739" />
-    <rect
-       style="fill:#323232;fill-opacity:1;stroke:#323232;stroke-opacity:1"
-       id="rect3452"
-       width="14.13106"
-       height="3.7851338"
-       x="44.159561"
-       y="34.854675" />
-    <rect
-       style="fill:#323232;fill-opacity:1;stroke:#323232;stroke-width:1.70863736;stroke-opacity:1"
-       id="rect3454"
-       width="50.757404"
-       height="3.0764964"
-       x="7.1788988"
-       y="55.143879" />
-    <rect
-       style="fill:#323232;fill-opacity:1;stroke:#323232;stroke-width:1.05181527;stroke-opacity:1"
-       id="rect3456"
-       width="15.839073"
-       height="3.7359855"
-       x="38.737869"
-       y="-58.021709"
-       transform="matrix(2.5335968e-3,0.9999968,-0.9999995,-1.0227786e-3,0,0)" />
-    <rect
-       style="fill:#323232;fill-opacity:1;stroke:#323232;stroke-width:1.05181527;stroke-opacity:1"
-       id="rect3458"
-       width="15.839075"
-       height="3.7359855"
-       x="38.110561"
-       y="-10.813628"
-       transform="matrix(-2.4670029e-3,0.999997,-0.9999819,-6.0233492e-3,0,0)" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18,36 6,36 6,58 58,58 58,36 46,36"
+       id="path3020"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18,36 6,36 6,58 58,58 58,36 46,36"
+       id="path3020-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18,35 5,35 5,58"
+       id="path3808"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 9,57 48,0 0,-18"
+       id="path3810"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 46,35 13,0"
+       id="path3812"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g3833"
+       transform="translate(63.956988,4.057347)">
+      <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 -14.956988,18.942653 -10,0 10e-7,-20 -14.000001,0 0,20 -10,0 17,18 z"
+         style="fill:url(#linearGradient3837);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 -19.638282,20.942653 -7.318706,0 -1e-6,-20 -9.999999,0 0,20 -7.395261,0 12.395261,13 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>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_Edge.svg
index c652db87c4..fb52144239 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_Edge.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Arc_Edge.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Arc_MidPoint.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
@@ -72,83 +72,124 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2877" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4534"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3801"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4536"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3801-7"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4538"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3591"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3801-7-5"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3593"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3801-7-2"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3595"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        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="radialGradient3128"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3082-3"
+       xlink:href="#linearGradient3836-9-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -157,18 +198,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="5.4554179"
-     inkscape:cy="31.348642"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="8.7726691"
+     inkscape:cx="39.043696"
+     inkscape:cy="32.943036"
+     inkscape:current-layer="g3389-6"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     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="grid3002"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -177,7 +226,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -186,90 +235,74 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g3130">
+       id="g3401-3"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+       inkscape:export-xdpi="6.7480335"
+       inkscape:export-ydpi="6.7480335"
+       transform="matrix(0.146567,0,0,0.146567,94.1836,-69.115448)">
+      <g
+         id="g3389-6"
+         style="stroke:#172a04">
+        <path
+           style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:13.64563655999999980;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+           id="path2380-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsccsc" />
+        <path
+           style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 10.999999,13 C 32,13 49,32 49,48"
+           id="path3892"
+           inkscape:connector-curvature="0"
+           transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+           sodipodi:nodetypes="cc" />
+      </g>
+    </g>
+    <g
+       transform="translate(38,0)"
+       id="g3827-0">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-7-2">
       <path
          inkscape:connector-curvature="0"
-         id="path2380"
-         d="m 11.834937,11.244936 0,4.694725 c 20.78437,0.15052 37.603596,16.223506 37.603596,36.00968 0,0.02271 3.8e-5,0.04244 0,0.06412 l 4.690144,0.0458 c 0.0015,-0.141997 0,-0.261059 0,-0.403059 0,-22.306658 -18.946877,-40.411269 -42.29374,-40.411271 z"
-         style="fill:#008900;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.85008866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         inkscape:export-ydpi="7.0721951"
-         inkscape:export-xdpi="7.0721951"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,43.790279,145.39527)"
-         id="g2331">
-        <path
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path2333"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3128);fill-opacity:1;stroke:none"
-           id="path2335"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-      </g>
-      <g
-         inkscape:export-ydpi="7.0721951"
-         inkscape:export-xdpi="7.0721951"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-         transform="matrix(-0.14652919,-0.00332905,0.00332905,-0.14652919,38.70443,109.64947)"
-         id="g2337">
-        <path
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path2339"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3593);fill-opacity:1;stroke:none"
-           id="path2341"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-      </g>
-      <g
-         inkscape:export-ydpi="7.0721951"
-         inkscape:export-xdpi="7.0721951"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,83.947509,145.94072)"
-         id="g2372">
-        <path
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path2374"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3595);fill-opacity:1;stroke:none"
-           id="path2376"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-      </g>
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
+    <g
+       transform="translate(31.322131,2.570289)"
+       id="g3797-7-6">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-0"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-6"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_EndPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_EndPoint.svg
index 2bbf29df73..d4d1a5f8a8 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_EndPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_EndPoint.svg
@@ -14,12 +14,34 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Arc_EndPoint.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Arc_StartingPoint.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2871">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient2378"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient2368"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -32,6 +54,17 @@
          offset="1"
          id="stop3148" />
     </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -39,72 +72,124 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2877" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5114"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3801"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5118"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3801-7"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5130"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3112"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3801-7-5"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3114"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3801-7-2"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3116"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3082-3"
+       xlink:href="#linearGradient3836-9-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -113,18 +198,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="33.546327"
-     inkscape:cy="31.348642"
+     inkscape:zoom="49.625711"
+     inkscape:cx="42.024858"
+     inkscape:cy="6.9695931"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     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="grid3002"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -133,7 +226,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -142,79 +235,73 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g3102"
-       transform="translate(0.90909091,1.6363636)">
+       id="g3401-3"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+       inkscape:export-xdpi="6.7480335"
+       inkscape:export-ydpi="6.7480335"
+       transform="matrix(0.146567,0,0,0.146567,94.1836,-69.115448)">
+      <g
+         id="g3389-6">
+        <path
+           style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+           id="path2380-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsccsc" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 10.999999,13 C 32,13 49,32 49,48"
+           id="path3892"
+           inkscape:connector-curvature="0"
+           transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+           sodipodi:nodetypes="cc" />
+      </g>
+    </g>
+    <g
+       transform="translate(38,0)"
+       id="g3827-0">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#172a04;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-7-2">
       <path
          inkscape:connector-curvature="0"
-         id="path2380"
-         d="m 10.016755,9.7903906 0,4.6947244 c 20.78437,0.15052 37.603596,16.223507 37.603596,36.00968 0,0.02271 3.8e-5,0.04244 0,0.06412 l 4.690144,0.0458 c 0.0015,-0.141997 0,-0.261059 0,-0.403059 0,-22.306658 -18.946877,-40.411269 -42.29374,-40.4112704 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.85008866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         inkscape:export-ydpi="7.0721951"
-         inkscape:export-xdpi="7.0721951"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,41.790278,144.30435)"
-         id="g2331">
-        <path
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path2333"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3112);fill-opacity:1;stroke:none"
-           id="path2335"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-      </g>
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         transform="matrix(-0.14652919,-0.00332905,0.00332905,-0.14652919,36.886248,108.19492)"
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2339"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
+    <g
+       transform="translate(31.322131,2.570289)"
+       id="g3797-7-6">
       <path
-         transform="matrix(-0.12648731,0.07404623,-0.07404623,-0.12648731,87.228293,77.936891)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2341"
-         style="fill:url(#radialGradient3114);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-0"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,82.129327,144.48617)"
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2374"
-         style="fill:#008900;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.12266988,0.08021211,-0.08021211,-0.12266988,130.91308,111.77508)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2376"
-         style="fill:url(#radialGradient3116);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-6"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_MidPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_MidPoint.svg
index f6f6f0790b..3f6a784b5d 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_MidPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_MidPoint.svg
@@ -14,12 +14,45 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Arc_MidPoint.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Arc_EndPoint.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2871">
+    <linearGradient
+       id="linearGradient3123">
+      <stop
+         id="stop3125"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3127"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient2378"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient2368"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -32,6 +65,17 @@
          offset="1"
          id="stop3148" />
     </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient2370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -39,72 +83,124 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2877" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5114"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3801"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5118"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3801-7"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5130"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3096"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3801-7-5"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3123"
+       inkscape:collect="always" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3098"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3801-7-2"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3100"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3082-3"
+       xlink:href="#linearGradient3836-9-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -113,18 +209,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="33.546327"
-     inkscape:cy="31.348642"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="24.812855"
+     inkscape:cx="7.1555682"
+     inkscape:cy="11.118033"
+     inkscape:current-layer="g3797-7-2"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     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="grid3002"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -133,7 +237,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -142,73 +246,73 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g3087"
-       transform="translate(1.8181818,1.8181818)">
+       id="g3401-3"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+       inkscape:export-xdpi="6.7480335"
+       inkscape:export-ydpi="6.7480335"
+       transform="matrix(0.146567,0,0,0.146567,94.1836,-69.115448)">
+      <g
+         id="g3389-6">
+        <path
+           style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+           id="path2380-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsccsc" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 10.999999,13 C 32,13 49,32 49,48"
+           id="path3892"
+           inkscape:connector-curvature="0"
+           transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+           sodipodi:nodetypes="cc" />
+      </g>
+    </g>
+    <g
+       transform="translate(38,0)"
+       id="g3827-0">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-7-2">
       <path
          inkscape:connector-curvature="0"
-         id="path2380"
-         d="m 10.016755,9.7903906 0,4.6947244 c 20.78437,0.15052 37.603596,16.223507 37.603596,36.00968 0,0.02271 3.8e-5,0.04244 0,0.06412 l 4.690144,0.0458 c 0.0015,-0.141997 0,-0.261059 0,-0.403059 0,-22.306658 -18.946877,-40.411269 -42.29374,-40.4112704 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.85008866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="fill:none;stroke:#172a04;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,41.426642,144.48617)"
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2333"
-         style="fill:#008900;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
+    <g
+       transform="translate(31.322131,2.570289)"
+       id="g3797-7-6">
       <path
-         transform="matrix(-0.12266988,0.08021211,-0.08021211,-0.12266988,90.210392,111.77508)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2335"
-         style="fill:url(#radialGradient3096);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-0"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         transform="matrix(-0.14652919,-0.00332905,0.00332905,-0.14652919,36.886248,108.19492)"
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2339"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.12648731,0.07404623,-0.07404623,-0.12648731,87.228293,77.936891)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2341"
-         style="fill:url(#radialGradient3098);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,82.129327,144.48617)"
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2374"
-         style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(-0.12266988,0.08021211,-0.08021211,-0.12266988,130.91308,111.77508)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2376"
-         style="fill:url(#radialGradient3100);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-6"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_StartingPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_StartingPoint.svg
index 0ddefbee82..ff977cf67f 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_StartingPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_StartingPoint.svg
@@ -14,12 +14,23 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Arc_StartingPoint.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateArc.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2871">
+    <linearGradient
+       id="linearGradient3026">
+      <stop
+         id="stop3028"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3030"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144"
@@ -72,83 +83,124 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2877" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5114"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3801"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5116"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3801-7"
        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
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5118"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5130"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3801-7-5"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3081"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3801-7-2"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3083"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        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="radialGradient3085"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3082-3"
+       xlink:href="#linearGradient3026"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -157,18 +209,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.5"
-     inkscape:cx="33.546327"
-     inkscape:cy="31.348642"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="8.7726691"
+     inkscape:cx="41.430642"
+     inkscape:cy="46.015892"
+     inkscape:current-layer="g3797-7-6"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     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="grid3002"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -177,7 +237,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -186,85 +246,73 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g3070"
-       transform="translate(2.1818182,1.8181818)">
+       id="g3401-3"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+       inkscape:export-xdpi="6.7480335"
+       inkscape:export-ydpi="6.7480335"
+       transform="matrix(0.146567,0,0,0.146567,94.1836,-69.115448)">
+      <g
+         id="g3389-6">
+        <path
+           style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:13.64563656;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+           id="path2380-7"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccsccsc" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 10.999999,13 C 32,13 49,32 49,48"
+           id="path3892"
+           inkscape:connector-curvature="0"
+           transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+           sodipodi:nodetypes="cc" />
+      </g>
+    </g>
+    <g
+       transform="translate(38,0)"
+       id="g3827-0">
+      <g
+         transform="translate(31.322131,40.570289)"
+         id="g3797-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3801-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       transform="translate(31.322131,40.570289)"
+       id="g3797-7-2">
       <path
          inkscape:connector-curvature="0"
-         id="path2380"
-         d="m 10.016755,9.7903906 0,4.6947244 c 20.78437,0.15052 37.603596,16.223507 37.603596,36.00968 0,0.02271 3.8e-5,0.04244 0,0.06412 l 4.690144,0.0458 c 0.0015,-0.141997 0,-0.261059 0,-0.403059 0,-22.306658 -18.946877,-40.411269 -42.29374,-40.4112704 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.85008866;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <g
-         inkscape:export-ydpi="7.0721951"
-         inkscape:export-xdpi="7.0721951"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,40.881187,144.48617)"
-         id="g2331">
-        <path
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path2333"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3081);fill-opacity:1;stroke:none"
-           id="path2335"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-      </g>
+         style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         transform="matrix(-0.14652919,-0.00332905,0.00332905,-0.14652919,36.886248,108.19492)"
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2339"
-         style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+    </g>
+    <g
+       transform="translate(31.322131,2.570289)"
+       id="g3797-7-6">
       <path
-         transform="matrix(-0.12648731,0.07404623,-0.07404623,-0.12648731,87.228293,77.936891)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2341"
-         style="fill:url(#radialGradient3083);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-      <g
-         inkscape:export-ydpi="7.0721951"
-         inkscape:export-xdpi="7.0721951"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
-         transform="matrix(-0.14651449,0.00392289,-0.00392289,-0.14651449,82.129327,144.48617)"
-         id="g2372">
-        <path
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-           id="path2374"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3085);fill-opacity:1;stroke:none"
-           id="path2376"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-      </g>
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#172a04;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-0"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3082-3);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-6"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_Edge.svg
index a8f5f66908..267e1f55ce 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_Edge.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Elements_BezierSpline_EdgePoint_3.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_BSpline_Edge.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"
@@ -98,17 +98,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3855"
-       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"
@@ -142,6 +131,104 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-3"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-2"
+       xlink:href="#linearGradient3836-9-3-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3171-7"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-9" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -150,19 +237,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="18.413181"
-     inkscape:cy="32"
-     inkscape:current-layer="g4470"
+     inkscape:zoom="11.424431"
+     inkscape:cx="29.864034"
+     inkscape:cy="18.795964"
+     inkscape:current-layer="g3194-6"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:window-width="960"
+     inkscape:window-height="1136"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3112"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -171,7 +268,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -185,210 +282,98 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path
+         style="fill:none;stroke:#172a04;stroke-width:54.78153992000000017;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1863.2773,467.6716 c -13.6954,260.21231 -260.2123,13.69538 -273.9077,273.90769"
+         id="path3266"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#73d216;stroke-width:27.39076996000000008;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1863.2773,467.6716 c -13.6954,260.21231 -260.2123,13.69538 -273.9077,273.90769"
+         id="path3266-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#8ae234;stroke-width:13.69538498000000004;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1856.4296,467.6716 c -13.6954,253.36462 -253.3646,0 -273.9077,273.90769"
+         id="path3266-9-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
-         id="g4428"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,37.992895,1047.7457)">
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.61715282;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 1521.5247,672.0155 c 44.4698,-329.6779 268.2395,178.19155 351.6186,-180.60429 l -43.3717,-44.41796 C 1772.4167,773.75587 1541.2639,252.3281 1477.1627,632.99171 z"
-           id="path4425"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g3177"
-           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="g3185"
-           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>
+         inkscape:export-ydpi="7.2934141"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         transform="matrix(-0.9680744,0.53235022,-0.12931811,-0.72812354,2190.7606,902.97673)"
+         id="g3177" />
       <g
-         id="g3800"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,274.7911,730.06047)">
+         inkscape:export-ydpi="7.2934141"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         transform="matrix(-0.96615783,0.54254853,-0.14293457,-0.72055656,2035.4163,979.09945)"
+         id="g3185" />
+      <g
+         id="g3194"
+         transform="translate(410.86155,0)">
         <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <g
-                 id="g3868">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2"
+           transform="matrix(6.8476923,0,0,6.8476923,1338.2504,416.75794)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1"
+             style="fill:url(#linearGradient3262);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           id="g3797-7-2-3"
+           transform="matrix(6.8476923,0,0,6.8476923,1310.8597,663.31215)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-5"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-6"
+             style="fill:url(#linearGradient3264);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
       </g>
       <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,3.0150412,768.19287)"
-         id="g3019">
+         transform="matrix(-1,0,0,-1,3041.8251,1222.9463)"
+         id="g3194-6">
         <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
-                 id="g3872">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2-0"
+           transform="matrix(-6.8476923,0,0,-6.8476923,1073.5871,587.02489)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-6"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-2"
+             style="fill:url(#linearGradient3131-2);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,38.723634,505.10207)"
-         id="g4638">
         <g
-           id="g4640"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4642">
-            <g
-               id="g4644"
-               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="g4646"
-               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
-                 id="g4648">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path4650"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient4654);fill-opacity:1;stroke:none"
-                   id="path4652"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,321.44914,457.88857)"
-         id="g4677">
-        <g
-           id="g4679"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4681">
-            <g
-               id="g4683"
-               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="g4685"
-               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
-                 id="g4687">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path4689"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient4693);fill-opacity:1;stroke:none"
-                   id="path4691"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2-3-6"
+           transform="matrix(-6.8476923,0,0,-6.8476923,1046.1964,833.5791)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-5-1"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-6-8"
+             style="fill:url(#linearGradient3171-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_EndPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_EndPoint.svg
index 14d2cf0833..82fb38a0f8 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_EndPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_EndPoint.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Elements_BezierSpline_EndPoint_3.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_BSpline_Edge.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"
@@ -98,17 +98,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3855"
-       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"
@@ -131,6 +120,115 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient4693"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-3"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-2"
+       xlink:href="#linearGradient3836-9-3-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-9">
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-1" />
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3171-7"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-0">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-9" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-6"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -139,19 +237,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="18.413181"
-     inkscape:cy="32"
+     inkscape:zoom="11.424431"
+     inkscape:cx="29.688971"
+     inkscape:cy="26.498754"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:window-width="960"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3112"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -174,210 +282,98 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1863.2773,467.6716 c -13.6954,260.21231 -260.2123,13.69538 -273.9077,273.90769"
+         id="path3266"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1863.2773,467.6716 c -13.6954,260.21231 -260.2123,13.69538 -273.9077,273.90769"
+         id="path3266-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1856.4296,467.6716 c -13.6954,253.36462 -253.3646,0 -273.9077,273.90769"
+         id="path3266-9-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
-         id="g4428"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,37.992895,1047.7457)">
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.61715269;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 1521.5247,672.0155 c 44.4698,-329.6779 268.2395,178.19155 351.6186,-180.60429 l -43.3717,-44.41796 C 1772.4167,773.75587 1541.2639,252.3281 1477.1627,632.99171 z"
-           id="path4425"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g3177"
-           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="g3185"
-           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>
+         inkscape:export-ydpi="7.2934141"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         transform="matrix(-0.9680744,0.53235022,-0.12931811,-0.72812354,2190.7606,902.97673)"
+         id="g3177" />
       <g
-         id="g3800"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,274.7911,730.06047)">
+         inkscape:export-ydpi="7.2934141"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         transform="matrix(-0.96615783,0.54254853,-0.14293457,-0.72055656,2035.4163,979.09945)"
+         id="g3185" />
+      <g
+         id="g3194"
+         transform="translate(410.86155,0)">
         <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <g
-                 id="g3868">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2"
+           transform="matrix(6.8476923,0,0,6.8476923,1338.2504,416.75794)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1"
+             style="fill:url(#linearGradient3262);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           id="g3797-7-2-3"
+           transform="matrix(6.8476923,0,0,6.8476923,1310.8597,663.31215)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-5"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-6"
+             style="fill:url(#linearGradient3264);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
       </g>
       <g
-         id="g3800-6"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,320.16151,461.95164)">
+         transform="matrix(-1,0,0,-1,3041.8251,1222.9463)"
+         id="g3194-6">
         <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="g3876">
-                <path
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792-8"
-                   style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794-5"
-                   style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2-0"
+           transform="matrix(6.8476923,0,0,6.8476923,1338.2504,430.45332)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-6"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-2"
+             style="fill:url(#linearGradient3131-2);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,4.6814,769.30377)"
-         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
-                 id="g3872">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,38.723634,505.10207)"
-         id="g4638">
-        <g
-           id="g4640"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4642">
-            <g
-               id="g4644"
-               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="g4646"
-               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
-                 id="g4648">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path4650"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient4654);fill-opacity:1;stroke:none"
-                   id="path4652"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2-3-6"
+           transform="matrix(6.8476923,0,0,6.8476923,1310.8597,677.00753)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-5-1"
+             style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-6-8"
+             style="fill:url(#linearGradient3171-7);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_StartPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_StartPoint.svg
index 2ba3d8b419..c4b3f51869 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_StartPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_StartPoint.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Elements_BezierSpline_StartPoint_3.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_BSpline_EndPoint.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"
@@ -23,6 +23,17 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs2920">
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -98,17 +109,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3855"
-       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"
@@ -142,6 +142,104 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3836-9-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-3"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3131-2"
+       xlink:href="#linearGradient3836-9-3-9"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-9">
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-1" />
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3171-7"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-6-0">
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-9" />
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -150,19 +248,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="18.413181"
-     inkscape:cy="32"
+     inkscape:zoom="11.424431"
+     inkscape:cx="29.688971"
+     inkscape:cy="26.498754"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:window-width="960"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3112"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -185,210 +293,98 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1863.2773,467.6716 c -13.6954,260.21231 -260.2123,13.69538 -273.9077,273.90769"
+         id="path3266"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1863.2773,467.6716 c -13.6954,260.21231 -260.2123,13.69538 -273.9077,273.90769"
+         id="path3266-9"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1856.4296,467.6716 c -13.6954,253.36462 -253.3646,0 -273.9077,273.90769"
+         id="path3266-9-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
-         id="g4428"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,37.992895,1047.7457)">
-        <path
-           sodipodi:nodetypes="ccccc"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.61715269;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 1521.5247,672.0155 c 44.4698,-329.6779 268.2395,178.19155 351.6186,-180.60429 l -43.3717,-44.41796 C 1772.4167,773.75587 1541.2639,252.3281 1477.1627,632.99171 z"
-           id="path4425"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g3177"
-           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="g3185"
-           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>
+         inkscape:export-ydpi="7.2934141"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         transform="matrix(-0.9680744,0.53235022,-0.12931811,-0.72812354,2190.7606,902.97673)"
+         id="g3177" />
       <g
-         id="g3800"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,274.7911,730.06047)">
+         inkscape:export-ydpi="7.2934141"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         transform="matrix(-0.96615783,0.54254853,-0.14293457,-0.72055656,2035.4163,979.09945)"
+         id="g3185" />
+      <g
+         id="g3194"
+         transform="translate(410.86155,0)">
         <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <g
-                 id="g3868">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2"
+           transform="matrix(6.8476923,0,0,6.8476923,1338.2504,416.75794)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9"
+             style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1"
+             style="fill:url(#linearGradient3262);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           id="g3797-7-2-3"
+           transform="matrix(6.8476923,0,0,6.8476923,1310.8597,663.31215)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-5"
+             style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-6"
+             style="fill:url(#linearGradient3264);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
       </g>
       <g
-         id="g3800-6"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,4.6642871,769.11707)">
+         transform="matrix(-1,0,0,-1,3041.8251,1222.9463)"
+         id="g3194-6">
         <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="g3876">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792-8"
-                   style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794-5"
-                   style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2-0"
+           transform="matrix(6.8476923,0,0,6.8476923,1338.2504,430.45332)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-6"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-2"
+             style="fill:url(#linearGradient3131-2);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,38.723634,505.10207)"
-         id="g4638">
         <g
-           id="g4640"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4642">
-            <g
-               id="g4644"
-               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="g4646"
-               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
-                 id="g4648">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path4650"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient4654);fill-opacity:1;stroke:none"
-                   id="path4652"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,321.44914,457.88857)"
-         id="g4677">
-        <g
-           id="g4679"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g4681">
-            <g
-               id="g4683"
-               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="g4685"
-               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
-                 id="g4687">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path4689"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient4693);fill-opacity:1;stroke:none"
-                   id="path4691"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
+           id="g3797-7-2-3-6"
+           transform="matrix(6.8476923,0,0,6.8476923,1310.8597,677.00753)">
+          <path
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z"
+             id="path4250-6-9-5-1"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
+          <path
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z"
+             id="path4250-7-0-1-6-8"
+             style="fill:url(#linearGradient3171-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             inkscape:connector-curvature="0" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_Edge.svg
index a637d699a2..6afbfdf696 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_Edge.svg
@@ -14,12 +14,23 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Circle_Edge.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Circle_MidPoint.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2920">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3191"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -32,17 +43,10 @@
          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" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144"
-       id="radialGradient5352"
+       id="radialGradient3183"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        cx="225.26402"
@@ -50,6 +54,115 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2926" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3892"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3892">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0"
+         id="stop3894" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1"
+         id="stop3896" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3850"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3850">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0"
+         id="stop3852" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1"
+         id="stop3854" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7-7"
+       id="linearGradient3801-1-1-6"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -58,19 +171,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.4999999"
-     inkscape:cx="-16.119015"
-     inkscape:cy="24.817835"
+     inkscape:zoom="8.772669"
+     inkscape:cx="30.315479"
+     inkscape:cy="31.143781"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false" />
+     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="grid2998"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -79,7 +199,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -93,31 +213,66 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1728.1295,430.0768 c -99.7853,0 -180.7813,80.99602 -180.7813,180.78125 0,99.78525 80.996,180.78125 180.7813,180.78125 99.7852,0 180.7811,-80.99599 180.7812,-180.78125 l -0.094,-4.96875 c -2.6923,-98.00357 -82.647,-175.8125 -180.6874,-175.8125 z m -1.4376,35.71875 c 78.671,-10e-6 142.8396,62.42122 145,141.0625 l 0.063,4 c 0,80.07098 -64.9916,145.0625 -145.0626,145.0625 -80.0709,10e-6 -145.0624,-64.99154 -145.0624,-145.0625 0,-80.07095 64.9915,-145.0625 145.0624,-145.0625 z"
-         style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3187"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1945.3705,1260.4139)" />
-      <path
-         transform="matrix(-0.83008233,0.55764075,-0.55764075,-0.83008233,2275.4114,1033.1093)"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path3189"
-         style="fill:url(#radialGradient5352);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+      <g
+         id="g4428" />
+      <g
+         transform="translate(5.1846337e-7,2.8784578e-6)"
+         id="g4428-3">
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#172a04;stroke-width:8.27354717000000051;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#d3d7cf;stroke-width:4.13677359;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765381;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4-1"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1844.9795,526.3583)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-8-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3080);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-8-2"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_MidPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_MidPoint.svg
index e0a5f5a2f5..5170588d85 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_MidPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_MidPoint.svg
@@ -14,12 +14,23 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Circle_MidPoint.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateCircle.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2920">
+    <linearGradient
+       id="linearGradient3024">
+      <stop
+         id="stop3026"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3028"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient3144"
@@ -61,17 +72,117 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2926" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient5352"
+       xlink:href="#linearGradient3892"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3892">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3894" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3896" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3850"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3850">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3852" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3854" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7"
+       id="linearGradient3801-1-1"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
+      <stop
+         style="stop-color:#c4a000;stop-opacity:1;"
+         offset="0"
+         id="stop3838-2" />
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1;"
+         offset="1"
+         id="stop3840-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7-7"
+       id="linearGradient3801-1-1-6"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3024"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -80,19 +191,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.4999999"
-     inkscape:cx="-16.119015"
-     inkscape:cy="24.817835"
+     inkscape:zoom="17.545338"
+     inkscape:cx="28.539046"
+     inkscape:cy="25.976691"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     inkscape:snap-nodes="false" />
+     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="grid2998"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -101,7 +219,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -115,31 +233,66 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1725.6394,425.09667 c -99.7853,0 -180.7813,80.99602 -180.7813,180.78125 0,99.78525 80.996,180.78125 180.7813,180.78125 99.7852,0 180.7811,-80.99599 180.7812,-180.78125 l -0.094,-4.96875 c -2.6923,-98.00357 -82.647,-175.8125 -180.6874,-175.8125 z m -1.4376,35.71875 c 78.671,-1e-5 142.8396,62.42122 145,141.0625 l 0.063,4 c 0,80.07098 -64.9916,145.0625 -145.0626,145.0625 -80.0709,10e-6 -145.0624,-64.99154 -145.0624,-145.0625 0,-80.07095 64.9915,-145.0625 145.0624,-145.0625 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3187"
-         style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1942.8804,1255.4338)" />
-      <path
-         transform="matrix(-0.83008233,0.55764075,-0.55764075,-0.83008233,2272.9213,1028.1292)"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path3189"
-         style="fill:url(#radialGradient5352);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+      <g
+         id="g4428" />
+      <g
+         transform="translate(5.1846337e-7,2.8784578e-6)"
+         id="g4428-3">
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#2e3436;stroke-width:8.27354717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#d3d7cf;stroke-width:4.13677359;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765381;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4-1"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" />
+        <path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1844.9795,526.3583)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#172a04;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-8-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3080);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-8-2"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_All.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_All.svg
index 50c5a7f4a2..f69eed8475 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
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Ellipse_All_construction2 .svg"
+   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"
@@ -110,6 +110,101 @@
          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>
+    <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>
+    <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>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -119,18 +214,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8.7173008"
-     inkscape:cx="1.2696957"
-     inkscape:cy="31.823042"
-     inkscape:current-layer="g4470"
+     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="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-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">
     <rdf:RDF>
@@ -153,35 +258,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g3768"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,-0.3333517,1043.3021)"
-         style="fill:#ffffff;fill-opacity:1">
-        <g
-           id="g4428"
-           style="fill:#ffffff;fill-opacity:1">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 127.87,-38.10828 156.3403,-72.37 28.8728,-39.15805 33.8891,-93.00722 31.234,-129.57104 -15.821,-104.60887 -107.1287,-181.3142 -194.7916,-182.85335 -12.3911,0.20446 -22.4991,0.96838 -30.4321,2.26527 z m 43.1124,46.90779 c 94.9116,9.80275 184.5301,128.71484 120.926,219.36688 -46.1628,49.99385 -70.3069,60.8659 -140.9759,66.97768 -78.3857,6.77915 -136.9917,-65.84891 -136.9917,-145.91987 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="cssccccccsscc" />
-          <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="g3177"
-             style="fill:#ffffff;fill-opacity:1" />
-          <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="g3185"
-             style="fill:#ffffff;fill-opacity:1" />
-        </g>
-      </g>
       <g
          id="g3800-6"
          transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
@@ -228,46 +304,91 @@
           </g>
         </g>
       </g>
-      <rect
-         style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#2d2dff;stroke-width:12.32901191999999924;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect7798-8"
-         width="42.850426"
-         height="280.15634"
-         x="886.71631"
-         y="1471.2982"
-         rx="0.66348088"
-         ry="0.3966881"
-         transform="matrix(0.73747246,-0.67537721,0.65140031,0.75873423,0,0)" />
-      <rect
-         style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#2d2dff;stroke-width:12.05930138;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect7798"
-         width="41.775028"
-         height="426.43243"
-         x="1550.9117"
-         y="-1158.642"
-         rx="0.6267432"
-         ry="0.78326011"
-         transform="matrix(0.63352355,0.77372341,-0.76537855,0.64358036,0,0)" />
-      <path
-         sodipodi:type="arc"
-         style="fill:#008900;fill-opacity:1;stroke:#2d2dff;stroke-width:1.45507193;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path3946"
-         sodipodi:cx="-18.956522"
-         sodipodi:cy="44.173912"
-         sodipodi:rx="3.652174"
-         sodipodi:ry="3.594203"
-         d="m -15.304348,44.173912 c 0,1.985024 -1.635134,3.594203 -3.652174,3.594203 -2.01704,0 -3.652174,-1.609179 -3.652174,-3.594203 0,-1.985023 1.635134,-3.594203 3.652174,-3.594203 2.01704,0 3.652174,1.60918 3.652174,3.594203 z"
-         transform="matrix(11.828848,0,0,11.574059,1865.1255,159.84376)" />
-      <path
-         transform="matrix(11.828848,0,0,11.574059,2015.9471,34.159126)"
-         d="m -15.304348,44.173912 a 3.652174,3.594203 0 1 1 -7.304348,0 3.652174,3.594203 0 1 1 7.304348,0 z"
-         sodipodi:ry="3.594203"
-         sodipodi:rx="3.652174"
-         sodipodi:cy="44.173912"
-         sodipodi:cx="-18.956522"
-         id="path3017"
-         style="fill:#008900;fill-opacity:1;stroke:#2d2dff;stroke-width:1.45507193;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;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>
+        <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>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_CentrePoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_CentrePoint.svg
index 971336a684..63ece8d257 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_CentrePoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_CentrePoint.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Ellipse_CentrePoint_2 .svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Ellipse_Edge_2.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"
@@ -23,6 +23,41 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs2920">
+    <linearGradient
+       id="linearGradient4260">
+      <stop
+         id="stop4262"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop4264"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3890" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3892" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3882" />
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="1"
+         id="stop3884" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -76,39 +111,95 @@
        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">
+       xlink:href="#linearGradient3888"
+       id="linearGradient3901"
+       gradientUnits="userSpaceOnUse"
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3880"
+       id="linearGradient3903"
+       gradientUnits="userSpaceOnUse"
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#a40000;stop-opacity:1"
          offset="0"
-         id="stop3146-18" />
+         id="stop3838-2-4-5" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#ef2929;stop-opacity:1"
          offset="1"
-         id="stop3148-52" />
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient4260"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-7"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-1"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <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
@@ -119,18 +210,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.328125"
-     inkscape:cx="18.413181"
-     inkscape:cy="32"
+     inkscape:cx="17.337394"
+     inkscape:cy="36.478804"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3072"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -154,100 +255,53 @@
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
       <g
-         id="g3768"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,-0.3333517,1043.3021)"
-         style="fill:#ffffff;fill-opacity:1">
-        <g
-           id="g4428"
-           style="fill:#ffffff;fill-opacity:1">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 127.87,-38.10828 156.3403,-72.37 28.8728,-39.15805 33.8891,-93.00722 31.234,-129.57104 -15.821,-104.60887 -107.1287,-181.3142 -194.7916,-182.85335 -12.3911,0.20446 -22.4991,0.96838 -30.4321,2.26527 z m 43.1124,46.90779 c 94.9116,9.80275 184.5301,128.71484 120.926,219.36688 -46.1628,49.99385 -70.3069,60.8659 -140.9759,66.97768 -78.3857,6.77915 -136.9917,-65.84891 -136.9917,-145.91987 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="cssccccccsscc" />
-          <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="g3177"
-             style="fill:#ffffff;fill-opacity:1" />
-          <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="g3185"
-             style="fill:#ffffff;fill-opacity:1" />
-        </g>
+         id="g3896"
+         transform="translate(-4.8153656e-6,0)">
+        <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.45016002999999927;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;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);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);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="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>
+         transform="matrix(4.5913999,0,0,4.591325,1807.9815,558.76004)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#8ae234;stroke:#172a04;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:#8ae234;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(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>
-      <path
-         d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3187"
-         style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(-0.99923148,0.03919708,-0.03919708,-0.99923148,1948.7199,1250.7806)" />
-      <path
-         transform="matrix(-0.83008232,0.55764072,-0.55764072,-0.83008232,2278.7608,1023.476)"
-         d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path3189"
-         style="fill:url(#radialGradient5352);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_1.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_1.svg
index 6d85f808e3..11dbe4f1b4 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_1.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_1.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Ellipse_Edge_1 .svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateEllipse_Constr.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"
@@ -23,6 +23,30 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs2920">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="0"
+         id="stop3890" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3892" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0"
+         id="stop3882" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3884" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -76,39 +100,116 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient4041"
+       xlink:href="#linearGradient3888"
+       id="linearGradient3901"
        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
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
+       xlink:href="#linearGradient3880"
+       id="linearGradient3903"
        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
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836-0-7-7"
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3033"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3922-7"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
+    </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
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-1"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <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>
+    <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-9"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -117,19 +218,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="18.413181"
-     inkscape:cy="32"
-     inkscape:current-layer="g4470"
+     inkscape:zoom="17.434602"
+     inkscape:cx="18.307222"
+     inkscape:cy="33.723791"
+     inkscape:current-layer="g3896"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3072"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -153,162 +264,80 @@
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
       <g
-         id="g3768"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,-0.3333517,1043.3021)"
-         style="fill:#008900;fill-opacity:1">
-        <g
-           id="g4428"
-           style="fill:#008900;fill-opacity:1">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 127.87,-38.10828 156.3403,-72.37 28.8728,-39.15805 31.153,-94.15472 28.4979,-130.71854 -3.8297,-96.29582 -97.9944,-175.73114 -192.0555,-181.70585 z m 43.1124,46.90779 c 94.9116,9.80275 184.5301,128.71484 120.926,219.36688 -46.1628,49.99385 -70.3069,60.8659 -140.9759,66.97768 -78.3857,6.77915 -136.9917,-65.84891 -136.9917,-145.91987 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
-             style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="cssccccccsscc" />
-          <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="g3177"
-             style="fill:#008900;fill-opacity:1" />
-          <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="g3185"
-             style="fill:#008900;fill-opacity:1" />
-        </g>
+         id="g3896"
+         transform="translate(-4.8153656e-6,0)">
+        <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:#172a04;stroke-width:9.45016002999999927;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;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);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);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="g3800"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4043);fill-opacity:1;stroke:none"
-                 id="path3794"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1807.9815,558.76004)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
       <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4041);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1732.6569,483.43542)"
+         id="g3797-9-4-5-6">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
       <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">
-              <path
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3033);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1958.6307,394.41542)"
+         id="g3797-9-4-5-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-71-8-6-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(#linearGradient3962-9);fill-opacity:1;stroke:#ef2929;stroke-width:2.9828577;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-3-8-2-0"
+           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_Edge_2.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_2.svg
index bfefdc193c..1946e24dab 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_2.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_2.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Ellipse_Edge_2 .svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Ellipse_Edge_1.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"
@@ -23,6 +23,30 @@
    inkscape:export-ydpi="22.5">
   <defs
      id="defs2920">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3888">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="0"
+         id="stop3890" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3892" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3880">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0"
+         id="stop3882" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3884" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3144">
@@ -76,39 +100,116 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient4041"
+       xlink:href="#linearGradient3888"
+       id="linearGradient3901"
        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
+       x1="30.202745"
+       y1="56.729507"
+       x2="35.013981"
+       y2="19.843365" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
+       xlink:href="#linearGradient3880"
+       id="linearGradient3903"
        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
+       x1="29.993565"
+       y1="54.846851"
+       x2="36.094769"
+       y2="20.854424" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-0-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922"
+       xlink:href="#linearGradient3836-0-7-7"
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3033"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3922-7"
+       xlink:href="#linearGradient3836-0-7-7-5"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient
+       id="linearGradient3836-0-7-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-3" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" />
+    </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
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3922-1"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <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>
+    <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-9"
+       xlink:href="#linearGradient3836-0-7-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -118,18 +219,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.328125"
-     inkscape:cx="18.413181"
-     inkscape:cy="32"
+     inkscape:cx="17.337394"
+     inkscape:cy="36.478804"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3072"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -153,122 +264,52 @@
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
       <g
-         id="g3768"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,-0.3333517,1043.3021)"
-         style="fill:#008900;fill-opacity:1">
-        <g
-           id="g4428"
-           style="fill:#008900;fill-opacity:1">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 127.87,-38.10828 156.3403,-72.37 28.8728,-39.15805 31.153,-94.15472 28.4979,-130.71854 -3.8297,-96.29582 -97.9944,-175.73114 -192.0555,-181.70585 z m 43.1124,46.90779 c 94.9116,9.80275 184.5301,128.71484 120.926,219.36688 -46.1628,49.99385 -70.3069,60.8659 -140.9759,66.97768 -78.3857,6.77915 -136.9917,-65.84891 -136.9917,-145.91987 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
-             style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="cssccccccsscc" />
-          <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="g3177"
-             style="fill:#008900;fill-opacity:1" />
-          <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="g3185"
-             style="fill:#008900;fill-opacity:1" />
-        </g>
+         id="g3896"
+         transform="translate(-4.8153656e-6,0)">
+        <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:#172a04;stroke-width:9.45016002999999927;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998000000003;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);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);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="g3800"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778">
-          <g
-             id="g3780">
-            <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" />
-            <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">
-              <path
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient4043);fill-opacity:1;stroke:none"
-                 id="path3794"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <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>
-        </g>
+         transform="matrix(4.5913999,0,0,4.591325,1807.9815,558.76004)"
+         id="g3797-9-4-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;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:#ef2929;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>
     </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 5d76fbcfdb..e62d6345ae 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
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="Sketcher_Element_Ellipse_Foci.svg"
+   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"
@@ -110,6 +110,101 @@
          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>
+    <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>
+    <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>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -119,18 +214,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8.7173008"
-     inkscape:cx="20.484359"
-     inkscape:cy="31.823042"
-     inkscape:current-layer="g4470"
+     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="999"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     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">
     <rdf:RDF>
@@ -153,35 +258,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g3768"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,-0.3333517,1043.3021)"
-         style="fill:#ffffff;fill-opacity:1">
-        <g
-           id="g4428"
-           style="fill:#ffffff;fill-opacity:1">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 127.87,-38.10828 156.3403,-72.37 28.8728,-39.15805 33.8891,-93.00722 31.234,-129.57104 -15.821,-104.60887 -107.1287,-181.3142 -194.7916,-182.85335 -12.3911,0.20446 -22.4991,0.96838 -30.4321,2.26527 z m 43.1124,46.90779 c 94.9116,9.80275 184.5301,128.71484 120.926,219.36688 -46.1628,49.99385 -70.3069,60.8659 -140.9759,66.97768 -78.3857,6.77915 -136.9917,-65.84891 -136.9917,-145.91987 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="cssccccccsscc" />
-          <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="g3177"
-             style="fill:#ffffff;fill-opacity:1" />
-          <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="g3185"
-             style="fill:#ffffff;fill-opacity:1" />
-        </g>
-      </g>
       <g
          id="g3800-6"
          transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
@@ -228,16 +304,61 @@
           </g>
         </g>
       </g>
-      <path
-         transform="matrix(11.828848,0,0,11.574059,2004.9496,40.443356)"
-         d="m -15.304348,44.173912 c 0,1.985024 -1.635134,3.594203 -3.652174,3.594203 -2.01704,0 -3.652174,-1.609179 -3.652174,-3.594203 0,-1.985023 1.635134,-3.594203 3.652174,-3.594203 2.01704,0 3.652174,1.60918 3.652174,3.594203 z"
-         sodipodi:ry="3.594203"
-         sodipodi:rx="3.652174"
-         sodipodi:cy="44.173912"
-         sodipodi:cx="-18.956522"
-         id="path3958"
-         style="fill:#008900;fill-opacity:1;stroke:#2d2dff;stroke-width:1.45507193;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;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>
+      </g>
     </g>
   </g>
 </svg>
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 75d702ccd7..2b6e3b8627 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
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_Element_Ellipse_Focus1.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
@@ -110,6 +110,101 @@
          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>
+    <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>
+    <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>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -119,18 +214,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8.7173008"
-     inkscape:cx="20.484359"
-     inkscape:cy="31.823042"
-     inkscape:current-layer="g4470"
+     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="999"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     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">
     <rdf:RDF>
@@ -153,35 +258,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g3768"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,-0.3333517,1043.3021)"
-         style="fill:#ffffff;fill-opacity:1">
-        <g
-           id="g4428"
-           style="fill:#ffffff;fill-opacity:1">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 127.87,-38.10828 156.3403,-72.37 28.8728,-39.15805 33.8891,-93.00722 31.234,-129.57104 -15.821,-104.60887 -107.1287,-181.3142 -194.7916,-182.85335 -12.3911,0.20446 -22.4991,0.96838 -30.4321,2.26527 z m 43.1124,46.90779 c 94.9116,9.80275 184.5301,128.71484 120.926,219.36688 -46.1628,49.99385 -70.3069,60.8659 -140.9759,66.97768 -78.3857,6.77915 -136.9917,-65.84891 -136.9917,-145.91987 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="cssccccccsscc" />
-          <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="g3177"
-             style="fill:#ffffff;fill-opacity:1" />
-          <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="g3185"
-             style="fill:#ffffff;fill-opacity:1" />
-        </g>
-      </g>
       <g
          id="g3800-6"
          transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
@@ -228,16 +304,61 @@
           </g>
         </g>
       </g>
-      <path
-         sodipodi:type="arc"
-         style="fill:#008900;fill-opacity:1;stroke:#2d2dff;stroke-width:1.45507193;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         id="path3946"
-         sodipodi:cx="-18.956522"
-         sodipodi:cy="44.173912"
-         sodipodi:rx="3.652174"
-         sodipodi:ry="3.594203"
-         d="m -15.304348,44.173912 c 0,1.985024 -1.635134,3.594203 -3.652174,3.594203 -2.01704,0 -3.652174,-1.609179 -3.652174,-3.594203 0,-1.985023 1.635134,-3.594203 3.652174,-3.594203 2.01704,0 3.652174,1.60918 3.652174,3.594203 z"
-         transform="matrix(11.828848,0,0,11.574059,1873.7663,151.20294)" />
+      <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>
+      </g>
     </g>
   </g>
 </svg>
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 5481d6a7e1..f3b0a17ba9 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
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Ellipse_Foci_construction2 .svg"
+   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"
@@ -87,6 +87,124 @@
        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>
+    <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>
+    <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>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -96,18 +214,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8.7173008"
-     inkscape:cx="20.484359"
-     inkscape:cy="31.823042"
-     inkscape:current-layer="g4470"
+     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="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-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">
     <rdf:RDF>
@@ -130,35 +258,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g3768"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,-0.3333517,1043.3021)"
-         style="fill:#ffffff;fill-opacity:1">
-        <g
-           id="g4428"
-           style="fill:#ffffff;fill-opacity:1">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 127.87,-38.10828 156.3403,-72.37 28.8728,-39.15805 33.8891,-93.00722 31.234,-129.57104 -15.821,-104.60887 -107.1287,-181.3142 -194.7916,-182.85335 -12.3911,0.20446 -22.4991,0.96838 -30.4321,2.26527 z m 43.1124,46.90779 c 94.9116,9.80275 184.5301,128.71484 120.926,219.36688 -46.1628,49.99385 -70.3069,60.8659 -140.9759,66.97768 -78.3857,6.77915 -136.9917,-65.84891 -136.9917,-145.91987 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="cssccccccsscc" />
-          <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="g3177"
-             style="fill:#ffffff;fill-opacity:1" />
-          <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="g3185"
-             style="fill:#ffffff;fill-opacity:1" />
-        </g>
-      </g>
       <g
          id="g3800-6"
          transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
@@ -205,16 +304,55 @@
           </g>
         </g>
       </g>
-      <rect
-         style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#2d2dff;stroke-width:12.05930138;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect7798"
-         width="41.775028"
-         height="426.43243"
-         x="1550.9117"
-         y="-1158.642"
-         rx="0.6267432"
-         ry="0.78326011"
-         transform="matrix(0.63352355,0.77372341,-0.76537855,0.64358036,0,0)" />
+      <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-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>
 </svg>
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 461005ba7a..526b6890cc 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
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Ellipse_Minor_Axis_construction2 .svg"
+   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"
@@ -87,6 +87,124 @@
        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>
+    <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>
+    <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>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -96,18 +214,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8.7173008"
-     inkscape:cx="1.2696957"
-     inkscape:cy="31.823042"
-     inkscape:current-layer="g4470"
+     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="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-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">
     <rdf:RDF>
@@ -116,7 +244,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -130,35 +258,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g3768"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,-0.3333517,1043.3021)"
-         style="fill:#ffffff;fill-opacity:1">
-        <g
-           id="g4428"
-           style="fill:#ffffff;fill-opacity:1">
-          <path
-             inkscape:connector-curvature="0"
-             id="path4425"
-             d="m 1673.1484,403.60502 c -93.2072,1.94753 -148.2109,87.54725 -148.2109,187.33248 0,99.78525 87.3224,200.35544 185.8603,195.19664 83.3226,-4.36224 127.87,-38.10828 156.3403,-72.37 28.8728,-39.15805 33.8891,-93.00722 31.234,-129.57104 -15.821,-104.60887 -107.1287,-181.3142 -194.7916,-182.85335 -12.3911,0.20446 -22.4991,0.96838 -30.4321,2.26527 z m 43.1124,46.90779 c 94.9116,9.80275 184.5301,128.71484 120.926,219.36688 -46.1628,49.99385 -70.3069,60.8659 -140.9759,66.97768 -78.3857,6.77915 -136.9917,-65.84891 -136.9917,-145.91987 0,-80.07095 66.2744,-139.7726 146.3453,-139.7726 z"
-             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019000000044;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:nodetypes="cssccccccsscc" />
-          <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="g3177"
-             style="fill:#ffffff;fill-opacity:1" />
-          <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="g3185"
-             style="fill:#ffffff;fill-opacity:1" />
-        </g>
-      </g>
       <g
          id="g3800-6"
          transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
@@ -205,16 +304,55 @@
           </g>
         </g>
       </g>
-      <rect
-         style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#2d2dff;stroke-width:12.3290118;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect7798-8"
-         width="42.850426"
-         height="280.15634"
-         x="886.71631"
-         y="1471.2982"
-         rx="0.66348088"
-         ry="0.3966881"
-         transform="matrix(0.73747246,-0.67537721,0.65140031,0.75873423,0,0)" />
+      <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)" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Centre_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Centre_Point.svg
index 0bcbb32f64..d019ed6f8a 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Centre_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Centre_Point.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Elliptical_Arc_Centre_Point_2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Elliptical_Arc_Centre_Point.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"
@@ -120,6 +120,122 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3077"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-7"
+       id="linearGradient3077-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096"
+       xlink:href="#linearGradient3836-9-3-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096-8"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -128,19 +244,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="33.652857"
-     inkscape:cy="24.077216"
+     inkscape:zoom="6.1640625"
+     inkscape:cx="51.309676"
+     inkscape:cy="26.237893"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="836"
-     inkscape:window-height="988"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false" />
+     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="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3032"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -149,7 +275,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -163,215 +289,79 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.7815361;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1719.7529,460.82391 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-15"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
       <g
-         id="g4428"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,37.992895,1047.7457)">
+         transform="matrix(6.8476923,0,0,6.8476923,1858.6356,389.40446)"
+         id="g3797-7-2">
         <path
-           sodipodi:nodetypes="cssccsscc"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.61715282000000027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 1767.291,742.73351 c -24.091,16.57792 -20.7737,7.02452 -64.6094,8.35093 -79.5,2.40556 -145.124,-80.93598 -143.4624,-160.14694 1.7342,-82.67482 92.7763,-162.62895 172.0928,-168.62766 l -18.7702,-60.33325 c -98.6095,-6.58983 -223.9927,116.73924 -198.982,249.54772 19.9319,105.83907 103.1317,207.56864 201.6696,202.40984 83.3226,-4.36224 35.0823,21.20517 71.6904,-3.66838 z"
-           id="path4425"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g3177"
-           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="g3185"
-           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" />
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3077);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3867"
-         transform="translate(88.872457,-30.549907)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382473999999963;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1968.238,485.23486)"
+         id="g3797-7-2-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3075);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3845"
-         transform="translate(88.317004,-66.654343)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)"
-           id="g3800-6">
-          <g
-             id="g3778-7"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780-2">
-              <g
-                 id="g3784-5"
-                 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="g3790-2"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792-8"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794-5"
-                   style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1749.0726,663.31215)"
+         id="g3797-7-2-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3096);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3058"
-         transform="translate(-27.21719,-3.3327171)">
-        <g
-           id="g3019"
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,290.18417,740.97568)">
-          <g
-             transform="translate(-10.941933,-540.84412)"
-             id="g3021">
-            <g
-               id="g3023">
-              <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="g3025" />
-              <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="g3027">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3857"
-         transform="translate(38.326247,4.4436229)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
-           id="g3028">
-          <g
-             id="g3030"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3032">
-              <g
-                 id="g3034"
-                 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="g3036"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3038"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3040"
-                   style="fill:url(#radialGradient3042);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1954.5426,635.92138)"
+         id="g3797-7-2-9-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3136);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Edge.svg
index a455e5078d..02fa5a1df0 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Edge.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Elliptical_Arc_Edge_2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Elliptical_Arc_Centre_Point.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"
@@ -120,6 +120,151 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3077"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-7"
+       id="linearGradient3077-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096"
+       xlink:href="#linearGradient3836-9-3-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096-8"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136-2"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -129,18 +274,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.328125"
-     inkscape:cx="33.652857"
-     inkscape:cy="24.077216"
+     inkscape:cx="43.294351"
+     inkscape:cy="24.307438"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="836"
-     inkscape:window-height="988"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false" />
+     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="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3032"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -149,7 +304,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -163,215 +318,79 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path
+         style="fill:none;stroke:#172a04;stroke-width:54.78153609999999700;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#73d216;stroke-width:27.39076996000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#8ae234;stroke-width:13.69538498000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1719.7529,460.82391 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-15"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
       <g
-         id="g4428"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,37.992895,1047.7457)">
+         transform="matrix(6.8476923,0,0,6.8476923,1858.6356,389.40446)"
+         id="g3797-7-2">
         <path
-           sodipodi:nodetypes="cssccsscc"
-           style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.61715282;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 1767.291,742.73351 c -24.091,16.57792 -20.7737,7.02452 -64.6094,8.35093 -79.5,2.40556 -145.124,-80.93598 -143.4624,-160.14694 1.7342,-82.67482 92.7763,-162.62895 172.0928,-168.62766 l -18.7702,-60.33325 c -98.6095,-6.58983 -223.9927,116.73924 -198.982,249.54772 19.9319,105.83907 103.1317,207.56864 201.6696,202.40984 83.3226,-4.36224 35.0823,21.20517 71.6904,-3.66838 z"
-           id="path4425"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g3177"
-           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="g3185"
-           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" />
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3077);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3867"
-         transform="translate(88.872457,-30.549907)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1749.0726,663.31215)"
+         id="g3797-7-2-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3096);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3845"
-         transform="translate(88.317004,-66.654343)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)"
-           id="g3800-6">
-          <g
-             id="g3778-7"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780-2">
-              <g
-                 id="g3784-5"
-                 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="g3790-2"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792-8"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794-5"
-                   style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1954.5426,635.92138)"
+         id="g3797-7-2-9-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3136);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3058"
-         transform="translate(-27.21719,-3.3327171)">
-        <g
-           id="g3019"
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,290.18417,740.97568)">
-          <g
-             transform="translate(-10.941933,-540.84412)"
-             id="g3021">
-            <g
-               id="g3023">
-              <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="g3025" />
-              <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="g3027">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3857"
-         transform="translate(38.326247,4.4436229)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
-           id="g3028">
-          <g
-             id="g3030"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3032">
-              <g
-                 id="g3034"
-                 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="g3036"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3038"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3040"
-                   style="fill:url(#radialGradient3042);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1968.238,485.27215)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_End_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_End_Point.svg
index c4710f95ab..07e6fa3acf 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_End_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_End_Point.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Elliptical_Arc_End_Point_2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Elliptical_Arc_Edge.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"
@@ -120,6 +120,151 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3077"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-7"
+       id="linearGradient3077-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096"
+       xlink:href="#linearGradient3836-9-3-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096-8"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136-2"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -129,18 +274,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.328125"
-     inkscape:cx="33.652857"
-     inkscape:cy="24.077216"
+     inkscape:cx="43.294351"
+     inkscape:cy="30.796664"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="836"
-     inkscape:window-height="988"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false" />
+     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="grid3032"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -163,215 +318,79 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.7815361;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1719.7529,460.82391 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-15"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
       <g
-         id="g4428"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,37.992895,1047.7457)">
+         transform="matrix(6.8476923,0,0,6.8476923,1858.6356,389.40446)"
+         id="g3797-7-2">
         <path
-           sodipodi:nodetypes="cssccsscc"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.61715282000000027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 1767.291,742.73351 c -24.091,16.57792 -20.7737,7.02452 -64.6094,8.35093 -79.5,2.40556 -145.124,-80.93598 -143.4624,-160.14694 1.7342,-82.67482 92.7763,-162.62895 172.0928,-168.62766 l -18.7702,-60.33325 c -98.6095,-6.58983 -223.9927,116.73924 -198.982,249.54772 19.9319,105.83907 103.1317,207.56864 201.6696,202.40984 83.3226,-4.36224 35.0823,21.20517 71.6904,-3.66838 z"
-           id="path4425"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g3177"
-           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="g3185"
-           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" />
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3077);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3867"
-         transform="translate(88.872457,-30.549907)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1954.5426,635.92138)"
+         id="g3797-7-2-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3075);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3845"
-         transform="translate(88.317004,-66.654343)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)"
-           id="g3800-6">
-          <g
-             id="g3778-7"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780-2">
-              <g
-                 id="g3784-5"
-                 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="g3790-2"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792-8"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794-5"
-                   style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1749.0726,663.31215)"
+         id="g3797-7-2-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3096);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3058"
-         transform="translate(-27.21719,-3.3327171)">
-        <g
-           id="g3019"
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,290.18417,740.97568)">
-          <g
-             transform="translate(-10.941933,-540.84412)"
-             id="g3021">
-            <g
-               id="g3023">
-              <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="g3025" />
-              <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="g3027">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382473999999963;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3857"
-         transform="translate(38.326247,4.4436229)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
-           id="g3028">
-          <g
-             id="g3030"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3032">
-              <g
-                 id="g3034"
-                 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="g3036"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3038"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3040"
-                   style="fill:url(#radialGradient3042);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1968.238,485.27215)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Start_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Start_Point.svg
index 0db1cbf12b..a9ad5551ba 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Start_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Start_Point.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Elliptical_Arc_Start_Point_2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Elliptical_Arc_End_Point.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"
@@ -120,6 +120,180 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3077"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-7"
+       id="linearGradient3077-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096"
+       xlink:href="#linearGradient3836-9-3-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096-8"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136-2"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-2"
+       xlink:href="#linearGradient3836-9-3-7-2-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3245"
+       xlink:href="#linearGradient3836-9-3-7-2-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -129,18 +303,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.328125"
-     inkscape:cx="33.652857"
-     inkscape:cy="24.077216"
+     inkscape:cx="43.294351"
+     inkscape:cy="30.796664"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="836"
-     inkscape:window-height="988"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:snap-global="false" />
+     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="grid3032"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -163,215 +347,79 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.7815361;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1719.7529,460.82391 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-15"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
       <g
-         id="g4428"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,37.992895,1047.7457)">
+         transform="matrix(6.8476923,0,0,6.8476923,1858.6356,389.40446)"
+         id="g3797-7-2-3">
         <path
-           sodipodi:nodetypes="cssccsscc"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.61715282000000027;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 1767.291,742.73351 c -24.091,16.57792 -20.7737,7.02452 -64.6094,8.35093 -79.5,2.40556 -145.124,-80.93598 -143.4624,-160.14694 1.7342,-82.67482 92.7763,-162.62895 172.0928,-168.62766 l -18.7702,-60.33325 c -98.6095,-6.58983 -223.9927,116.73924 -198.982,249.54772 19.9319,105.83907 103.1317,207.56864 201.6696,202.40984 83.3226,-4.36224 35.0823,21.20517 71.6904,-3.66838 z"
-           id="path4425"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g3177"
-           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="g3185"
-           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" />
+           inkscape:connector-curvature="0"
+           style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3075);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3867"
-         transform="translate(88.872457,-30.549907)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1749.0726,663.31215)"
+         id="g3797-7-2-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3096);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3845"
-         transform="translate(88.317004,-66.654343)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)"
-           id="g3800-6">
-          <g
-             id="g3778-7"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780-2">
-              <g
-                 id="g3784-5"
-                 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="g3790-2"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792-8"
-                   style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382473999999963;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794-5"
-                   style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1968.238,485.27215)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3058"
-         transform="translate(-27.21719,-3.3327171)">
-        <g
-           id="g3019"
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,290.18417,740.97568)">
-          <g
-             transform="translate(-10.941933,-540.84412)"
-             id="g3021">
-            <g
-               id="g3023">
-              <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="g3025" />
-              <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="g3027">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3857"
-         transform="translate(38.326247,4.4436229)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
-           id="g3028">
-          <g
-             id="g3030"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3032">
-              <g
-                 id="g3034"
-                 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="g3036"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3038"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382474;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3040"
-                   style="fill:url(#radialGradient3042);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+         transform="matrix(6.8476923,0,0,6.8476923,1954.5426,635.92138)"
+         id="g3797-7-2-9-5-4-8">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-5"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3245);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-7"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg
index 7b9824cffb..de7b993fb4 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
@@ -153,6 +153,84 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -162,18 +240,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="9.6072693"
-     inkscape:cx="-2.7390771"
-     inkscape:cy="29.100963"
+     inkscape:cx="-18.285744"
+     inkscape:cy="29.153007"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -182,7 +270,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -196,12 +284,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1863.8594,447.43429 c -19.6625,72.36649 -68.5191,199.75839 -148.6292,199.4929 -80.1101,-0.26549 -107.4122,-133.80986 -129.3461,-201.03675 l -50.1698,0.63758 c 25.0731,67.00447 46.9944,246.18973 179.5397,245.98881 132.5453,-0.20092 174.418,-166.54156 192.4996,-244.93152 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82053852;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <g
          inkscape:export-ydpi="7.2934141"
          inkscape:export-xdpi="7.2934141"
@@ -220,100 +302,6 @@
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
          inkscape:export-xdpi="7.2934141"
          inkscape:export-ydpi="7.2934141" />
-      <ellipse
-         cy="-1826.1677"
-         cx="-462.61719"
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         style="display:inline;overflow:visible;visibility:visible;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3792"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         ry="21.97986"
-         rx="31.560532"
-         cy="-1787.5104"
-         cx="573.53253"
-         style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-         id="path3794"
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)" />
-      <g
-         id="g3800-6"
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,527.0813,1596.8486)">
-        <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">
-              <circle
-                 transform="translate(5.2894633,17.505927)"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                 id="path3792-8"
-                 cx="197.14285"
-                 cy="655.2193"
-                 r="48.57143" />
-              <ellipse
-                 style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-333.40746,231.69921)"
-                 cx="225.26402"
-                 cy="672.79736"
-                 rx="34.345188"
-                 ry="23.991123" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,817.54107,1610.2515)"
-         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">
-              <circle
-                 transform="translate(-19.561348,2.5388364)"
-                 id="path3029"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                 cx="197.14285"
-                 cy="655.2193"
-                 r="48.57143" />
-              <ellipse
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-358.25827,216.73211)"
-                 id="path3031"
-                 style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                 cx="225.26402"
-                 cy="672.79736"
-                 rx="34.345188"
-                 ry="23.991123" />
-            </g>
-          </g>
-        </g>
-      </g>
       <g
          id="g3857"
          transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
@@ -341,6 +329,66 @@
           </g>
         </g>
       </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.8272,663.27486)"
+         id="g3797-7-2-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3292);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 13.6953,164.34461 130.1061,164.34461 116.4108,0 143.8016,-164.34461 143.8016,-164.34461"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 13.6954,164.34462 130.1062,164.34462 116.4107,0 143.8015,-164.34462 143.8015,-164.34462"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1596.2175,460.82391 c 0,0 6.8476,164.34461 123.2584,164.34461 116.4107,0 136.9539,-164.34461 136.9539,-164.34461"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1721.6818,389.36717)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.5895,389.40446)"
+         id="g3797-7-2-9-5-4-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3079);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Edge.svg
index 0598f5cf36..b0e0777b64 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Edge.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_Element_Hyperbolic_Arc_Edge.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Hyperbolic_Arc_Centre_Point.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"
@@ -147,12 +147,119 @@
        xlink:href="#linearGradient3144"
        id="radialGradient3877"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079-4"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3146"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-5"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -162,18 +269,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="9.6072693"
-     inkscape:cx="10.728597"
-     inkscape:cy="28.306351"
+     inkscape:cx="6.0896328"
+     inkscape:cy="23.517314"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -182,7 +299,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -196,12 +313,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1863.8594,447.43429 c -19.6625,72.36649 -68.5191,199.75839 -148.6292,199.4929 -80.1101,-0.26549 -107.4122,-133.80986 -129.3461,-201.03675 l -50.1698,0.63758 c 25.0731,67.00447 46.9944,246.18973 179.5397,245.98881 132.5453,-0.20092 174.418,-166.54156 192.4996,-244.93152 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82053852;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <g
          inkscape:export-ydpi="7.2934141"
          inkscape:export-xdpi="7.2934141"
@@ -215,126 +326,11 @@
          transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)"
          id="g3185" />
       <g
-         id="g3867"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,99.534946,1685.3043)">
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <circle
-                   id="path3792"
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   transform="translate(-45.911987,34.643317)"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-384.60891,248.8366)"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3800-6"
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,527.0813,1596.8486)">
-        <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">
-              <circle
-                 transform="translate(5.2894633,17.505927)"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                 id="path3792-8"
-                 cx="197.14285"
-                 cy="655.2193"
-                 r="48.57143" />
-              <ellipse
-                 style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-333.40746,231.69921)"
-                 cx="225.26402"
-                 cy="672.79736"
-                 rx="34.345188"
-                 ry="23.991123" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,817.54107,1610.2515)"
-         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">
-              <circle
-                 transform="translate(-19.561348,2.5388364)"
-                 id="path3029"
-                 style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                 cx="197.14285"
-                 cy="655.2193"
-                 r="48.57143" />
-              <ellipse
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-358.25827,216.73211)"
-                 id="path3031"
-                 style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                 cx="225.26402"
-                 cy="672.79736"
-                 rx="34.345188"
-                 ry="23.991123" />
-            </g>
-          </g>
-        </g>
-      </g>
+         id="g3784"
+         transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-ydpi="7.2934141" />
       <g
          id="g3857"
          transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
@@ -362,6 +358,66 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#172a04;stroke-width:54.78153992000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 13.6953,164.34461 130.1061,164.34461 116.4108,0 143.8016,-164.34461 143.8016,-164.34461"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#73d216;stroke-width:27.39076996000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 13.6954,164.34462 130.1062,164.34462 116.4107,0 143.8015,-164.34462 143.8015,-164.34462"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#8ae234;stroke-width:13.69538498000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1596.2175,460.82391 c 0,0 6.8476,164.34461 123.2584,164.34461 116.4107,0 136.9539,-164.34461 136.9539,-164.34461"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1721.6818,389.36717)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.5895,389.40446)"
+         id="g3797-7-2-9-5-4-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3079);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.788,663.31215)"
+         id="g3797-7-2-9-5-4-9-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3146);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_End_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_End_Point.svg
index e492e08402..aa354e6793 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_End_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_End_Point.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_Element_Hyperbolic_Arc_End_Point.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Hyperbolic_Arc_Edge.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"
@@ -120,39 +120,104 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3068"
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,22.277307,-2338.9406)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3855"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,54.210532,-2025.4485)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079-4"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3146"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-5"
+       inkscape:collect="always" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3877"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3169"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -162,18 +227,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="9.6072693"
-     inkscape:cx="-2.7390771"
-     inkscape:cy="29.100963"
+     inkscape:cx="6.0896328"
+     inkscape:cy="23.517314"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -196,12 +271,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1863.8594,447.43429 c -19.6625,72.36649 -68.5191,199.75839 -148.6292,199.4929 -80.1101,-0.26549 -107.4122,-133.80986 -129.3461,-201.03675 l -50.1698,0.63758 c 25.0731,67.00447 46.9944,246.18973 179.5397,245.98881 132.5453,-0.20092 174.418,-166.54156 192.4996,-244.93152 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82053852;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <g
          inkscape:export-ydpi="7.2934141"
          inkscape:export-xdpi="7.2934141"
@@ -220,54 +289,6 @@
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
          inkscape:export-xdpi="7.2934141"
          inkscape:export-ydpi="7.2934141" />
-      <ellipse
-         cy="-1826.1677"
-         cx="-462.61719"
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3792"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         ry="21.97986"
-         rx="31.560532"
-         cy="-1787.5104"
-         cx="573.53253"
-         style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-         id="path3794"
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)" />
-      <ellipse
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3792-8"
-         cx="-627.8316"
-         cy="-1500.225"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-         id="path3794-5"
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-         cx="261.21048"
-         cy="-1594.8789"
-         rx="31.560532"
-         ry="21.97986" />
-      <ellipse
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         id="path3029"
-         style="display:inline;overflow:visible;visibility:visible;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82054758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         cx="-820.81836"
-         cy="-1749.311"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-         id="path3031"
-         style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-         cx="229.27725"
-         cy="-1908.371"
-         rx="31.560532"
-         ry="21.97986" />
       <g
          id="g3857"
          transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
@@ -295,6 +316,66 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 13.6953,164.34461 130.1061,164.34461 116.4108,0 143.8016,-164.34461 143.8016,-164.34461"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 13.6954,164.34462 130.1062,164.34462 116.4107,0 143.8015,-164.34462 143.8015,-164.34462"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1596.2175,460.82391 c 0,0 6.8476,164.34461 123.2584,164.34461 116.4107,0 136.9539,-164.34461 136.9539,-164.34461"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1721.6818,389.36717)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.788,663.31215)"
+         id="g3797-7-2-9-5-4-9-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3146);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.6288,389.36717)"
+         id="g3797-7-2-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3169);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg
index fb76ab1a74..2b93f68aa1 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_Element_Hyperbolic_Arc_Start_Point.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Hyperbolic_Arc_End_Point.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"
@@ -120,39 +120,104 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3068"
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,22.277307,-2338.9406)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3855"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,54.210532,-2025.4485)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079-4"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3146"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-5"
+       inkscape:collect="always" />
+    <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3877"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3169"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -162,18 +227,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="9.6072693"
-     inkscape:cx="-2.7390771"
-     inkscape:cy="29.100963"
+     inkscape:cx="6.0896328"
+     inkscape:cy="36.007856"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -196,12 +271,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1863.8594,447.43429 c -19.6625,72.36649 -68.5191,199.75839 -148.6292,199.4929 -80.1101,-0.26549 -107.4122,-133.80986 -129.3461,-201.03675 l -50.1698,0.63758 c 25.0731,67.00447 46.9944,246.18973 179.5397,245.98881 132.5453,-0.20092 174.418,-166.54156 192.4996,-244.93152 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82053852;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <g
          inkscape:export-ydpi="7.2934141"
          inkscape:export-xdpi="7.2934141"
@@ -220,54 +289,6 @@
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
          inkscape:export-xdpi="7.2934141"
          inkscape:export-ydpi="7.2934141" />
-      <ellipse
-         cy="-1826.1677"
-         cx="-462.61719"
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3792"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         ry="21.97986"
-         rx="31.560532"
-         cy="-1787.5104"
-         cx="573.53253"
-         style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-         id="path3794"
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)" />
-      <ellipse
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         style="display:inline;overflow:visible;visibility:visible;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3792-8"
-         cx="-627.8316"
-         cy="-1500.225"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-         id="path3794-5"
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-         cx="261.21048"
-         cy="-1594.8789"
-         rx="31.560532"
-         ry="21.97986" />
-      <ellipse
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         id="path3029"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82054758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         cx="-820.81836"
-         cy="-1749.311"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-         id="path3031"
-         style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-         cx="229.27725"
-         cy="-1908.371"
-         rx="31.560532"
-         ry="21.97986" />
       <g
          id="g3857"
          transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
@@ -295,6 +316,66 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 13.6953,164.34461 130.1061,164.34461 116.4108,0 143.8016,-164.34461 143.8016,-164.34461"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 13.6954,164.34462 130.1062,164.34462 116.4107,0 143.8015,-164.34462 143.8015,-164.34462"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1596.2175,460.82391 c 0,0 6.8476,164.34461 123.2584,164.34461 116.4107,0 136.9539,-164.34461 136.9539,-164.34461"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.5894,389.36717)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.788,663.31215)"
+         id="g3797-7-2-9-5-4-9-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3146);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1721.7212,389.36717)"
+         id="g3797-7-2-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3169);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_Edge.svg
index 798c4cb2b6..9b7f3918c4 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_Edge.svg
@@ -14,15 +14,46 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Line_Edge.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateLine.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/elements/Sketcher_Element_Line1_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   version="1.1">
   <defs
      id="defs2728">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient4274"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient4272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -30,97 +61,66 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2734" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-8"
-       id="radialGradient4272-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-8">
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#c4a000;stop-opacity:1;"
          offset="0"
-         id="stop3146-6" />
+         id="stop3838-2" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fce94f;stop-opacity:1;"
          offset="1"
-         id="stop3148-2" />
+         id="stop3840-5" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-2" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9-6"
-       id="radialGradient3159-4"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-9-6">
+       xlink:href="#linearGradient3836-0-6-6"
+       id="linearGradient3801-1-3-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#a40000;stop-opacity:1"
          offset="0"
-         id="stop3146-2-9" />
+         id="stop3838-2-7-7" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#ef2929;stop-opacity:1"
          offset="1"
-         id="stop3148-6-5" />
+         id="stop3840-5-5-5" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9"
-       id="radialGradient3200"
-       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-9"
-       id="radialGradient3556"
-       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-9-6"
-       id="radialGradient3558"
-       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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -129,20 +129,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.953125"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="g4289"
+     inkscape:zoom="8.7726691"
+     inkscape:cx="35.640203"
+     inkscape:cy="27.553678"
+     inkscape:current-layer="g3154"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
+     inkscape:window-width="800"
+     inkscape:window-height="837"
+     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="grid2999"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -151,7 +159,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -163,69 +171,58 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <g
-         id="g4117"
-         transform="translate(1.0360875,12.43305)">
+         id="g3242">
         <g
-           id="g3255"
-           transform="translate(43.714324,68.714247)" />
-        <rect
-           style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:7.52541399;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect2269"
-           width="46.728394"
-           height="356.66388"
-           x="528.51276"
-           y="82.515877"
-           transform="matrix(0.61982307,0.78474159,-0.75378526,0.65712082,0,0)" />
-        <g
-           transform="matrix(-1.0320043,-0.04067716,0.04159767,-1.0091664,460.95868,1151.1019)"
-           id="g3865">
+           id="g3154"
+           transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
+           inkscape:export-xdpi="7.0721951"
+           inkscape:export-ydpi="7.0721951">
+          <path
+             style="fill:#73d216;stroke:#172a04;stroke-width:12.33591747000000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 162.40856,627.63483 187.86722,654.49428 -80.727347,909.08082 -106.186,882.22137 z"
+             id="path3061"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:none;stroke:#8ae234;stroke-width:12.33591747000000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 173.54199,651.07562 -83.374613,894.59322"
+             id="path3063"
+             inkscape:connector-curvature="0" />
           <g
-             id="g3867">
-            <path
-               d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-               sodipodi:ry="48.57143"
-               sodipodi:rx="48.57143"
-               sodipodi:cy="655.2193"
-               sodipodi:cx="197.14285"
-               id="path3869"
-               style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-               sodipodi:type="arc" />
-            <path
-               transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-               d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-               sodipodi:ry="23.991123"
-               sodipodi:rx="34.345188"
-               sodipodi:cy="672.79736"
-               sodipodi:cx="225.26402"
-               id="path3871"
-               style="fill:url(#radialGradient3556);fill-opacity:1;stroke:none"
-               sodipodi:type="arc" />
+             transform="matrix(-6.1657491,-0.16508637,0.16508637,-6.1657491,251.65298,959.14094)"
+             id="g3827-1-3">
+            <g
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9-5">
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-71-6"
+                 d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-7-3-2"
+                 d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+            </g>
           </g>
-        </g>
-        <g
-           transform="matrix(-1.0320043,-0.04067713,0.0415977,-1.0091664,205.24147,1376.0059)"
-           id="g3865-3">
           <g
-             id="g3867-3">
-            <path
-               d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-               sodipodi:ry="48.57143"
-               sodipodi:rx="48.57143"
-               sodipodi:cy="655.2193"
-               sodipodi:cx="197.14285"
-               id="path3869-0"
-               style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-               sodipodi:type="arc" />
-            <path
-               transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-               d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-               sodipodi:ry="23.991123"
-               sodipodi:rx="34.345188"
-               sodipodi:cy="672.79736"
-               sodipodi:cx="225.26402"
-               id="path3871-4"
-               style="fill:url(#radialGradient3558);fill-opacity:1;stroke:none"
-               sodipodi:type="arc" />
+             transform="matrix(-6.1657491,-0.16508637,0.16508637,-6.1657491,-1.5804401,1199.1674)"
+             id="g3827-1-3-3">
+            <g
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9-5-5">
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-71-6-6"
+                 d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:url(#linearGradient3801-1-3-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-7-3-2-2"
+                 d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+            </g>
           </g>
         </g>
       </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_EndPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_EndPoint.svg
index d46754821b..d914a4e187 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_EndPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_EndPoint.svg
@@ -14,15 +14,46 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Line_EndPoint.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Line_Edge.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/elements/Sketcher_Element_EndingPoint1_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   version="1.1">
   <defs
      id="defs2728">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient4274"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient4272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -30,120 +61,66 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2734" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-8"
-       id="radialGradient4272-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-8">
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#c4a000;stop-opacity:1;"
          offset="0"
-         id="stop3146-6" />
+         id="stop3838-2" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fce94f;stop-opacity:1;"
          offset="1"
-         id="stop3148-2" />
+         id="stop3840-5" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-9">
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#a40000;stop-opacity:1"
          offset="0"
-         id="stop3146-2" />
+         id="stop3838-2-7" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#ef2929;stop-opacity:1"
          offset="1"
-         id="stop3148-6" />
+         id="stop3840-5-5" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-9-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-2-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-6-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9"
-       id="radialGradient3200"
+       xlink:href="#linearGradient3836-0-6-6"
+       id="linearGradient3801-1-3-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-9-5">
+       id="linearGradient3836-0-6-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#4e9a06;stop-opacity:1"
          offset="0"
-         id="stop3146-2-1" />
+         id="stop3838-2-7-7" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#8ae234;stop-opacity:1"
          offset="1"
-         id="stop3148-6-9" />
+         id="stop3840-5-5-5" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9-6"
-       id="radialGradient4119"
-       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-9-5"
-       id="radialGradient4121"
-       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-9"
-       id="radialGradient3571"
-       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-9-5"
-       id="radialGradient3573"
-       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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -152,20 +129,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.84375"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="g4289"
+     inkscape:zoom="8.7726691"
+     inkscape:cx="35.640203"
+     inkscape:cy="27.553678"
+     inkscape:current-layer="g3154"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
+     inkscape:window-width="800"
+     inkscape:window-height="837"
+     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="grid2999"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -174,7 +159,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -186,66 +171,58 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <g
-         id="g3560"
-         transform="translate(-5.2773976,15.832193)">
-        <rect
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:7.52541399;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect2269"
-           width="46.728394"
-           height="356.66388"
-           x="528.51276"
-           y="82.515877"
-           transform="matrix(0.61982307,0.78474159,-0.75378526,0.65712082,0,0)" />
+         id="g3242">
         <g
-           transform="matrix(-1.0320043,-0.04067716,0.04159767,-1.0091664,215.40594,1369.7164)"
-           id="g3865">
+           id="g3154"
+           transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
+           inkscape:export-xdpi="7.0721951"
+           inkscape:export-ydpi="7.0721951">
+          <path
+             style="fill:#d3d7cf;stroke:#2e3436;stroke-width:12.33591747;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 162.40856,627.63483 187.86722,654.49428 -80.727347,909.08082 -106.186,882.22137 z"
+             id="path3061"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:none;stroke:#ffffff;stroke-width:12.33591747;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 173.54199,651.07562 -83.374613,894.59322"
+             id="path3063"
+             inkscape:connector-curvature="0" />
           <g
-             id="g3867">
-            <path
-               d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-               sodipodi:ry="48.57143"
-               sodipodi:rx="48.57143"
-               sodipodi:cy="655.2193"
-               sodipodi:cx="197.14285"
-               id="path3869"
-               style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-               sodipodi:type="arc" />
-            <path
-               transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-               d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-               sodipodi:ry="23.991123"
-               sodipodi:rx="34.345188"
-               sodipodi:cy="672.79736"
-               sodipodi:cx="225.26402"
-               id="path3871"
-               style="fill:url(#radialGradient3571);fill-opacity:1;stroke:none"
-               sodipodi:type="arc" />
+             transform="matrix(-6.1657491,-0.16508637,0.16508637,-6.1657491,251.65298,959.14094)"
+             id="g3827-1-3">
+            <g
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9-5">
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#280000;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-71-6"
+                 d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-7-3-2"
+                 d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+            </g>
           </g>
-        </g>
-        <g
-           transform="matrix(-1.0320043,-0.04067713,0.0415977,-1.0091664,457.53394,1156.4788)"
-           id="g3865-8">
           <g
-             id="g3867-0">
-            <path
-               d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-               sodipodi:ry="48.57143"
-               sodipodi:rx="48.57143"
-               sodipodi:cy="655.2193"
-               sodipodi:cx="197.14285"
-               id="path3869-1"
-               style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-               sodipodi:type="arc" />
-            <path
-               transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-               d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-               sodipodi:ry="23.991123"
-               sodipodi:rx="34.345188"
-               sodipodi:cy="672.79736"
-               sodipodi:cx="225.26402"
-               id="path3871-5"
-               style="fill:url(#radialGradient3573);fill-opacity:1;stroke:none"
-               sodipodi:type="arc" />
+             transform="matrix(-6.1657491,-0.16508637,0.16508637,-6.1657491,-1.5804401,1199.1674)"
+             id="g3827-1-3-3">
+            <g
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9-5-5">
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#172a04;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-71-6-6"
+                 d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:url(#linearGradient3801-1-3-3);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-7-3-2-2"
+                 d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+            </g>
           </g>
         </g>
       </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_StartingPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_StartingPoint.svg
index 1fcbb03629..c48fa8f7d5 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_StartingPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_StartingPoint.svg
@@ -14,15 +14,46 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Line_StartingPoint.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Line_EndPoint.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/elements/Sketcher_Element_StartingPoint1_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   version="1.1">
   <defs
      id="defs2728">
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient4274"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3146" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3148" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient4272"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
        inkscape:vp_x="0 : 32 : 1"
@@ -30,142 +61,66 @@
        inkscape:vp_z="64 : 32 : 1"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
        id="perspective2734" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-8"
-       id="radialGradient4272-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-8">
+       xlink:href="#linearGradient3836-0"
+       id="linearGradient3801-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#c4a000;stop-opacity:1;"
          offset="0"
-         id="stop3146-6" />
+         id="stop3838-2" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#fce94f;stop-opacity:1;"
          offset="1"
-         id="stop3148-2" />
+         id="stop3840-5" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-9">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-2" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-6" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9-6"
-       id="radialGradient3159-4"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3144-9-6">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-2-9" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-6-5" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9"
-       id="radialGradient3200"
+       xlink:href="#linearGradient3836-0-6-6"
+       id="linearGradient3801-1-3-3"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9-5"
-       id="radialGradient3159-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
     <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-9-5">
+       id="linearGradient3836-0-6-6">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#a40000;stop-opacity:1"
          offset="0"
-         id="stop3146-2-1" />
+         id="stop3838-2-7-7" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
+         style="stop-color:#ef2929;stop-opacity:1"
          offset="1"
-         id="stop3148-6-9" />
+         id="stop3840-5-5-5" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-9-6"
-       id="radialGradient4119"
-       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-9-5"
-       id="radialGradient4121"
-       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-9"
-       id="radialGradient3575"
-       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-9-5"
-       id="radialGradient3577"
-       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" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -174,20 +129,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.953125"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="g4289"
+     inkscape:zoom="8.7726691"
+     inkscape:cx="35.640203"
+     inkscape:cy="27.553678"
+     inkscape:current-layer="g3154"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1"
-     showguides="true"
-     inkscape:guide-bbox="true" />
+     inkscape:window-width="800"
+     inkscape:window-height="837"
+     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="grid2999"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -196,7 +159,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -208,69 +171,58 @@
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <g
-         id="g4250"
-         transform="translate(-2.072175,14.505225)">
+         id="g3242">
         <g
-           id="g3255"
-           transform="translate(43.714324,68.714247)" />
-        <rect
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:7.52541399;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="rect2269"
-           width="46.728394"
-           height="356.66388"
-           x="528.51276"
-           y="82.515877"
-           transform="matrix(0.61982307,0.78474159,-0.75378526,0.65712082,0,0)" />
-        <g
-           transform="matrix(-1.0320043,-0.04067716,0.04159767,-1.0091664,460.95868,1151.1019)"
-           id="g3865">
+           id="g3154"
+           transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)"
+           inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
+           inkscape:export-xdpi="7.0721951"
+           inkscape:export-ydpi="7.0721951">
+          <path
+             style="fill:#d3d7cf;stroke:#2e3436;stroke-width:12.33591747;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 162.40856,627.63483 187.86722,654.49428 -80.727347,909.08082 -106.186,882.22137 z"
+             id="path3061"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:none;stroke:#ffffff;stroke-width:12.33591747;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 173.54199,651.07562 -83.374613,894.59322"
+             id="path3063"
+             inkscape:connector-curvature="0" />
           <g
-             id="g3867">
-            <path
-               d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-               sodipodi:ry="48.57143"
-               sodipodi:rx="48.57143"
-               sodipodi:cy="655.2193"
-               sodipodi:cx="197.14285"
-               id="path3869"
-               style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-               sodipodi:type="arc" />
-            <path
-               transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-               d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-               sodipodi:ry="23.991123"
-               sodipodi:rx="34.345188"
-               sodipodi:cy="672.79736"
-               sodipodi:cx="225.26402"
-               id="path3871"
-               style="fill:url(#radialGradient3575);fill-opacity:1;stroke:none"
-               sodipodi:type="arc" />
+             transform="matrix(-6.1657491,-0.16508637,0.16508637,-6.1657491,251.65298,959.14094)"
+             id="g3827-1-3">
+            <g
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9-5">
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#172a04;stroke-width:1.99999988000000006;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-71-6"
+                 d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-7-3-2"
+                 d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+            </g>
           </g>
-        </g>
-        <g
-           transform="matrix(-1.0320043,-0.04067713,0.0415977,-1.0091664,209.90902,1373.0211)"
-           id="g3865-8">
           <g
-             id="g3867-0">
-            <path
-               d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-               sodipodi:ry="48.57143"
-               sodipodi:rx="48.57143"
-               sodipodi:cy="655.2193"
-               sodipodi:cx="197.14285"
-               id="path3869-1"
-               style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-               sodipodi:type="arc" />
-            <path
-               transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-               d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-               sodipodi:ry="23.991123"
-               sodipodi:rx="34.345188"
-               sodipodi:cy="672.79736"
-               sodipodi:cx="225.26402"
-               id="path3871-5"
-               style="fill:url(#radialGradient3577);fill-opacity:1;stroke:none"
-               sodipodi:type="arc" />
+             transform="matrix(-6.1657491,-0.16508637,0.16508637,-6.1657491,-1.5804401,1199.1674)"
+             id="g3827-1-3-3">
+            <g
+               transform="translate(31.322131,40.570289)"
+               id="g3797-9-5-5">
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:none;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-71-6-6"
+                 d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+              <path
+                 inkscape:connector-curvature="0"
+                 style="fill:url(#linearGradient3801-1-3-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+                 id="path4250-7-3-2-2"
+                 d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+            </g>
           </g>
         </g>
       </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Centre_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Centre_Point.svg
index cf22b46bdd..3f7908ec1c 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Centre_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Centre_Point.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Sketcher_Elements_Parabola_CentrePoint_1 .svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Hyperbolic_Arc_Centre_Point.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"
@@ -109,17 +109,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3042"
-       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"
@@ -158,12 +147,90 @@
        xlink:href="#linearGradient3144"
        id="radialGradient3877"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -172,19 +239,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="25.510773"
+     inkscape:zoom="9.6072693"
+     inkscape:cx="-18.285744"
+     inkscape:cy="29.205051"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="872"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -193,7 +270,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -207,181 +284,27 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         sodipodi:nodetypes="czcczcc"
-         style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.10175991;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1861.6377,479.9977 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         id="path3061"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="m 1844.0077,449.59724 c -0.5068,0.57287 -0.9633,1.15778 -1.4455,1.76209 -15.429,19.34392 -12.4185,47.39954 6.7395,62.60221 19.1579,15.20275 47.2247,11.83879 62.6535,-7.50499 15.4291,-19.344 12.4186,-47.3996 -6.7394,-62.60221 -18.5593,-14.72756 -45.5163,-12.02629 -61.2081,5.7429 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1560.8519,450.34246 c -0.5069,0.57272 -0.9634,1.1577 -1.4456,1.76216 -15.429,19.34392 -12.4184,47.39947 6.7395,62.60221 19.158,15.2026 47.2246,11.83886 62.6536,-7.50506 15.4291,-19.344 12.4185,-47.39952 -6.7395,-62.60222 -18.5593,-14.72749 -45.5163,-12.02622 -61.208,5.74291 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1846.085,467.22228 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.10175991;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <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.272555,1.070644,-0.62008436,-0.40296707,2232.6343,457.54176)"
+         transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)"
          id="g3177" />
       <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.26379798,1.0762112,-0.62386014,-0.38785381,2182.1049,622.99052)"
+         transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)"
          id="g3185" />
       <g
-         id="g3867"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,102.31221,1625.1418)">
-        <path
-           sodipodi:nodetypes="cssssc"
-           inkscape:connector-curvature="0"
-           id="path3766"
-           d="m 1731.4768,571.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
-           style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <circle
-                   id="path3792"
-                   style="display:inline;overflow:visible;visibility:visible;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3800-6"
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,540.96762,1623.8576)">
-        <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">
-              <path
-                 transform="translate(5.2894633,17.505927)"
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-333.40746,231.69921)" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,804.2102,1631.1505)"
-         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">
-              <path
-                 transform="translate(-19.561348,2.5388364)"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-358.25827,216.73211)"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
-      </g>
+         id="g3784"
+         transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-ydpi="7.2934141" />
       <g
          id="g3857"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,106.03882,1415.6269)">
+         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
         <g
            transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
            id="g3028">
@@ -406,6 +329,66 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1061,273.90769 171.1923,0 143.8016,-273.90769 143.8016,-273.90769"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1062,273.9077 171.1924,10e-6 143.8015,-273.9077 143.8015,-273.9077"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1596.2175,460.82391 c 0,0 -41.0862,273.90769 123.2584,273.90769 164.3446,0 136.9539,-273.90769 136.9539,-273.90769"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1721.6818,389.36717)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.5895,389.40446)"
+         id="g3797-7-2-9-5-4-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3079);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.8272,663.27486)"
+         id="g3797-7-2-3">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3292);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Edge.svg
index 562ab6f702..7eaefba23f 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Edge.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Sketcher_Elements_Parabola_Edge .svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Parabolic_Arc_Start_Point.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"
@@ -109,17 +109,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3042"
-       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"
@@ -158,12 +147,148 @@
        xlink:href="#linearGradient3144"
        id="radialGradient3877"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292-1"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3186-7">
+      <stop
+         id="stop3188-4"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190-0"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3052"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-8"
+       xlink:href="#linearGradient3836-9-3-7-2-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-45" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3092"
+       xlink:href="#linearGradient3836-9-3-7-2-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -172,19 +297,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="25.510773"
+     inkscape:zoom="9.6072693"
+     inkscape:cx="-18.285744"
+     inkscape:cy="29.205051"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="872"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -193,7 +328,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -207,181 +342,27 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         sodipodi:nodetypes="czcczcc"
-         style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.10175991;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1861.6377,479.9977 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         id="path3061"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="m 1844.0077,449.59724 c -0.5068,0.57287 -0.9633,1.15778 -1.4455,1.76209 -15.429,19.34392 -12.4185,47.39954 6.7395,62.60221 19.1579,15.20275 47.2247,11.83879 62.6535,-7.50499 15.4291,-19.344 12.4186,-47.3996 -6.7394,-62.60221 -18.5593,-14.72756 -45.5163,-12.02629 -61.2081,5.7429 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1560.8519,450.34246 c -0.5069,0.57272 -0.9634,1.1577 -1.4456,1.76216 -15.429,19.34392 -12.4184,47.39947 6.7395,62.60221 19.158,15.2026 47.2246,11.83886 62.6536,-7.50506 15.4291,-19.344 12.4185,-47.39952 -6.7395,-62.60222 -18.5593,-14.72749 -45.5163,-12.02622 -61.208,5.74291 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1846.085,467.22228 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82053842000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <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.272555,1.070644,-0.62008436,-0.40296707,2232.6343,457.54176)"
+         transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)"
          id="g3177" />
       <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.26379798,1.0762112,-0.62386014,-0.38785381,2182.1049,622.99052)"
+         transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)"
          id="g3185" />
       <g
-         id="g3867"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,102.31221,1625.1418)">
-        <path
-           sodipodi:nodetypes="cssssc"
-           inkscape:connector-curvature="0"
-           id="path3766"
-           d="m 1731.4768,571.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
-           style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <circle
-                   id="path3792"
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3800-6"
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,540.96762,1623.8576)">
-        <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">
-              <path
-                 transform="translate(5.2894633,17.505927)"
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-333.40746,231.69921)" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,804.2102,1631.1505)"
-         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">
-              <path
-                 transform="translate(-19.561348,2.5388364)"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382468;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-358.25827,216.73211)"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
-      </g>
+         id="g3784"
+         transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-ydpi="7.2934141" />
       <g
          id="g3857"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,106.03882,1415.6269)">
+         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
         <g
            transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
            id="g3028">
@@ -406,6 +387,66 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#172a04;stroke-width:54.78153992000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1061,273.90769 171.1923,0 143.8016,-273.90769 143.8016,-273.90769"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#73d216;stroke-width:27.39076996000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1062,273.9077 171.1924,10e-6 143.8015,-273.9077 143.8015,-273.9077"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#8ae234;stroke-width:13.69538498000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1596.2175,460.82391 c 0,0 -41.0862,273.90769 123.2584,273.90769 164.3446,0 136.9539,-273.90769 136.9539,-273.90769"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.5894,389.36717)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.8272,663.27486)"
+         id="g3797-7-2-9-5-4-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3079);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1721.6817,389.36717)"
+         id="g3797-7-2-9-5-4-1">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-7"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3092);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_End_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_End_Point.svg
index 014e9ce614..c88720dbc9 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_End_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_End_Point.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Sketcher_Elements_Parabola_EndPoint .svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Parabolic_Arc_Centre_Point.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"
@@ -109,17 +109,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3042"
-       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"
@@ -158,12 +147,119 @@
        xlink:href="#linearGradient3144"
        id="radialGradient3877"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292-1"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3186-7">
+      <stop
+         id="stop3188-4"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190-0"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3052"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -172,19 +268,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="22.26616"
+     inkscape:zoom="9.6072693"
+     inkscape:cx="-18.285744"
+     inkscape:cy="29.205051"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="872"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -193,7 +299,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -207,181 +313,27 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         sodipodi:nodetypes="czcczcc"
-         style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.10175991;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1861.6377,479.9977 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         id="path3061"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="m 1844.0077,449.59724 c -0.5068,0.57287 -0.9633,1.15778 -1.4455,1.76209 -15.429,19.34392 -12.4185,47.39954 6.7395,62.60221 19.1579,15.20275 47.2247,11.83879 62.6535,-7.50499 15.4291,-19.344 12.4186,-47.3996 -6.7394,-62.60221 -18.5593,-14.72756 -45.5163,-12.02629 -61.2081,5.7429 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1560.8519,450.34246 c -0.5069,0.57272 -0.9634,1.1577 -1.4456,1.76216 -15.429,19.34392 -12.4184,47.39947 6.7395,62.60221 19.158,15.2026 47.2246,11.83886 62.6536,-7.50506 15.4291,-19.344 12.4185,-47.39952 -6.7395,-62.60222 -18.5593,-14.72749 -45.5163,-12.02622 -61.208,5.74291 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1846.085,467.22228 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.10175991;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <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.272555,1.070644,-0.62008436,-0.40296707,2232.6343,457.54176)"
+         transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)"
          id="g3177" />
       <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.26379798,1.0762112,-0.62386014,-0.38785381,2182.1049,622.99052)"
+         transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)"
          id="g3185" />
       <g
-         id="g3867"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,102.31221,1625.1418)">
-        <path
-           sodipodi:nodetypes="cssssc"
-           inkscape:connector-curvature="0"
-           id="path3766"
-           d="m 1731.4768,571.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
-           style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <circle
-                   id="path3792"
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3800-6"
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,540.96762,1623.8576)">
-        <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">
-              <path
-                 transform="translate(5.2894633,17.505927)"
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-333.40746,231.69921)" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,804.2102,1631.1505)"
-         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">
-              <path
-                 transform="translate(-19.561348,2.5388364)"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382467999999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-358.25827,216.73211)"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
-      </g>
+         id="g3784"
+         transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-ydpi="7.2934141" />
       <g
          id="g3857"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,106.03882,1415.6269)">
+         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
         <g
            transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
            id="g3028">
@@ -406,6 +358,66 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1061,273.90769 171.1923,0 143.8016,-273.90769 143.8016,-273.90769"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1062,273.9077 171.1924,10e-6 143.8015,-273.9077 143.8015,-273.9077"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1596.2175,460.82391 c 0,0 -41.0862,273.90769 123.2584,273.90769 164.3446,0 136.9539,-273.90769 136.9539,-273.90769"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1721.6818,389.36717)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.6287,389.36717)"
+         id="g3797-7-2-3-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3052);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.8272,663.27486)"
+         id="g3797-7-2-9-5-4-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3079);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Start_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Start_Point.svg
index f92298d82d..b0c6fa662c 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Start_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Start_Point.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Sketcher_Elements_Parabola_StartPoint .svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Parabolic_Arc_End_Point.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"
@@ -109,17 +109,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3042"
-       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"
@@ -158,12 +147,119 @@
        xlink:href="#linearGradient3144"
        id="radialGradient3877"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292-1"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3186-7">
+      <stop
+         id="stop3188-4"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190-0"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3052"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -172,19 +268,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="22.26616"
+     inkscape:zoom="9.6072693"
+     inkscape:cx="-18.285744"
+     inkscape:cy="29.205051"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="872"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -193,7 +299,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -207,181 +313,27 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         sodipodi:nodetypes="czcczcc"
-         style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.10175991;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1861.6377,479.9977 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         id="path3061"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="m 1844.0077,449.59724 c -0.5068,0.57287 -0.9633,1.15778 -1.4455,1.76209 -15.429,19.34392 -12.4185,47.39954 6.7395,62.60221 19.1579,15.20275 47.2247,11.83879 62.6535,-7.50499 15.4291,-19.344 12.4186,-47.3996 -6.7394,-62.60221 -18.5593,-14.72756 -45.5163,-12.02629 -61.2081,5.7429 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1560.8519,450.34246 c -0.5069,0.57272 -0.9634,1.1577 -1.4456,1.76216 -15.429,19.34392 -12.4184,47.39947 6.7395,62.60221 19.158,15.2026 47.2246,11.83886 62.6536,-7.50506 15.4291,-19.344 12.4185,-47.39952 -6.7395,-62.60222 -18.5593,-14.72749 -45.5163,-12.02622 -61.208,5.74291 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1846.085,467.22228 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.10175991;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <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.272555,1.070644,-0.62008436,-0.40296707,2232.6343,457.54176)"
+         transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)"
          id="g3177" />
       <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.26379798,1.0762112,-0.62386014,-0.38785381,2182.1049,622.99052)"
+         transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)"
          id="g3185" />
       <g
-         id="g3867"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,102.31221,1625.1418)">
-        <path
-           sodipodi:nodetypes="cssssc"
-           inkscape:connector-curvature="0"
-           id="path3766"
-           d="m 1731.4768,571.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
-           style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <circle
-                   id="path3792"
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382486;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-                   cx="197.14285"
-                   cy="655.2193"
-                   r="48.57143" />
-                <ellipse
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   cx="225.26402"
-                   cy="672.79736"
-                   rx="34.345188"
-                   ry="23.991123" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3800-6"
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,540.96762,1623.8576)">
-        <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">
-              <path
-                 transform="translate(5.2894633,17.505927)"
-                 sodipodi:type="arc"
-                 style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.34382468;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-333.40746,231.69921)" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,804.2102,1631.1505)"
-         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">
-              <path
-                 transform="translate(-19.561348,2.5388364)"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-358.25827,216.73211)"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
-      </g>
+         id="g3784"
+         transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-ydpi="7.2934141" />
       <g
          id="g3857"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,106.03882,1415.6269)">
+         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
         <g
            transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
            id="g3028">
@@ -406,6 +358,66 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1061,273.90769 171.1923,0 143.8016,-273.90769 143.8016,-273.90769"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1062,273.9077 171.1924,10e-6 143.8015,-273.9077 143.8015,-273.9077"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1596.2175,460.82391 c 0,0 -41.0862,273.90769 123.2584,273.90769 164.3446,0 136.9539,-273.90769 136.9539,-273.90769"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.5894,389.36717)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1721.7211,389.36717)"
+         id="g3797-7-2-3-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#8ae234;stroke:#172a04;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3052);fill-opacity:1;stroke:#8ae234;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.8272,663.27486)"
+         id="g3797-7-2-9-5-4-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3079);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Point_StartingPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Point_StartingPoint.svg
index fdde9d9ef4..59ddb527fc 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Point_StartingPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Point_StartingPoint.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Element_Point_StartingPoint.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreatePoint.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/yorik/Sources/FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePoint.svg.png"
@@ -98,6 +98,27 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836"
+       id="linearGradient3922"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1733561,0.02175327,0.02175328,1.1801291,55.592501,-17.013229)"
+       x1="11.390151"
+       y1="453.55045"
+       x2="54.509644"
+       y2="485.54004" />
+    <linearGradient
+       id="linearGradient3836">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3838" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3840" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -106,18 +127,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="33.923816"
-     inkscape:cy="34.035026"
-     inkscape:current-layer="g4289"
+     inkscape:zoom="12.406428"
+     inkscape:cx="27.467899"
+     inkscape:cy="37.476671"
+     inkscape:current-layer="g3906"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="800"
+     inkscape:window-height="837"
+     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="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -126,7 +157,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -137,26 +168,31 @@
     <g
        id="g4289"
        transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
-      <path
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path3162"
-         style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.09976672999999980;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc"
-         transform="matrix(-1.135537,-0.02584692,0.02579869,-1.13766,366.91582,1358.1743)" />
-      <path
-         transform="matrix(-0.9802212,0.57489869,-0.57382585,-0.98205382,757.04461,1123.2494)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path3164"
-         style="fill:url(#radialGradient3767);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+      <g
+         style="stroke:#3465a4;stroke-width:0.97375208"
+         id="g4312"
+         transform="matrix(12.667234,0.1943747,-0.1943834,12.666657,-1553.0403,-2583.642)">
+        <g
+           style="stroke:#3465a4;stroke-width:6.49510956"
+           transform="matrix(-0.1153544,-0.09575809,0.09575809,-0.1153544,98.667777,319.83687)"
+           id="g4248">
+          <g
+             transform="translate(-3.7314339,-3.2817175)"
+             id="g3906"
+             style="stroke-width:6.49510956">
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:none;fill-opacity:1;stroke:#172a04;stroke-width:6.49510956000000039;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="path4250"
+               d="m 145.08885,535.18229 a 48.571431,48.571431 0 1 1 -97.142854,0 48.571431,48.571431 0 1 1 97.142854,0 z" />
+            <path
+               inkscape:connector-curvature="0"
+               style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#8ae234;stroke-width:6.49510956000000039;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+               id="path4250-7"
+               d="m 138.55997,535.14385 a 42.216398,42.21834 49.289969 1 1 -84.435028,0.002 42.216398,42.21834 49.289969 0 1 84.435028,-0.002 z" />
+          </g>
+        </g>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_SelectionTypeInvalid.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_SelectionTypeInvalid.svg
index 81ab1ee18a..936de90018 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_SelectionTypeInvalid.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_SelectionTypeInvalid.svg
@@ -14,13 +14,25 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Selection_Type_Invalid.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_SelectionTypeInvalid.svg"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Selection_Type_Invalid_32px.png"
    inkscape:export-xdpi="45"
    inkscape:export-ydpi="45">
   <defs
      id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3846">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3848" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3850" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3602">
       <stop
@@ -476,14 +488,15 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
-    <filter
+    <linearGradient
        inkscape:collect="always"
-       id="filter8824">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.985625"
-         id="feGaussianBlur8826" />
-    </filter>
+       xlink:href="#linearGradient3846"
+       id="linearGradient3852"
+       x1="36"
+       y1="57"
+       x2="22"
+       y2="8"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -493,17 +506,27 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8.625"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:cx="13.565217"
+     inkscape:cy="32.057971"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
-     inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3058"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -512,7 +535,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -521,10 +544,16 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="color:#000000;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.92547667;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 5.7325823,13.431254 22.896018,32.192215 5.7593743,47.626469 13.114317,56.365063 31.005035,39.82019 49.042931,57.394117 57.921408,49.112971 39.553507,31.672405 58.171114,14.231839 50.120519,5.7251298 31.464068,24.151629 13.550632,5.6406682 z"
+       style="color:#000000;fill:url(#linearGradient3852);fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:1.99999988000000010;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 3,13 22,32 3,51 13,61 32,42 51,61 61,51 42,32 61,13 51,3 32,22 13,3 z"
        id="rect8776"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ef2929;stroke-width:2;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 6,13 25,32 6,51 13,58 32,39 51,59 59,51 39,32 58,13 51,6 32,25 13,6 z"
+       id="rect8776-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc.svg
index a45455787e..b800f6e38b 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Elliptical_Arc_2 .svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Elliptical_Arc_Start_Point.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"
@@ -120,6 +120,209 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3077"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-7"
+       id="linearGradient3077-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096"
+       xlink:href="#linearGradient3836-9-3-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096-8"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136-2"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-2"
+       xlink:href="#linearGradient3836-9-3-7-2-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3245"
+       xlink:href="#linearGradient3836-9-3-7-2-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-6"
+       xlink:href="#linearGradient3836-9-3-7-2-7-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-1">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3311"
+       xlink:href="#linearGradient3836-9-3-7-2-7-1"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -129,18 +332,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:cx="43.294351"
+     inkscape:cy="30.796664"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3032"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -163,245 +376,79 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.7815361;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1719.7529,460.82391 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-15"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
       <g
-         id="g4428"
-         transform="matrix(0.97101795,-0.51388787,0.10495416,0.74126913,37.992895,1047.7457)">
+         transform="matrix(6.8476923,0,0,6.8476923,1749.0726,663.31215)"
+         id="g3797-7-2-9">
         <path
            inkscape:connector-curvature="0"
-           id="path3838"
-           d="m 1752.5697,762.50099 c -24.091,16.57792 4.2988,7.92094 -39.5369,9.24735 -79.5,2.40556 -145.124,-80.93598 -143.4624,-160.14694 1.7342,-82.67482 92.7763,-162.62895 172.0928,-168.62766 l -18.7702,-60.33325 c -95.9615,-1.39005 -209.0031,103.24499 -187.6043,228.96091 17.9746,105.59892 91.754,228.15545 190.2919,222.99665 83.3226,-4.36224 2.7715,-2.69311 39.3796,-27.56666 z"
-           style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:nodetypes="cssccsscc" />
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
         <path
-           sodipodi:nodetypes="cssccsscc"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 1767.291,742.73351 c -24.091,16.57792 -20.7737,7.02452 -64.6094,8.35093 -79.5,2.40556 -145.124,-80.93598 -143.4624,-160.14694 1.7342,-82.67482 92.7763,-162.62895 172.0928,-168.62766 l -18.7702,-60.33325 c -98.6095,-6.58983 -223.9927,116.73924 -198.982,249.54772 19.9319,105.83907 103.1317,207.56864 201.6696,202.40984 83.3226,-4.36224 35.0823,21.20517 71.6904,-3.66838 z"
-           id="path4425"
-           inkscape:connector-curvature="0" />
-        <g
-           id="g3177"
-           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="g3185"
-           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" />
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3096);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3867"
-         transform="translate(88.872457,-30.549907)">
+         transform="matrix(6.8476923,0,0,6.8476923,1968.238,485.27215)"
+         id="g3797-7-2-9-5-4">
         <path
-           sodipodi:nodetypes="cssssc"
            inkscape:connector-curvature="0"
-           id="path3766"
-           d="m 1745.4647,564.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3845"
-         transform="translate(88.317004,-66.654343)">
+         transform="matrix(6.8476923,0,0,6.8476923,1954.5426,635.92138)"
+         id="g3797-7-2-9-5-4-8">
         <path
-           sodipodi:nodetypes="cssssc"
            inkscape:connector-curvature="0"
-           id="path3766-1"
-           d="m 1657.4054,486.58594 c -0.7645,0.0211 -1.5036,0.0873 -2.2744,0.14812 -24.6668,1.94685 -43.0989,23.31119 -41.1139,47.68757 1.9852,24.37639 23.615,42.57531 48.2818,40.62846 24.6669,-1.94687 43.099,-23.31117 41.1139,-47.68759 -1.9232,-23.61463 -22.3112,-41.45576 -46.0074,-40.77655 z"
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)"
-           id="g3800-6">
-          <g
-             id="g3778-7"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780-2">
-              <g
-                 id="g3784-5"
-                 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="g3790-2"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792-8"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794-5"
-                   style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-5"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3245);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-7"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3058"
-         transform="translate(-27.21719,-3.3327171)">
+         transform="matrix(6.8476923,0,0,6.8476923,1858.6749,389.40446)"
+         id="g3797-7-2-9-5-4-2">
         <path
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 1863.3852,693.17024 c -0.7646,0.0212 -1.5036,0.0874 -2.2743,0.14812 -24.6668,1.94685 -43.099,23.31118 -41.1139,47.68757 1.985,24.37639 23.6151,42.5753 48.2817,40.62845 24.6669,-1.94686 43.0991,-23.31117 41.1139,-47.68758 -1.9231,-23.61462 -22.3111,-41.45576 -46.0074,-40.77656 z"
-           id="path3035"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cssssc" />
-        <g
-           id="g3019"
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,290.18417,740.97568)">
-          <g
-             transform="translate(-10.941933,-540.84412)"
-             id="g3021">
-            <g
-               id="g3023">
-              <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="g3025" />
-              <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="g3027">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3857"
-         transform="translate(38.326247,4.4436229)">
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-7"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
         <path
-           sodipodi:nodetypes="cssssc"
            inkscape:connector-curvature="0"
-           id="path3025"
-           d="m 1592.3242,692.05934 c -0.7646,0.0212 -1.5036,0.0874 -2.2743,0.14812 -24.6668,1.94685 -43.099,23.31118 -41.1139,47.68757 1.985,24.37639 23.6151,42.5753 48.2817,40.62845 24.6669,-1.94686 43.0991,-23.31117 41.1139,-47.68758 -1.9231,-23.61462 -22.3111,-41.45576 -46.0074,-40.77656 z"
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
-           id="g3028">
-          <g
-             id="g3030"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3032">
-              <g
-                 id="g3034"
-                 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="g3036"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3038"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3040"
-                   style="fill:url(#radialGradient3042);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+           style="fill:url(#linearGradient3311);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-9"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc_Constr.svg
index 2015688cec..9ab1f7245c 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc_Constr.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_Elliptical_Arc_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Elliptical_Arc.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"
@@ -120,6 +120,209 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3262"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3264"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3"
+       id="linearGradient3077"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-7"
+       id="linearGradient3077-1"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-9-3-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096"
+       xlink:href="#linearGradient3836-9-3-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3096-8"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136"
+       xlink:href="#linearGradient3836-9-3-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3136-2"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-2"
+       xlink:href="#linearGradient3836-9-3-7-2-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-6" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3245"
+       xlink:href="#linearGradient3836-9-3-7-2-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-6"
+       xlink:href="#linearGradient3836-9-3-7-2-7-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-1">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3311"
+       xlink:href="#linearGradient3836-9-3-7-2-7-1"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -128,19 +331,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.6072693"
-     inkscape:cx="26.013245"
-     inkscape:cy="26.144185"
+     inkscape:zoom="12.328125"
+     inkscape:cx="43.294351"
+     inkscape:cy="30.796664"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3032"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -164,240 +377,78 @@
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
       <path
-         sodipodi:nodetypes="cssccsscc"
-         style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;enable-background:accumulate"
-         d="m 1819.7972,712.33984 c -21.6529,24.66877 5.0055,3.66244 -37.4205,27.1723 -76.9435,42.63726 -149.4126,14.58212 -156.1127,-44.98839 -6.9931,-62.17548 73.0189,-168.22844 149.4071,-213.43488 l -24.5585,-35.0774 c -93.3262,48.28305 -192.1097,183.93648 -158.1367,266.12923 28.5367,69.04029 113.0406,121.97332 208.1813,67.51183 80.4499,-46.05207 2.4085,-3.42056 35.345,-40.67101 z"
-         id="path3838"
-         inkscape:connector-curvature="0" />
-      <path
+         style="fill:none;stroke:#0b1521;stroke-width:54.78153609999999700;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159"
          inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1832.0172,690.12172 c -21.6529,24.66877 -19.4344,15.88241 -61.8605,39.39227 -76.9434,42.63725 -149.4125,14.58212 -156.1126,-44.9884 -6.9932,-62.17547 73.0188,-168.22843 149.407,-213.43488 l -24.5584,-35.0774 c -96.4433,45.78939 -205.2487,201.64233 -167.0241,287.23646 30.4625,68.21248 121.928,100.8661 217.0686,46.40461 80.4499,-46.05207 36.2911,-2.30963 69.2277,-39.56009 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.10175991;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="cssccsscc" />
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#3465a4;stroke-width:27.39076996000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1726.6005,467.67157 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-1"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:13.69538498000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1719.7529,460.82391 c 0,0 -211.6653,189.43271 -109.2466,280.64105 102.4187,91.20835 204.8373,-28.0641 204.8373,-28.0641"
+         id="path3159-15"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
       <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.9680744,0.53235022,-0.12931811,-0.72812354,2190.7606,902.97673)"
-         id="g3177" />
-      <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.96615783,0.54254853,-0.14293457,-0.72055656,2035.4163,979.09945)"
-         id="g3185" />
-      <g
-         id="g3867"
-         transform="translate(88.872457,-30.549907)">
+         transform="matrix(6.8476923,0,0,6.8476923,1749.0726,663.31215)"
+         id="g3797-7-2-9">
         <path
-           sodipodi:nodetypes="cssssc"
            inkscape:connector-curvature="0"
-           id="path3766"
-           d="m 1745.4647,564.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3096);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3845"
-         transform="translate(88.317004,-66.654343)">
+         transform="matrix(6.8476923,0,0,6.8476923,1968.238,485.27215)"
+         id="g3797-7-2-9-5-4">
         <path
-           sodipodi:nodetypes="cssssc"
            inkscape:connector-curvature="0"
-           id="path3766-1"
-           d="m 1657.4054,486.58594 c -0.7645,0.0211 -1.5036,0.0873 -2.2744,0.14812 -24.6668,1.94685 -43.0989,23.31119 -41.1139,47.68757 1.9852,24.37639 23.615,42.57531 48.2818,40.62846 24.6669,-1.94687 43.099,-23.31117 41.1139,-47.68759 -1.9232,-23.61463 -22.3112,-41.45576 -46.0074,-40.77655 z"
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)"
-           id="g3800-6">
-          <g
-             id="g3778-7"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780-2">
-              <g
-                 id="g3784-5"
-                 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="g3790-2"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792-8"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794-5"
-                   style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3058"
-         transform="translate(-27.21719,-3.3327171)">
+         transform="matrix(6.8476923,0,0,6.8476923,1954.5426,635.92138)"
+         id="g3797-7-2-9-5-4-8">
         <path
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 1863.3852,693.17024 c -0.7646,0.0212 -1.5036,0.0874 -2.2743,0.14812 -24.6668,1.94685 -43.099,23.31118 -41.1139,47.68757 1.985,24.37639 23.6151,42.5753 48.2817,40.62845 24.6669,-1.94686 43.0991,-23.31117 41.1139,-47.68758 -1.9231,-23.61462 -22.3111,-41.45576 -46.0074,-40.77656 z"
-           id="path3035"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cssssc" />
-        <g
-           id="g3019"
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,290.18417,740.97568)">
-          <g
-             transform="translate(-10.941933,-540.84412)"
-             id="g3021">
-            <g
-               id="g3023">
-              <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="g3025" />
-              <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="g3027">
-                <path
-                   sodipodi:type="arc"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   id="path3029"
-                   sodipodi:cx="197.14285"
-                   sodipodi:cy="655.2193"
-                   sodipodi:rx="48.57143"
-                   sodipodi:ry="48.57143"
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-                <path
-                   sodipodi:type="arc"
-                   style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                   id="path3031"
-                   sodipodi:cx="225.26402"
-                   sodipodi:cy="672.79736"
-                   sodipodi:rx="34.345188"
-                   sodipodi:ry="23.991123"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
-              </g>
-            </g>
-          </g>
-        </g>
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-5"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3245);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-7"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
       <g
-         id="g3857"
-         transform="translate(38.326247,4.4436229)">
+         transform="matrix(6.8476923,0,0,6.8476923,1858.6749,389.40446)"
+         id="g3797-7-2-9-5-4-2">
         <path
-           sodipodi:nodetypes="cssssc"
            inkscape:connector-curvature="0"
-           id="path3025"
-           d="m 1592.3242,692.05934 c -0.7646,0.0212 -1.5036,0.0874 -2.2743,0.14812 -24.6668,1.94685 -43.099,23.31118 -41.1139,47.68757 1.985,24.37639 23.6151,42.5753 48.2817,40.62845 24.6669,-1.94686 43.0991,-23.31117 41.1139,-47.68758 -1.9231,-23.61462 -22.3111,-41.45576 -46.0074,-40.77656 z"
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
-           id="g3028">
-          <g
-             id="g3030"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3032">
-              <g
-                 id="g3034"
-                 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="g3036"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3038"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3040"
-                   style="fill:url(#radialGradient3042);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-7"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3311);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-9"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_External.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_External.svg
index 16fff219f9..439463ecfd 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_External.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_External.svg
@@ -14,12 +14,48 @@
    height="64px"
    id="svg2682"
    sodipodi:version="0.32"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="Sketcher_ExternalGeometry.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_External.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs2684">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3963">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1;"
+         offset="0"
+         id="stop3965" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3967" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3841">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3843" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop3845" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3815">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3817" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3819" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3593">
       <stop
@@ -183,6 +219,122 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3815"
+       id="linearGradient3821"
+       x1="80"
+       y1="58"
+       x2="79"
+       y2="42"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3841"
+       id="linearGradient3847"
+       x1="109"
+       y1="51"
+       x2="105"
+       y2="38"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3815"
+       id="linearGradient3856"
+       gradientUnits="userSpaceOnUse"
+       x1="80"
+       y1="58"
+       x2="79"
+       y2="42" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3841"
+       id="linearGradient3858"
+       gradientUnits="userSpaceOnUse"
+       x1="109"
+       y1="51"
+       x2="105"
+       y2="38" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3070"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.77114848,0,0,0.77113937,-4.4090973,2.5859051)" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3070-4"
+       xlink:href="#linearGradient3836-9-3-7-2-7-0"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.77114848,0,0,0.77113937,-4.4090973,2.5859051)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-0">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-9" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-4" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.77114848,0,0,0.77113937,-4.4090973,2.5859051)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3898"
+       xlink:href="#linearGradient3836-9-3-7-2-7-0"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3963"
+       id="linearGradient3969"
+       x1="-13"
+       y1="35"
+       x2="-20"
+       y2="38"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3963"
+       id="linearGradient3978"
+       gradientUnits="userSpaceOnUse"
+       x1="-15"
+       y1="37"
+       x2="-19"
+       y2="37"
+       gradientTransform="matrix(0.96592583,0.25881905,-0.25881905,0.96592583,65.618106,-9.6525251)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -191,20 +343,30 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.75"
-     inkscape:cx="32.503442"
-     inkscape:cy="32.363888"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="11"
+     inkscape:cx="-0.39732898"
+     inkscape:cy="24.854934"
+     inkscape:current-layer="g3971"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="731"
-     inkscape:window-height="714"
-     inkscape:window-x="627"
-     inkscape:window-y="24"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-maximized="0" />
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3021"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2687">
     <rdf:RDF>
@@ -221,121 +383,86 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       style="opacity:0.63899997;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="m 24.257911,6.8069236 c -2.019907,-0.045891 -3.69902,1.5547807 -3.74491,3.5746854 -0.04588,2.019906 1.55478,3.699019 3.574686,3.74491 1.289834,0.02931 2.423988,-0.606291 3.098062,-1.600098 l 3.472553,0.238313 0.238313,-3.2342395 -3.268286,-0.2383127 C 27.14871,7.8777218 25.837699,6.842816 24.257911,6.8069236 z m 9.260141,3.064017 -0.204269,3.2682844 7.319598,0.476625 0.238312,-3.234241 -7.353641,-0.5106684 z M 60.00478,10.109253 c -1.333901,-0.03031 -2.503016,0.649991 -3.166152,1.702231 l -3.336374,-0.238313 -0.238312,3.268285 3.23424,0.204268 c 0.50836,1.360148 1.830081,2.314084 3.370419,2.34908 2.019907,0.04588 3.664975,-1.520736 3.710866,-3.540642 0.04588,-2.019906 -1.554782,-3.699019 -3.574687,-3.744909 z m -16.477604,0.612802 -0.238313,3.268285 7.353641,0.476625 0.204268,-3.23424 -7.319596,-0.51067 z"
-       id="rect2423-8"
-       inkscape:connector-curvature="0" />
-    <rect
-       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect2423"
-       width="7.349761"
-       height="3.2594593"
-       x="23.12355"
-       y="4.2783251"
-       transform="matrix(0.99775385,0.06698693,-0.06698693,0.99775385,0,0)" />
-    <rect
-       transform="matrix(0.99775385,0.06698693,-0.06698693,0.99775385,0,0)"
-       y="4.4606843"
-       x="33.140881"
-       height="3.2594593"
-       width="7.349761"
-       id="rect3790"
-       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <rect
-       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3792"
-       width="7.349761"
-       height="3.2594593"
-       x="43.158211"
-       y="4.6430392"
-       transform="matrix(0.99775385,0.06698693,-0.06698693,0.99775385,0,0)" />
-    <rect
-       transform="matrix(0.99775385,0.06698693,-0.06698693,0.99775385,0,0)"
-       y="4.8253989"
-       x="53.175541"
-       height="3.2594593"
-       width="7.349761"
-       id="rect3794"
-       style="fill:#0000ff;fill-rule:evenodd;stroke:#000000;stroke-width:0.8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       inkscape:connector-curvature="0"
-       style="opacity:0.63944204999999998;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       d="m 35.22801,62.082818 23.818018,-6.939108 3.000696,-2.250521 0,-8.439456 -7.689282,-1.12526 -19.129432,18.754345 z"
-       id="path3379"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       id="rect2568"
-       d="M 2.8253317,38.318924 34.925759,41.227205 34.663359,61.147838 3.000266,57.977155 2.8253317,38.318924 z"
-       style="fill:url(#radialGradient3009);fill-opacity:1;fill-rule:evenodd;stroke:#4b4dba;stroke-width:2.26927567;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       id="path3375"
-       d="m 34.619624,41.292805 19.942501,-9.074712 -0.34987,19.133428 -19.767566,9.861916 0.174935,-19.920632 z"
-       style="fill:url(#radialGradient3006);fill-opacity:1;fill-rule:evenodd;stroke:#4b4dba;stroke-width:2.269068;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:url(#radialGradient3003);fill-opacity:1;fill-rule:evenodd;stroke:#4b4dba;stroke-width:2.26927567;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 21.990435,29.305757 33.17952,2.454145 -19.898052,9.498701 -33.1795186,-2.454146 19.8980506,-9.4987 z"
-       id="rect3633"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc"
-       style="fill:url(#radialGradient3000);fill-opacity:1;fill-rule:evenodd;stroke:#000137;stroke-width:0.93473428;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 42.694728,16.374758 -5.993159,5.021969 1.972786,0.99536 -3.014928,6.2008 2.037714,1.028119 3.014928,-6.2008 1.693097,0.854246 0.289562,-7.899694 z"
-       id="rect3638" />
     <g
-       id="g3823"
-       transform="matrix(1.0894284,0,0,1.0894284,-6.9903951,0.70522585)"
-       style="stroke-width:0.73433004;stroke-miterlimit:4;stroke-dasharray:none">
+       id="g3849"
+       transform="translate(-60,0)">
       <path
-         transform="matrix(-0.06911757,-0.00157031,0.00157031,-0.06911757,40.495716,51.61398)"
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path2339"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:10.62162042;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3023"
+         d="m 63,39 0,20 32,2 0,-20 z"
+         style="fill:url(#linearGradient3856);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
       <path
-         transform="matrix(-0.05966385,0.03492748,-0.03492748,-0.05966385,64.241975,37.341318)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path2341"
-         style="fill:url(#radialGradient3803);fill-opacity:1;stroke:none;stroke-width:10.62162097;stroke-miterlimit:4;stroke-dasharray:none"
-         sodipodi:type="arc" />
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3025"
+         d="M 95,61 115,51 115,31 95,41 z"
+         style="fill:url(#linearGradient3858);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3027"
+         d="M 63,39 83,29 115,31 95,41 z"
+         style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3023-1"
+         d="M 65,41 65,57.1 93,59 93,42.836 z"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path3025-7"
+         d="M 97.000001,57.8 113,49.767 113,34.2 97,42 z"
+         style="fill:none;stroke:#3465a4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:6, 6;stroke-dashoffset:0"
+       d="m 22,8 34,2"
+       id="path3921"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:6, 6;stroke-dashoffset:0"
+       d="m 22,8 34,2"
+       id="path3921-4"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(0.55575785,0,0,0.5557489,32.728049,1.658384)"
+       id="g3797-7-2-9-5-4-8">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:3.59871817;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9-4-1-2-8"
+         d="M -26.134232,5.5611183 A 8.9934886,8.9930783 0.02042283 1 1 -12.472321,17.260305 8.9934886,8.9930783 0.02042283 1 1 -26.134232,5.5611183 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3898);fill-opacity:1;stroke:#ef2929;stroke-width:3.59871721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1-8-7-3-2"
+         d="m -23.405252,7.9018222 a 5.3980391,5.3979757 0 1 1 8.200075,7.0223128 5.3980391,5.3979757 0 0 1 -8.200075,-7.0223128 z" />
     </g>
     <g
-       id="g3817"
-       transform="matrix(1.0894284,0,0,1.0894284,28.779657,3.9905035)">
+       transform="matrix(0.55575785,0,0,0.5557489,66.727904,3.658553)"
+       id="g3797-7-2-9-5-4">
       <path
-         sodipodi:type="arc"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:12.29471302;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3813"
-         sodipodi:cx="197.14285"
-         sodipodi:cy="655.2193"
-         sodipodi:rx="48.57143"
-         sodipodi:ry="48.57143"
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         transform="matrix(-0.06911757,-0.00157031,0.00157031,-0.06911757,40.495716,51.61398)" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:3.59871817;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9-4-1-2"
+         d="M -26.134232,5.5611183 A 8.9934886,8.9930783 0.02042283 1 1 -12.472321,17.260305 8.9934886,8.9930783 0.02042283 1 1 -26.134232,5.5611183 z" />
       <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient3821);fill-opacity:1;stroke:none"
-         id="path3815"
-         sodipodi:cx="225.26402"
-         sodipodi:cy="672.79736"
-         sodipodi:rx="34.345188"
-         sodipodi:ry="23.991123"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         transform="matrix(-0.05966385,0.03492748,-0.03492748,-0.05966385,64.241975,37.341318)" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3070);fill-opacity:1;stroke:#ef2929;stroke-width:3.59871721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1-8-7-3"
+         d="m -23.405252,7.9018222 a 5.3980391,5.3979757 0 1 1 8.200075,7.0223128 5.3980391,5.3979757 0 0 1 -8.200075,-7.0223128 z" />
+    </g>
+    <g
+       id="g3971">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         inkscape:connector-curvature="0"
+         id="path3941"
+         d="m 40,28 -3.863704,-1.035276 2.070553,-7.727407 -3.863704,-1.035276 7.607289,-5.208567 3.983821,8.314395 -3.863703,-1.035276 z"
+         style="fill:url(#linearGradient3978);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc.svg
index 3719a9718a..01043ff906 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_hyperbolic_Arc.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Hyperbolic_Arc_Centre_Point.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"
@@ -125,7 +125,7 @@
        xlink:href="#linearGradient3144"
        id="radialGradient3068"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,22.277307,-2338.9406)"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
@@ -136,7 +136,7 @@
        xlink:href="#linearGradient3144-3"
        id="radialGradient3855"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,54.210532,-2025.4485)"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
@@ -153,17 +153,171 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3877-3"
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292-1"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3186-7">
+      <stop
+         id="stop3188-4"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190-0"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3052"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079-8"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3092"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3092-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-1">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3132"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-1"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -173,18 +327,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="9.6072693"
-     inkscape:cx="-2.7390771"
-     inkscape:cy="29.100963"
+     inkscape:cx="-34.835712"
+     inkscape:cy="29.205051"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -207,12 +371,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1863.8594,447.43429 c -19.6625,72.36649 -68.5191,199.75839 -148.6292,199.4929 -80.1101,-0.26549 -107.4122,-133.80986 -129.3461,-201.03675 l -50.1698,0.63758 c 25.0731,67.00447 46.9944,246.18973 179.5397,245.98881 132.5453,-0.20092 174.418,-166.54156 192.4996,-244.93152 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82053852;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <g
          inkscape:export-ydpi="7.2934141"
          inkscape:export-xdpi="7.2934141"
@@ -231,57 +389,6 @@
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
          inkscape:export-xdpi="7.2934141"
          inkscape:export-ydpi="7.2934141" />
-      <g
-         id="g4331">
-        <ellipse
-           ry="44.30632"
-           rx="44.825119"
-           id="path3792"
-           style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-           cx="-462.61719"
-           cy="-1826.1677" />
-        <ellipse
-           transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-           id="path3794"
-           style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-           cx="573.53253"
-           cy="-1787.5104"
-           rx="31.560532"
-           ry="21.97986" />
-      </g>
-      <ellipse
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3792-8"
-         cx="-627.8316"
-         cy="-1500.225"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-         id="path3794-5"
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-         cx="261.21048"
-         cy="-1594.8789"
-         rx="31.560532"
-         ry="21.97986" />
-      <ellipse
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         id="path3029"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82054758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         cx="-820.81836"
-         cy="-1749.311"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-         id="path3031"
-         style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-         cx="229.27725"
-         cy="-1908.371"
-         rx="31.560532"
-         ry="21.97986" />
       <g
          id="g3857"
          transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
@@ -309,25 +416,79 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1603.0652,467.6716 c 0,0 -10e-5,136.95384 116.4107,136.95384 116.4108,0 130.1062,-136.95384 130.1062,-136.95384"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1603.0652,467.6716 c 0,0 0,136.95385 116.4108,136.95385 116.4107,0 130.1061,-136.95385 130.1061,-136.95385"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1609.9129,460.82391 c 0,0 -6.8478,136.95384 109.563,136.95384 116.4107,0 123.2585,-136.95384 123.2585,-136.95384"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
       <g
-         transform="translate(0.43542052,-109.34751)"
-         id="g4331-5">
-        <ellipse
-           ry="44.30632"
-           rx="44.825119"
-           id="path3792-3"
-           style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-           cx="-462.61719"
-           cy="-1826.1677" />
-        <ellipse
-           transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-           id="path3794-56"
-           style="fill:url(#radialGradient3877-3);fill-opacity:1;stroke:none"
-           cx="573.53253"
-           cy="-1787.5104"
-           rx="31.560532"
-           ry="21.97986" />
+         transform="matrix(6.8476923,0,0,6.8476923,1721.6818,389.36717)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.5895,389.40446)"
+         id="g3797-7-2-9-5-4-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3079);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.7879,663.27486)"
+         id="g3797-7-2-9-5-4-9-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3092);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-7"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.7879,526.32101)"
+         id="g3797-7-2-9-5-4-9-5-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3132);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-7-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc_Constr.svg
index 02b846e2e5..01a220e677 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc_Constr.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Sketcher_Hyperbolic_Arc_Constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Hyperbolic_Arc.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"
@@ -125,7 +125,7 @@
        xlink:href="#linearGradient3144"
        id="radialGradient3068"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,22.277307,-2338.9406)"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
@@ -136,7 +136,7 @@
        xlink:href="#linearGradient3144-3"
        id="radialGradient3855"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,54.210532,-2025.4485)"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
@@ -153,17 +153,171 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3877-3"
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292-1"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3186-7">
+      <stop
+         id="stop3188-4"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190-0"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3052"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079-8"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3092"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3092-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-1">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-2" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3132"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-1"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -173,18 +327,28 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="9.6072693"
-     inkscape:cx="-2.7390771"
-     inkscape:cy="29.100963"
+     inkscape:cx="-34.835712"
+     inkscape:cy="29.205051"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
      inkscape:window-width="1920"
-     inkscape:window-height="995"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -207,12 +371,6 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1863.8594,447.43429 c -19.6625,72.36649 -68.5191,199.75839 -148.6292,199.4929 -80.1101,-0.26549 -107.4122,-133.80986 -129.3461,-201.03675 l -50.1698,0.63758 c 25.0731,67.00447 46.9944,246.18973 179.5397,245.98881 132.5453,-0.20092 174.418,-166.54156 192.4996,-244.93152 z"
-         style="display:inline;overflow:visible;visibility:visible;fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82053852;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <g
          inkscape:export-ydpi="7.2934141"
          inkscape:export-xdpi="7.2934141"
@@ -231,57 +389,6 @@
          inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
          inkscape:export-xdpi="7.2934141"
          inkscape:export-ydpi="7.2934141" />
-      <g
-         id="g4331">
-        <ellipse
-           ry="44.30632"
-           rx="44.825119"
-           id="path3792"
-           style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-           cx="-462.61719"
-           cy="-1826.1677" />
-        <ellipse
-           transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-           id="path3794"
-           style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-           cx="573.53253"
-           cy="-1787.5104"
-           rx="31.560532"
-           ry="21.97986" />
-      </g>
-      <ellipse
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3792-8"
-         cx="-627.8316"
-         cy="-1500.225"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-         id="path3794-5"
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-         cx="261.21048"
-         cy="-1594.8789"
-         rx="31.560532"
-         ry="21.97986" />
-      <ellipse
-         transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-         id="path3029"
-         style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.82054758;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         cx="-820.81836"
-         cy="-1749.311"
-         rx="44.825119"
-         ry="44.30632" />
-      <ellipse
-         transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-         id="path3031"
-         style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-         cx="229.27725"
-         cy="-1908.371"
-         rx="31.560532"
-         ry="21.97986" />
       <g
          id="g3857"
          transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
@@ -309,25 +416,79 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#0b1521;stroke-width:54.78153992000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1603.0652,467.6716 c 0,0 -10e-5,136.95384 116.4107,136.95384 116.4108,0 130.1062,-136.95384 130.1062,-136.95384"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#3465a4;stroke-width:27.39076996000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1603.0652,467.6716 c 0,0 0,136.95385 116.4108,136.95385 116.4107,0 130.1061,-136.95385 130.1061,-136.95385"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:13.69538498000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1609.9129,460.82391 c 0,0 -6.8478,136.95384 109.563,136.95384 116.4107,0 123.2585,-136.95384 123.2585,-136.95384"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
       <g
-         transform="translate(0.43542052,-109.34751)"
-         id="g4331-5">
-        <ellipse
-           ry="44.30632"
-           rx="44.825119"
-           id="path3792-3"
-           style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.32158041;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           transform="matrix(-0.62355706,0.78177784,-0.78333143,-0.62160428,0,0)"
-           cx="-462.61719"
-           cy="-1826.1677" />
-        <ellipse
-           transform="matrix(-0.12513301,0.99213998,-0.99351572,-0.11369487,0,0)"
-           id="path3794-56"
-           style="fill:url(#radialGradient3877-3);fill-opacity:1;stroke:none"
-           cx="573.53253"
-           cy="-1787.5104"
-           rx="31.560532"
-           ry="21.97986" />
+         transform="matrix(6.8476923,0,0,6.8476923,1721.6818,389.36717)"
+         id="g3797-7-2-9-5-4">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.5895,389.40446)"
+         id="g3797-7-2-9-5-4-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3079);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.7879,663.27486)"
+         id="g3797-7-2-9-5-4-9-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3092);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-7"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.7879,526.32101)"
+         id="g3797-7-2-9-5-4-9-5-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1-6"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3132);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-7-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_LeaveSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_LeaveSketch.svg
index f69f47e7ca..77d5d4e9cc 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_LeaveSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_LeaveSketch.svg
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -13,9 +14,10 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="Sketcher_LeavSketch.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_EditSketch.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
   <defs
      id="defs2728">
     <inkscape:perspective
@@ -173,6 +175,47 @@
          offset="1"
          style="stop-color:#ffffff;stop-opacity:0;" />
     </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.93570344,0.35278756,-0.35278756,0.93570344,13.795598,-24.167017)"
+       y2="44"
+       x2="48"
+       y1="22"
+       x1="43"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3023"
+       xlink:href="#linearGradient3895"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3895">
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1;"
+         offset="0"
+         id="stop3897" />
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="1"
+         id="stop3899" />
+    </linearGradient>
+    <linearGradient
+       y2="44"
+       x2="48"
+       y1="22"
+       x1="43"
+       gradientTransform="matrix(0.00239211,0.99999714,-0.99999714,0.00239211,-0.10300017,-24.117089)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3082"
+       xlink:href="#linearGradient3895"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3895"
+       id="linearGradient3837"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.00239211,0.99999714,-0.99999714,0.00239211,-0.10300017,-24.117089)"
+       x1="51.973827"
+       y1="35.978416"
+       x2="25.988253"
+       y2="29.916241" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,17 +224,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.046875"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="16.09375"
+     inkscape:cx="33.594611"
+     inkscape:cy="42.542123"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1092"
-     inkscape:window-height="722"
-     inkscape:window-x="69"
-     inkscape:window-y="42" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3018"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -200,6 +252,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -207,66 +260,59 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <g
-       inkscape:label="Layer 1"
-       id="g3363"
-       transform="matrix(0.4354254,0,0,0.6347203,19.244148,6.5073147)">
-      <g
-         transform="matrix(0.1731146,0,0,0.1731146,-635.22048,-168.53671)"
-         inkscape:export-ydpi="8.71"
-         inkscape:export-xdpi="8.71"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/upgrade.png"
-         id="g3853">
-        <path
-           style="opacity:0.60792954;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 3875.9311,1028.0961 L 3726.4311,1183.6586 L 3811.2748,1183.6586 L 3811.2748,1323.0649 L 3938.5561,1323.0649 L 3938.5561,1183.6586 L 4015.3374,1183.6586 L 3875.9311,1028.0961 z"
-           id="path3849" />
-        <path
-           style="opacity:1;fill:url(#linearGradient3847);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="M 3848.6875,999.84375 L 3699.1875,1155.4062 L 3784.0312,1155.4062 L 3784.0312,1294.8125 L 3911.3125,1294.8125 L 3911.3125,1155.4062 L 3988.0938,1155.4062 L 3848.6875,999.84375 z"
-           id="rect3066" />
-      </g>
-    </g>
     <g
        inkscape:label="Layer 1"
        id="g3436"
        transform="translate(107.50353,10.589633)" />
-    <rect
-       style="fill:#323232;fill-opacity:1;stroke:#323232;stroke-width:0.99242818;stroke-opacity:1"
-       id="rect3450"
-       width="13.890088"
-       height="3.7927058"
-       x="7.0579472"
-       y="34.724739" />
-    <rect
-       style="fill:#323232;fill-opacity:1;stroke:#323232;stroke-opacity:1"
-       id="rect3452"
-       width="14.13106"
-       height="3.7851338"
-       x="44.159561"
-       y="34.854675" />
-    <rect
-       style="fill:#323232;fill-opacity:1;stroke:#323232;stroke-width:1.70863736;stroke-opacity:1"
-       id="rect3454"
-       width="50.757404"
-       height="3.0764964"
-       x="7.1788988"
-       y="55.143879" />
-    <rect
-       style="fill:#323232;fill-opacity:1;stroke:#323232;stroke-width:1.05181527;stroke-opacity:1"
-       id="rect3456"
-       width="15.839073"
-       height="3.7359855"
-       x="38.737869"
-       y="-58.021709"
-       transform="matrix(2.5335968e-3,0.9999968,-0.9999995,-1.0227786e-3,0,0)" />
-    <rect
-       style="fill:#323232;fill-opacity:1;stroke:#323232;stroke-width:1.05181527;stroke-opacity:1"
-       id="rect3458"
-       width="15.839075"
-       height="3.7359855"
-       x="38.110561"
-       y="-10.813628"
-       transform="matrix(-2.4670029e-3,0.999997,-0.9999819,-6.0233492e-3,0,0)" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18,36 6,36 6,58 58,58 58,36 46,36"
+       id="path3020"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18,36 6,36 6,58 58,58 58,36 46,36"
+       id="path3020-1"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 18,35 5,35 5,58"
+       id="path3808"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 9,57 48,0 0,-18"
+       id="path3810"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 46,35 13,0"
+       id="path3812"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g3833"
+       transform="matrix(1,0,0,-1,63.956988,39.942653)">
+      <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 -14.956988,18.942653 -10,0 10e-7,-20 -14.000001,0 0,20 -10,0 17,18 z"
+         style="fill:url(#linearGradient3837);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 -19.638282,20.942653 -7.318706,0 -1e-6,-20 -9.999999,0 0,20 -7.395261,0 12.395261,13 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>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MapSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MapSketch.svg
index 12164dcd45..53980bcdf3 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MapSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MapSketch.svg
@@ -14,12 +14,36 @@
    height="64px"
    id="svg3364"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_MapSketch.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
      id="defs3366">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3840">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1;"
+         offset="0"
+         id="stop3842" />
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="1"
+         id="stop3844" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3814">
+      <stop
+         style="stop-color:#3465a4;stop-opacity:1"
+         offset="0"
+         id="stop3816" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3818" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3835">
       <stop
@@ -156,6 +180,123 @@
        id="linearGradient3919"
        xlink:href="#linearGradient3593-3"
        inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3840"
+       id="linearGradient3855"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,2.3889889)"
+       x1="138.01634"
+       y1="42.929947"
+       x2="133.18427"
+       y2="13.067587" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3814"
+       id="linearGradient3857"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,2.3889889)"
+       x1="106.6078"
+       y1="46.513432"
+       x2="105.39978"
+       y2="9.4841042" />
+    <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
+       inkscape:collect="always"
+       id="linearGradient3866">
+      <stop
+         style="stop-color:#d3d7cf;stop-opacity:1"
+         offset="0"
+         id="stop3868-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop3870" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.72697598,0.06131813,0,0.63519063,-6.5732894,25.249529)"
+       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"
+       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="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
+       y2="20.000008"
+       x2="6.000001"
+       y1="38.000008"
+       x1="58"
+       gradientTransform="matrix(0,0.84135153,0.67649221,0.33288289,1.8965248,-3.5945602)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3056"
+       xlink:href="#linearGradient3866"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3768"
+       id="linearGradient3925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.12861923,0,0,0.14301904,-250.8847,-7.3605296)"
+       x1="1178.153"
+       y1="1453.8708"
+       x2="1105.0463"
+       y2="1059.0945" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3776"
+       id="linearGradient3927"
+       gradientUnits="userSpaceOnUse"
+       x1="33.052631"
+       y1="73.676765"
+       x2="23.483253"
+       y2="19.131313" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -164,18 +305,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="18.788747"
-     inkscape:cy="23.403986"
+     inkscape:zoom="5.5"
+     inkscape:cx="14.631612"
+     inkscape:cy="31.558755"
      inkscape:current-layer="g3780"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1863"
-     inkscape:window-height="1056"
-     inkscape:window-x="57"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     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="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3020"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata3369">
     <rdf:RDF>
@@ -184,7 +335,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -195,112 +346,111 @@
     <g
        id="g3780"
        transform="matrix(0.82780005,0,0,0.83717425,-0.2499405,9.0601524)">
-      <path
-         style="fill:url(#linearGradient3799);fill-opacity:1;stroke:#000137;stroke-width:2.68547869;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="M 19.348408,41.702495 51.503231,58.206651 71.393547,48.97617 72.094994,5.9059914 37.401457,-5.6328407 16.685975,-1.1860395 c 1.692756,28.0895705 0.963999,15.6031545 2.662433,42.8885345 z"
-         id="path3783"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccccccc" />
-      <path
-         style="fill:none;stroke:#000137;stroke-width:2.68486428;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         d="M 51.257774,57.721234 50.275946,13.548343 72.101978,6.0654951"
-         id="path3801"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccc" />
-      <path
-         style="color:#000000;fill:url(#linearGradient3799-2);fill-opacity:1;fill-rule:nonzero;stroke:#000137;stroke-width:2.68486452;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 16.632969,-0.94966132 50.10675,13.77367"
-         id="path3921"
-         inkscape:connector-curvature="0" />
       <g
-         id="g3019"
-         transform="matrix(0.10218722,0.04451643,0,0.12623309,-92.618381,-167.25158)">
+         id="g3848"
+         transform="translate(-72.481264,-2.5728951e-6)">
         <path
-           id="path3650"
-           d="m 1064.6382,977.93767 25.0714,269.70903 271.2888,28.1934 c -3.4393,-123.5185 -4.9754,-180.4701 -6.6791,-292.9171 z"
-           style="opacity:0.6523605;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:nodetypes="ccccc"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path3022"
+           d="M 88.487481,-0.07185159 122.31207,16.651071 146.47249,7.0951154 112.64791,-7.2388185 z"
+           style="fill:#729fcf;stroke:#0b1521;stroke-width:2.4024775;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
         <path
-           id="rect3643"
-           d="m 957.09637,1008.9632 15.81386,351.5661 296.66507,6.3788 49.5656,-56.5039 -8.9678,-301.441 z"
-           style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#242121;stroke-width:15.60031223;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" />
+           id="path3792"
+           d="m 122.31207,16.651071 0,45.390792 24.16042,-11.944945 0,-43.0018026 z"
+           style="fill:url(#linearGradient3855);fill-opacity:1;stroke:#0b1521;stroke-width:2.4024775;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
         <path
-           id="path3648"
-           d="m 1318.044,1309.274 -53.2211,-1.8212 3.7479,59.0492"
-           style="fill:none;stroke:#242121;stroke-width:15.60031223;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:nodetypes="ccccc"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccc" />
+           id="path3794"
+           d="m 122.31207,16.651071 0,45.390792 -33.824589,-19.111912 0,-43.00180259 z"
+           style="fill:url(#linearGradient3857);fill-opacity:1;stroke:#0b1521;stroke-width:2.4024775;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
         <path
-           style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:21.86925507;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           d="m 989.27845,1162.5147 203.68205,5.9307 8.4551,167.2361 -204.56105,-2.7077 z"
-           id="rect3860"
+           sodipodi:nodetypes="ccccc"
            inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccccc" />
+           id="path3794-3"
+           d="m 119.89603,18.102382 0,39.878289 -28.992508,-16.419613 0,-37.8105275 z"
+           style="fill:none;stroke:#729fcf;stroke-width:2.4024775;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
         <path
-           transform="matrix(5.5424812,0,0,5.3931657,1012.4561,972.28307)"
-           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.91957342"
-           transform="matrix(3.1478338,0,0,3.3398761,1090.2825,1162.2983)"
-           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:1.60459292;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="6.7227566"
-           transform="matrix(3.1478338,0,0,-3.3398761,1090.2825,1342.2691)"
-           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:1.60459292;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="2.898336"
-           inkscape:transform-center-y="-4.5388429"
-           transform="matrix(2.5317111,-1.8202453,2.0397146,2.6861652,1149.9734,1021.2999)"
-           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:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="star" />
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path3792-6"
+           d="m 124.72812,18.239748 0,39.86028 19.32833,-9.452034 0,-38.088845 z"
+           style="fill:none;stroke:#3465a4;stroke-width:2.4024775;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <path
+         d="M 3.9260068,-0.07185437 37.750597,16.572285 l 0,40.384866 L 30.502463,62.04186 3.9260068,48.726545 z"
+         id="rect3005"
+         style="color:#000000;fill:url(#linearGradient3056);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:2.4024775;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:2.4024775;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 35.334557,18.084462 6.3420479,3.7505279 l 0,43.4795991 24.5228251,12.303295 4.469684,-3.822385 z"
+         id="path3096"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         d="m 37.772247,56.303135 c 0,-0.635194 -2.90792,-2.786036 -5.815824,-3.031309 0,0 1.45394,6.474541 -1.45396,8.770032 z"
+         id="path3778"
+         style="color:#000000;fill:url(#linearGradient3880);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:2.34386945;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:2.4024775;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 32.018583,59.072799 4.840524,-3.690992"
+         id="path3125"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
+      <path
+         d="m 37.772247,56.303135 c 0,-0.635194 -2.90792,-2.786036 -5.815824,-3.031309 0,0 1.45394,6.474543 -1.45396,8.770034 z"
+         id="path3778-3"
+         style="color:#000000;fill:none;stroke:#3f3f3f;stroke-width:2.34386945;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" />
+      <g
+         id="g3918"
+         transform="matrix(0.44038128,0.2156533,0,0.5566064,67.417736,-38.213335)">
+        <g
+           id="g3929">
+          <rect
+             transform="matrix(0.99999934,0.00115222,0,1,0,0)"
+             style="color:#000000;fill:none;stroke:url(#linearGradient3925);stroke-width:4.85256052;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="34.790848"
+             height="34.503662"
+             x="-133.20204"
+             y="159.79366" />
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:none;stroke:url(#linearGradient3927);stroke-width:5.03879118;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(0.99354003,0.00114478,0,0.93347675,-126.39065,124.88705)" />
+          <path
+             sodipodi:nodetypes="cccc"
+             style="fill:#ffffff;stroke:#2e3436;stroke-width:4.85255860999999999;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             d="m -115.80659,174.25793 -13.38114,-0.0154 6.69059,-10.6088 z"
+             id="path3012"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="cccc"
+             style="fill:#ffffff;stroke:#2e3436;stroke-width:4.85255860999999999;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             d="m -129.18773,179.55074 13.38114,0.0154 -6.69055,10.60881 z"
+             id="path3014"
+             inkscape:connector-curvature="0" />
+          <path
+             sodipodi:nodetypes="cccc"
+             style="fill:#ffffff;stroke:#2e3436;stroke-width:4.85255860999999999;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+             d="m -91.278836,148.31315 -11.588364,6.62197 0.44173,-12.51131 z"
+             id="path3012-5"
+             inkscape:connector-curvature="0" />
+        </g>
       </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 357d9cc6e1..4b412f8cf9 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MergeSketch.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Merge_Sketch.svg"
+   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"
@@ -23,6 +23,32 @@
    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>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient6349">
@@ -74,6 +100,50 @@
        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>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -82,18 +152,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="21.642937"
-     inkscape:cy="32"
-     inkscape:current-layer="g3360"
+     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="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     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>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -117,7 +197,8 @@
        inkscape:export-ydpi="3.2478156"
        transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
       <g
-         id="g3765">
+         id="g3765"
+         transform="translate(584.85388,0)">
         <rect
            y="1316.9672"
            x="1010.6287"
@@ -127,7 +208,7 @@
            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 a 18.181818,18.181818 0 1 1 -36.363636,0 18.181818,18.181818 0 1 1 36.363636,0 z"
+           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"
@@ -190,7 +271,7 @@
       </g>
       <g
          id="g3772"
-         transform="matrix(0.81534896,0,0,0.80276295,66.651485,5.5090201)">
+         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"
@@ -262,7 +343,7 @@
            inkscape:transform-center-x="1.9947136" />
       </g>
       <g
-         transform="matrix(0.84841984,0,0,0.83711094,293.21029,-38.155576)"
+         transform="matrix(0.84841984,0,0,0.83711094,878.06417,-38.155576)"
          id="g3784">
         <rect
            y="1316.9672"
@@ -336,7 +417,7 @@
       </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 892.45299,1187.6104 c -4.7057,36.7263 14.13938,76.0492 72.34694,95.4743 l -7.11609,17.1972 43.28956,-18.3833 -16.60419,-37.9525 -8.89513,18.3833 c -42.9544,-11.6634 -55.69162,-27.2559 -56.92875,-75.905 z"
+         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" />
@@ -344,8 +425,199 @@
          sodipodi:nodetypes="cccccccc"
          inkscape:connector-curvature="0"
          id="path3798"
-         d="m 1295.9024,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"
+         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>
+      </g>
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MirrorSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MirrorSketch.svg
index 50715e12cf..5c79d0c11c 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MirrorSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_MirrorSketch.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48+devel r"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_MirrorSketch.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
@@ -74,6 +74,114 @@
        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>
+    <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"
@@ -83,17 +191,27 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="12.546875"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     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="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3040"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -116,153 +234,121 @@
        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="g3765"
-         transform="matrix(-0.96257163,-0.00147681,0.00168109,-0.84559798,2107.1177,2496.7459)">
+         id="g3187"
+         transform="matrix(1,0,0,-1,438.64043,2717.6642)">
         <rect
-           y="1323.2812"
-           x="965.74353"
-           height="118.21816"
-           width="229.79872"
-           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" />
-        <ellipse
-           id="path3862"
-           style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:14.85357952;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"
-           cx="959.10461"
-           cy="1318.1627"
-           rx="69.354233"
-           ry="65.727013"
-           d="m 1028.4588,1318.1627 a 69.354233,65.727013 0 0 1 -69.35419,65.727 69.354233,65.727013 0 0 1 -69.35423,-65.727 69.354233,65.727013 0 0 1 69.35423,-65.727 69.354233,65.727013 0 0 1 69.35419,65.727 z" />
+           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
-           inkscape:transform-center-y="-0.61637387"
-           transform="matrix(2.1664228,0,0,2.2386861,1201.2853,1319.681)"
-           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,1201.2853,1440.3136)"
-           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,938.61952,1230.7378)"
-           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
-         transform="matrix(0.9367672,0,0,0.86496887,5.4759998,-74.606611)"
-         id="g4128">
+           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
-           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="rect4130"
-           width="238.49554"
-           height="117.76592"
-           x="1010.6287"
-           y="1316.9672" />
-        <ellipse
-           cy="1309.1184"
-           cx="1245.7876"
-           style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:14.85357952;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="circle4132"
-           rx="69.354233"
-           ry="65.727013"
-           d="m 1315.1418,1309.1184 a 69.354233,65.727013 0 0 1 -69.3542,65.727 69.354233,65.727013 0 0 1 -69.3542,-65.727 69.354233,65.727013 0 0 1 69.3542,-65.727 69.354233,65.727013 0 0 1 69.3542,65.727 z" />
+           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
-           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="path4134"
-           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" />
+           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
-           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="path4136"
-           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" />
+           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
-           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="path4138"
-           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,1225.3025,1221.6934)"
-           inkscape:transform-center-y="-3.0423375"
-           inkscape:transform-center-x="1.9947136" />
+           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>
       <path
-         style="fill:none;stroke:#2d2dff;stroke-width:14.62134731;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:43.86404194, 14.62134731000000087;stroke-dashoffset:0"
-         d="m 886.2541,1222.5513 424.1829,0"
-         id="path4140"
-         inkscape:connector-curvature="0" />
+         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 cb1c06c523..6c1b4b507e 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_NewSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_NewSketch.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="Sketcher.svg"
+   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"
@@ -23,6 +23,30 @@
    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>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient6349">
@@ -74,6 +98,78 @@
        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>
+    <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"
@@ -82,18 +178,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="68.666143"
-     inkscape:cy="23.456398"
+     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="1280"
-     inkscape:window-height="756"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -117,89 +223,67 @@
        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"
-         style="opacity:0.6523605;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 943.28747,1046.6415 0,401.7619 307.71213,0 56.2999,-53.4961 0,-348.2658 -364.01203,0 z"
-         id="path3650" />
+         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"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#242121;stroke-width:16.08348274;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 912.8996,1012.4705 0,401.7619 307.7122,0 56.2999,-53.496 0,-348.2659 -364.0121,0 z"
-         id="rect3643" />
+         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"
-         style="fill:none;stroke:#242121;stroke-width:16.08348274;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1273.9926,1359.02 -51.5758,-5.3462 0,58.8086"
-         id="path3648" />
+         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:#ff1e00;stroke-width:22.54658699;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3860"
-         width="208.82593"
-         height="183.99214"
-         x="946.07843"
-         y="1170.7777" />
+         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:#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="path3862"
+         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.7141422,0,0,5.5602021,969.97391,974.65432)" />
+         transform="matrix(5.4281292,0,0,5.1424383,996.04635,999.19155)" />
       <path
-         sodipodi:type="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888"
-         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(3.2453281,0,0,3.4433183,1044.4465,1166.6551)"
-         inkscape:transform-center-y="-0.94805537" />
+         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
-         sodipodi:type="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888-9"
-         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(3.2453281,0,0,-3.4433183,1044.4465,1352.2)"
-         inkscape:transform-center-y="6.9309786" />
+         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
-         sodipodi:type="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888-97"
-         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.610123,-1.8766217,2.1028883,2.7693608,1111.7504,1025.1892)"
-         inkscape:transform-center-y="-4.6794198"
-         inkscape:transform-center-x="2.9881022" />
+         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>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc.svg
index 70fedb6a83..832e7c5231 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Sketcher_Parabola.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Element_Parabolic_Arc_End_Point.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"
@@ -109,17 +109,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3042"
-       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"
@@ -158,23 +147,177 @@
        xlink:href="#linearGradient3144"
        id="radialGradient3877"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3877-3"
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292-1"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3186-7">
+      <stop
+         id="stop3188-4"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190-0"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3052"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3057"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079-8"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-45" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3097"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -183,19 +326,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="30.945501"
-     inkscape:cy="25.510773"
+     inkscape:zoom="9.6072693"
+     inkscape:cx="-34.835712"
+     inkscape:cy="29.257095"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="872"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -204,7 +357,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -218,186 +371,27 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         sodipodi:nodetypes="czcczcc"
-         style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.10175991;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1861.6377,479.9977 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         id="path3061"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="m 1844.0077,449.59724 c -0.5068,0.57287 -0.9633,1.15778 -1.4455,1.76209 -15.429,19.34392 -12.4185,47.39954 6.7395,62.60221 19.1579,15.20275 47.2247,11.83879 62.6535,-7.50499 15.4291,-19.344 12.4186,-47.3996 -6.7394,-62.60221 -18.5593,-14.72756 -45.5163,-12.02629 -61.2081,5.7429 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1560.8519,450.34246 c -0.5069,0.57272 -0.9634,1.1577 -1.4456,1.76216 -15.429,19.34392 -12.4184,47.39947 6.7395,62.60221 19.158,15.2026 47.2246,11.83886 62.6536,-7.50506 15.4291,-19.344 12.4185,-47.39952 -6.7395,-62.60222 -18.5593,-14.72749 -45.5163,-12.02622 -61.208,5.74291 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1846.085,467.22228 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.10175991;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <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.272555,1.070644,-0.62008436,-0.40296707,2232.6343,457.54176)"
+         transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)"
          id="g3177" />
       <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.26379798,1.0762112,-0.62386014,-0.38785381,2182.1049,622.99052)"
+         transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)"
          id="g3185" />
       <g
-         id="g3867"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,102.31221,1488.1878)">
-        <path
-           sodipodi:nodetypes="cssssc"
-           inkscape:connector-curvature="0"
-           id="path3766"
-           d="m 1731.4768,571.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3800-6"
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,540.96762,1623.8576)">
-        <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">
-              <path
-                 transform="translate(5.2894633,17.505927)"
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-333.40746,231.69921)" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,804.2102,1631.1505)"
-         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">
-              <path
-                 transform="translate(-19.561348,2.5388364)"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-358.25827,216.73211)"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
-      </g>
+         id="g3784"
+         transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-ydpi="7.2934141" />
       <g
          id="g3857"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,106.03882,1415.6269)">
+         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
         <g
            transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
            id="g3028">
@@ -422,53 +416,79 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#2e3436;stroke-width:54.78153992;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1061,273.90769 171.1923,0 143.8016,-273.90769 143.8016,-273.90769"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#d3d7cf;stroke-width:27.39076996;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1062,273.9077 171.1924,10e-6 143.8015,-273.9077 143.8015,-273.9077"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#ffffff;stroke-width:13.69538498;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1596.2175,460.82391 c 0,0 -41.0862,273.90769 123.2584,273.90769 164.3446,0 136.9539,-273.90769 136.9539,-273.90769"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
       <g
-         id="g3867-5"
-         transform="matrix(0.68313544,-0.73029166,0.73029166,0.68313544,102.02213,1624.716)">
+         transform="matrix(6.8476923,0,0,6.8476923,1721.6818,389.36717)"
+         id="g3797-7-2-9-5-4">
         <path
-           sodipodi:nodetypes="cssssc"
            inkscape:connector-curvature="0"
-           id="path3766-3"
-           d="m 1731.4768,571.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
-           style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800-5">
-          <g
-             id="g3778-6"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780-29">
-              <g
-                 id="g3784-1"
-                 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="g3790-27"
-                 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">
-                <circle
-                   r="48.57143"
-                   cy="655.2193"
-                   cx="197.14285"
-                   id="path3792-0"
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-                <ellipse
-                   ry="23.991123"
-                   rx="34.345188"
-                   cy="672.79736"
-                   cx="225.26402"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   id="path3794-9"
-                   style="fill:url(#radialGradient3877-3);fill-opacity:1;stroke:none" />
-              </g>
-            </g>
-          </g>
-        </g>
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.8272,663.27486)"
+         id="g3797-7-2-9-5-4-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3079);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.6287,389.36717)"
+         id="g3797-7-2-9-5-4-9-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3057);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.8272,512.62563)"
+         id="g3797-7-2-9-5-4-9-1">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-7"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3097);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc_Constr.svg
index 7f99dbd3da..5fdbe773c0 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc_Constr.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc_Constr.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2918"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Sketcher_Parabola_constr.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Parabolic_Arc.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"
@@ -109,17 +109,6 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3042"
-       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"
@@ -158,23 +147,177 @@
        xlink:href="#linearGradient3144"
        id="radialGradient3877"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientTransform="matrix(0.91892149,0,0,0.63996913,366.5326,-2218.0799)"
        cx="225.26402"
        cy="672.79736"
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3877-3"
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
+       id="linearGradient3203"
+       xlink:href="#linearGradient3836-9-3-7-2-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3186"
+       id="linearGradient3075"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3186">
+      <stop
+         id="stop3188"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292"
+       xlink:href="#linearGradient3186"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3203-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3292-1"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3186-7">
+      <stop
+         id="stop3188-4"
+         offset="0"
+         style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop
+         id="stop3190-0"
+         offset="1"
+         style="stop-color:#8ae234;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3052"
+       xlink:href="#linearGradient3186-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3057"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-7"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3079-8"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-45" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3097"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -183,19 +326,29 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="30.945501"
-     inkscape:cy="32"
+     inkscape:zoom="6.7933653"
+     inkscape:cx="2.4402547"
+     inkscape:cy="15.582045"
      inkscape:current-layer="g4470"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="872"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     inkscape:snap-global="false" />
+     inkscape:snap-global="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3025"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2923">
     <rdf:RDF>
@@ -204,7 +357,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -218,186 +371,27 @@
        inkscape:export-xdpi="6.7850704"
        inkscape:export-ydpi="6.7850704"
        transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <path
-         sodipodi:nodetypes="czcczcc"
-         style="fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.10175991;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1861.6377,479.9977 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         id="path3061"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cssssc"
-         inkscape:connector-curvature="0"
-         id="path3035"
-         d="m 1844.0077,449.59724 c -0.5068,0.57287 -0.9633,1.15778 -1.4455,1.76209 -15.429,19.34392 -12.4185,47.39954 6.7395,62.60221 19.1579,15.20275 47.2247,11.83879 62.6535,-7.50499 15.4291,-19.344 12.4186,-47.3996 -6.7394,-62.60221 -18.5593,-14.72756 -45.5163,-12.02629 -61.2081,5.7429 z"
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1560.8519,450.34246 c -0.5069,0.57272 -0.9634,1.1577 -1.4456,1.76216 -15.429,19.34392 -12.4184,47.39947 6.7395,62.60221 19.158,15.2026 47.2246,11.83886 62.6536,-7.50506 15.4291,-19.344 12.4185,-47.39952 -6.7395,-62.60222 -18.5593,-14.72749 -45.5163,-12.02622 -61.208,5.74291 z"
-         id="path3766-1"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cssssc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4425"
-         d="m 1846.085,467.22228 c -12.4417,108.47093 -39.6357,278.63269 -130.2993,279.47811 -90.6637,0.84542 -105.1904,-180.4679 -113.7934,-273.24562 l -45.1708,-4.3615 c 10.0759,102.55346 18.111,322.28677 158.988,323.19676 140.8771,0.9101 159.4208,-202.09054 176.3915,-331.58217 z"
-         style="fill:#4040ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.10175991;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:nodetypes="czcczcc" />
       <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.272555,1.070644,-0.62008436,-0.40296707,2232.6343,457.54176)"
+         transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)"
          id="g3177" />
       <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.26379798,1.0762112,-0.62386014,-0.38785381,2182.1049,622.99052)"
+         transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)"
          id="g3185" />
       <g
-         id="g3867"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,102.31221,1488.1878)">
-        <path
-           sodipodi:nodetypes="cssssc"
-           inkscape:connector-curvature="0"
-           id="path3766"
-           d="m 1731.4768,571.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
-           style="fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800">
-          <g
-             id="g3778"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780">
-              <g
-                 id="g3784"
-                 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="g3790"
-                 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">
-                <path
-                   d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                   sodipodi:ry="48.57143"
-                   sodipodi:rx="48.57143"
-                   sodipodi:cy="655.2193"
-                   sodipodi:cx="197.14285"
-                   id="path3792"
-                   style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                   sodipodi:type="arc" />
-                <path
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                   sodipodi:ry="23.991123"
-                   sodipodi:rx="34.345188"
-                   sodipodi:cy="672.79736"
-                   sodipodi:cx="225.26402"
-                   id="path3794"
-                   style="fill:url(#radialGradient3877);fill-opacity:1;stroke:none"
-                   sodipodi:type="arc" />
-              </g>
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         id="g3800-6"
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,540.96762,1623.8576)">
-        <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">
-              <path
-                 transform="translate(5.2894633,17.505927)"
-                 sodipodi:type="arc"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 id="path3792-8"
-                 sodipodi:cx="197.14285"
-                 sodipodi:cy="655.2193"
-                 sodipodi:rx="48.57143"
-                 sodipodi:ry="48.57143"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
-              <path
-                 sodipodi:type="arc"
-                 style="fill:url(#radialGradient3855);fill-opacity:1;stroke:none"
-                 id="path3794-5"
-                 sodipodi:cx="225.26402"
-                 sodipodi:cy="672.79736"
-                 sodipodi:rx="34.345188"
-                 sodipodi:ry="23.991123"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-333.40746,231.69921)" />
-            </g>
-          </g>
-        </g>
-      </g>
-      <g
-         transform="matrix(0.60302801,-0.69869933,0.69144067,0.59486465,804.2102,1631.1505)"
-         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">
-              <path
-                 transform="translate(-19.561348,2.5388364)"
-                 d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-                 sodipodi:ry="48.57143"
-                 sodipodi:rx="48.57143"
-                 sodipodi:cy="655.2193"
-                 sodipodi:cx="197.14285"
-                 id="path3029"
-                 style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-                 sodipodi:type="arc" />
-              <path
-                 transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-358.25827,216.73211)"
-                 d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-                 sodipodi:ry="23.991123"
-                 sodipodi:rx="34.345188"
-                 sodipodi:cy="672.79736"
-                 sodipodi:cx="225.26402"
-                 id="path3031"
-                 style="fill:url(#radialGradient3068);fill-opacity:1;stroke:none"
-                 sodipodi:type="arc" />
-            </g>
-          </g>
-        </g>
-      </g>
+         id="g3784"
+         transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="7.2934141"
+         inkscape:export-ydpi="7.2934141" />
       <g
          id="g3857"
-         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,106.03882,1415.6269)">
+         transform="matrix(0.68313546,-0.73029169,0.73029169,0.68313546,103.26156,1448.3986)">
         <g
            transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,18.012268,743.19749)"
            id="g3028">
@@ -422,53 +416,79 @@
           </g>
         </g>
       </g>
+      <path
+         style="fill:none;stroke:#0b1521;stroke-width:54.78153992000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1061,273.90769 171.1923,0 143.8016,-273.90769 143.8016,-273.90769"
+         id="path3102"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#3465a4;stroke-width:27.39076996000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1589.3698,467.6716 c 0,0 -41.0862,273.90769 130.1062,273.9077 171.1924,10e-6 143.8015,-273.9077 143.8015,-273.9077"
+         id="path3102-8"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
+      <path
+         style="fill:none;stroke:#729fcf;stroke-width:13.69538498000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1596.2175,460.82391 c 0,0 -41.0862,273.90769 123.2584,273.90769 164.3446,0 136.9539,-273.90769 136.9539,-273.90769"
+         id="path3102-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czc" />
       <g
-         id="g3867-5"
-         transform="matrix(0.68313544,-0.73029166,0.73029166,0.68313544,102.02213,1624.716)">
+         transform="matrix(6.8476923,0,0,6.8476923,1721.6818,389.36717)"
+         id="g3797-7-2-9-5-4">
         <path
-           sodipodi:nodetypes="cssssc"
            inkscape:connector-curvature="0"
-           id="path3766-3"
-           d="m 1731.4768,571.33153 c -0.7646,0.0211 -1.5036,0.0873 -2.2744,0.14811 -24.6667,1.94685 -43.0989,23.31119 -41.1138,47.68757 1.985,24.37639 23.615,42.5753 48.2817,40.62845 24.6668,-1.94687 43.0991,-23.31117 41.114,-47.68758 -1.9233,-23.61462 -22.3112,-41.45576 -46.0075,-40.77655 z"
-           style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58469944;fill-rule:nonzero;stroke:none;stroke-width:5.80000019;marker:none;enable-background:accumulate" />
-        <g
-           transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,172.58778,608.97174)"
-           id="g3800-5">
-          <g
-             id="g3778-6"
-             transform="translate(-10.941933,-540.84412)">
-            <g
-               id="g3780-29">
-              <g
-                 id="g3784-1"
-                 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="g3790-27"
-                 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">
-                <circle
-                   r="48.57143"
-                   cy="655.2193"
-                   cx="197.14285"
-                   id="path3792-0"
-                   style="display:inline;overflow:visible;visibility:visible;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-                <ellipse
-                   ry="23.991123"
-                   rx="34.345188"
-                   cy="672.79736"
-                   cx="225.26402"
-                   transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
-                   id="path3794-9"
-                   style="fill:url(#radialGradient3877-3);fill-opacity:1;stroke:none" />
-              </g>
-            </g>
-          </g>
-        </g>
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3203);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.8272,663.27486)"
+         id="g3797-7-2-9-5-4-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3079);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1995.6287,389.36717)"
+         id="g3797-7-2-9-5-4-9-9">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-4"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3057);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-8"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+      <g
+         transform="matrix(6.8476923,0,0,6.8476923,1851.8272,512.62563)"
+         id="g3797-7-2-9-5-4-9-1">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-7"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3097);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-1"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ProfilesHexagon1.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ProfilesHexagon1.svg
index f30265d763..8593c60d22 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ProfilesHexagon1.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ProfilesHexagon1.svg
@@ -10,82 +10,327 @@
    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="32"
-   height="32"
-   id="svg2"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Create_Profile_Hexagong_2.svg"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/profiles/green_theme_1/Sketcher_Create_Profile_Hexagong_2_32px.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+   width="64"
+   height="64"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_CreateHexagon.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview40"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="22.251541"
+     inkscape:cy="31.236416"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3062"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <defs
      id="defs4">
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3265"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
        cx="225.26402"
        cy="672.79736"
+       r="34.345188"
        fx="225.26402"
        fy="672.79736"
-       r="34.345188" />
+       id="radialGradient3265"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
     <linearGradient
-       inkscape:collect="always"
        id="linearGradient3144">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146" />
+         id="stop3146"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
       <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148" />
+         id="stop3148"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
     </linearGradient>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
        id="radialGradient4928"
-       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="radialGradient4936"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
        cx="225.26402"
        cy="672.79736"
+       r="34.345188"
        fx="225.26402"
        fy="672.79736"
-       r="34.345188" />
+       id="radialGradient4936"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3191"
+       xlink:href="#linearGradient3144-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       id="linearGradient3144-5">
+      <stop
+         id="stop3146-7"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3148-5"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3183"
+       xlink:href="#linearGradient3144-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3818"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3820"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3882"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3884"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3890"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3892"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3899"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3901"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3910"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3912"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient3022"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4568"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4570"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4796"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <radialGradient
+       cx="225.26402"
+       cy="672.79736"
+       r="34.345188"
+       fx="225.26402"
+       fy="672.79736"
+       id="radialGradient4798"
+       xlink:href="#linearGradient3144"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4"
+       id="linearGradient3801-1-3-7"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6"
+       id="linearGradient3801-1-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-6-4-6"
+       id="linearGradient3801-1-3-7-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       id="linearGradient3836-0-6-4-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-7-0-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-5-9-5" />
+    </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="24.65625"
-     inkscape:cx="9.2065906"
-     inkscape:cy="16"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -98,65 +343,94 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <path
+     sodipodi:type="star"
+     style="fill:none;stroke:#172a04;stroke-width:24.46091843000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000000;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064"
+     sodipodi:sides="6"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.3089969"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 60.999998,60.999998 -79.22947,21.229473 -57.999998,-57.999998 21.229472,-79.229471 79.22947,-21.229473 57.999998,57.999998 z"
+     inkscape:transform-center-x="2.5928771"
+     inkscape:transform-center-y="-2.3198451"
+     transform="matrix(0.3261306,-0.07958242,0.08663215,0.30683668,28.761712,31.318237)" />
   <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1020.3622)">
-    <path
-       style="fill:none;stroke:#008900;stroke-width:2.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="M 3,22.833967 3,9.1254753 16,2 29,9.0443599 29,22.671736 16,30.134348 z"
-       id="path4867"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1020.3622)"
-       sodipodi:nodetypes="ccccccc" />
+     transform="translate(18,-20)"
+     id="g3827-1-3-4-3">
     <g
-       id="g4924"
-       transform="matrix(0.52610081,0,0,0.51308669,6.0609957,501.99515)">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8-5">
       <path
-         sodipodi:type="arc"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path2188"
-         sodipodi:cx="197.14285"
-         sodipodi:cy="655.2193"
-         sodipodi:rx="48.57143"
-         sodipodi:ry="48.57143"
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8-6"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         sodipodi:type="arc"
-         style="fill:url(#radialGradient4928);fill-opacity:1;stroke:none"
-         id="path2190"
-         sodipodi:cx="225.26402"
-         sodipodi:cy="672.79736"
-         sodipodi:rx="34.345188"
-         sodipodi:ry="23.991123"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7-3);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
+  </g>
+  <path
+     sodipodi:type="star"
+     style="fill:none;stroke:#73d216;stroke-width:12.23045864999999900;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000000;stroke-opacity:1;stroke-dasharray:none"
+     id="path3064-3"
+     sodipodi:sides="6"
+     sodipodi:cx="3"
+     sodipodi:cy="3"
+     sodipodi:r1="82.024384"
+     sodipodi:r2="41.012192"
+     sodipodi:arg1="0.78539816"
+     sodipodi:arg2="1.3089969"
+     inkscape:flatsided="true"
+     inkscape:rounded="0"
+     inkscape:randomized="0"
+     d="m 60.999998,60.999998 -79.22947,21.229473 -57.999998,-57.999998 21.229472,-79.229471 79.22947,-21.229473 57.999998,57.999998 z"
+     inkscape:transform-center-x="2.5928771"
+     inkscape:transform-center-y="-2.3198451"
+     transform="matrix(0.3261306,-0.07958242,0.08663215,0.30683668,28.761712,31.318237)" />
+  <path
+     transform="matrix(0.33971938,-0.08264328,0.09024183,0.31863808,28.710116,31.292016)"
+     style="fill:none;stroke:#8ae234;stroke-width:5.87967252999999970;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000000;stroke-opacity:1"
+     inkscape:transform-center-x="2.7009142"
+     inkscape:transform-center-y="-2.4090693"
+     d="m -76.22947,24.229473 21.229472,-79.229471 79.22947,-21.229473 57.999998,57.999998"
+     id="path3064-3-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     transform="matrix(0.31254183,-0.07652156,0.08302249,0.29503526,28.813307,31.344459)"
+     style="fill:none;stroke:#8ae234;stroke-width:6.37046432000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:1.89999998000000000;stroke-opacity:1"
+     inkscape:transform-center-x="2.484841"
+     inkscape:transform-center-y="-2.23062"
+     d="M 82.22947,-18.229473 60.999998,60.999998 -18.229472,82.229471 -76.22947,24.229473"
+     id="path3064-3-6-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <g
+     transform="translate(40,-8)"
+     id="g3827-1-3-4">
     <g
-       transform="matrix(0.52610081,0,0,0.51308669,17.701046,508.68717)"
-       id="g4930">
+       transform="translate(31.322131,40.570289)"
+       id="g3797-9-5-8">
       <path
-         transform="matrix(-0.14873711,-0.00599525,0.00599525,-0.14873711,44.131897,1139.4406)"
-         d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-         sodipodi:ry="48.57143"
-         sodipodi:rx="48.57143"
-         sodipodi:cy="655.2193"
-         sodipodi:cx="197.14285"
-         id="path4932"
-         style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-71-6-8"
+         d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
       <path
-         transform="matrix(-0.1297658,0.07293494,-0.07293494,-0.1297658,95.792839,1109.6127)"
-         d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-         sodipodi:ry="23.991123"
-         sodipodi:rx="34.345188"
-         sodipodi:cy="672.79736"
-         sodipodi:cx="225.26402"
-         id="path4934"
-         style="fill:url(#radialGradient4936);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3801-1-3-7);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-3-2-2"
+         d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_RectangularArray.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_RectangularArray.svg
index 79c43ea6e8..a596545534 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_RectangularArray.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_RectangularArray.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Lineal_Array_Content2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_RectangularArray.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Sketcher_Lineal_Array_Element_2_22px.png"
@@ -198,6 +198,350 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3108"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-7"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89260647,0,0,0.89260787,-2.0849733,1.2175859)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043-8"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89260647,0,0,0.89260787,-2.0849733,1.2175859)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-45" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-7-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-4-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-0-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043-2"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-3"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89260647,0,0,0.89260787,-2.0849733,1.2175859)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-7-8">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-0-7" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043-5"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-4"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.71410905,0,0,0.71408993,-4.2829973,2.010844)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-3" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-1" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043-4"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-1"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.71410905,0,0,0.71408993,-4.2829973,2.010844)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-1">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-1" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-3" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043-24"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-8"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-8">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-50" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3323"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-8"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043-6"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-13"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-13">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3323-3"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-13"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043-0"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-6"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-61" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-8" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3323-4"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-6"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3323-4-8"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-6-8"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-6-8">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-61-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-8-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3323-3-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-13-3"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-13-3">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-8-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-9-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3323-8"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-8-4"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-8-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-6-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-50-7" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043-63"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-61"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-61">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-4" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3426"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-61"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -206,18 +550,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.139678"
-     inkscape:cx="37.662632"
-     inkscape:cy="26.544977"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="6.4627283"
+     inkscape:cx="35.087564"
+     inkscape:cy="25.488809"
+     inkscape:current-layer="g3529-7"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3061"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -226,7 +580,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -234,257 +588,200 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.59953403;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4247"
-       width="3.2999225"
-       height="19.431505"
-       x="21.419458"
-       y="20.454851"
-       transform="matrix(0.99159917,0.12934869,0.02060679,0.99978766,0,0)"
-       ry="0" />
     <g
-       transform="matrix(-0.07105259,0.06558539,-0.07554281,-0.06928712,87.273655,65.44068)"
-       id="g4249">
-      <g
-         id="g4251">
-        <path
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-           sodipodi:ry="48.57143"
-           sodipodi:rx="48.57143"
-           sodipodi:cy="655.2193"
-           sodipodi:cx="197.14285"
-           id="path4253"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc"
-           transform="translate(-53.336546,55.046182)" />
-        <path
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           sodipodi:ry="23.991123"
-           sodipodi:rx="34.345188"
-           sodipodi:cy="672.79736"
-           sodipodi:cx="225.26402"
-           id="path4255"
-           style="fill:url(#radialGradient4265);fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
-      </g>
+       transform="translate(-48,24)"
+       id="g3529-7">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-7"
+         d="m 56,8 0,24"
+         style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-4-7"
+         d="m 56,8 0,24"
+         style="fill:none;stroke:#73d216;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-4-1-3"
+         d="m 55,8 0,24"
+         style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <g
-       id="g4257"
-       transform="matrix(-0.07105259,0.06558539,-0.07554281,-0.06928712,87.629892,85.663503)">
-      <g
-         id="g4259">
-        <path
-           transform="translate(-53.336546,55.046182)"
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path4261"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient4267);fill-opacity:1;stroke:none"
-           id="path4263"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)" />
-      </g>
-    </g>
-    <rect
-       ry="0"
-       transform="matrix(-0.99013585,-0.14011069,-0.00974701,-0.9999525,0,0)"
-       y="-58.187061"
-       x="-8.5615053"
-       height="24.019911"
-       width="3.9412272"
-       id="rect4308"
-       style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.59953403;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       id="g4310"
-       transform="matrix(-0.07105259,0.06558539,-0.07554281,-0.06928712,70.752289,77.913767)">
-      <g
-         id="g4312">
-        <path
-           transform="translate(-53.336546,55.046182)"
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path4314"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient4326);fill-opacity:1;stroke:none"
-           id="path4316"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)" />
-      </g>
+       transform="translate(-32,16)"
+       id="g3529-4">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-6"
+         d="m 56,8 0,24"
+         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-4-07"
+         d="m 56,8 0,24"
+         style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-4-1-17"
+         d="m 55,8 0,24"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <g
-       transform="matrix(-0.07105259,0.06558539,-0.07554281,-0.06928712,70.889697,96.604808)"
-       id="g4318">
-      <g
-         id="g4320">
-        <path
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-           sodipodi:ry="48.57143"
-           sodipodi:rx="48.57143"
-           sodipodi:cy="655.2193"
-           sodipodi:cx="197.14285"
-           id="path4322"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc"
-           transform="translate(-53.336546,55.046182)" />
-        <path
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           sodipodi:ry="23.991123"
-           sodipodi:rx="34.345188"
-           sodipodi:cy="672.79736"
-           sodipodi:cx="225.26402"
-           id="path4324"
-           style="fill:url(#radialGradient4328);fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
-      </g>
-    </g>
-    <rect
-       ry="0"
-       transform="matrix(0.99159917,0.12934869,0.02060679,0.99978766,0,0)"
-       y="-2.9898071"
-       x="55.450027"
-       height="19.431505"
-       width="3.2999225"
-       id="rect4368"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.59953403;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <g
-       id="g4370"
-       transform="matrix(-0.07105259,0.06558539,-0.07554281,-0.06928712,120.53522,46.402811)">
-      <g
-         id="g4372">
-        <path
-           transform="translate(-53.336546,55.046182)"
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path4374"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient4386);fill-opacity:1;stroke:none"
-           id="path4376"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)" />
-      </g>
+       transform="translate(-16,8)"
+       id="g3529-2">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-0"
+         d="m 56,8 0,24"
+         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-4-0"
+         d="m 56,8 0,24"
+         style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-4-1-1"
+         d="m 55,8 0,24"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <g
-       transform="matrix(-0.07105259,0.06558539,-0.07554281,-0.06928712,120.89146,66.625634)"
-       id="g4378">
-      <g
-         id="g4380">
-        <path
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-           sodipodi:ry="48.57143"
-           sodipodi:rx="48.57143"
-           sodipodi:cy="655.2193"
-           sodipodi:cx="197.14285"
-           id="path4382"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc"
-           transform="translate(-53.336546,55.046182)" />
-        <path
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           sodipodi:ry="23.991123"
-           sodipodi:rx="34.345188"
-           sodipodi:cy="672.79736"
-           sodipodi:cx="225.26402"
-           id="path4384"
-           style="fill:url(#radialGradient4388);fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
-      </g>
-    </g>
-    <rect
-       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.59953403;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4390"
-       width="3.2999225"
-       height="19.431505"
-       x="38.127911"
-       y="7.568419"
-       transform="matrix(0.99159917,0.12934869,0.02060679,0.99978766,0,0)"
-       ry="0" />
-    <g
-       transform="matrix(-0.07105259,0.06558539,-0.07554281,-0.06928712,103.5762,54.718202)"
-       id="g4392">
-      <g
-         id="g4394">
-        <path
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-           sodipodi:ry="48.57143"
-           sodipodi:rx="48.57143"
-           sodipodi:cy="655.2193"
-           sodipodi:cx="197.14285"
-           id="path4396"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc"
-           transform="translate(-53.336546,55.046182)" />
-        <path
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           sodipodi:ry="23.991123"
-           sodipodi:rx="34.345188"
-           sodipodi:cy="672.79736"
-           sodipodi:cx="225.26402"
-           id="path4398"
-           style="fill:url(#radialGradient4408);fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
-      </g>
+       id="g3529">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491"
+         d="m 56,8 0,24"
+         style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-4"
+         d="m 56,8 0,24"
+         style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3491-4-1"
+         d="m 55,8 0,24"
+         style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     </g>
     <g
-       id="g4400"
-       transform="matrix(-0.07105259,0.06558539,-0.07554281,-0.06928712,103.93244,74.941025)">
-      <g
-         id="g4402">
-        <path
-           transform="translate(-53.336546,55.046182)"
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path4404"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
-        <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient4410);fill-opacity:1;stroke:none"
-           id="path4406"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)" />
-      </g>
+       style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.80022953,0,0,0.80021786,69.464568,0.85171998)"
+       id="g3797-7-2-9-5-4-9-5">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9-4-1-2-4-1"
+         d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3043);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1-8-7-3-8-7"
+         d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+    </g>
+    <g
+       style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.80022953,0,0,0.80021786,53.465027,8.8518817)"
+       id="g3797-7-2-9-5-4-9-5-9">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9-4-1-2-4-1-0"
+         d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3323);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1-8-7-3-8-7-0"
+         d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+    </g>
+    <g
+       style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.80022953,0,0,0.80021786,37.465027,16.851882)"
+       id="g3797-7-2-9-5-4-9-5-4">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9-4-1-2-4-1-4"
+         d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3323-3);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1-8-7-3-8-7-6"
+         d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+    </g>
+    <g
+       style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.80022953,0,0,0.80021786,21.46443,24.851882)"
+       id="g3797-7-2-9-5-4-9-5-96">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9-4-1-2-4-1-3"
+         d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3323-4);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1-8-7-3-8-7-7"
+         d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+    </g>
+    <g
+       style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.80022953,0,0,0.80021786,69.464568,24.85172)"
+       id="g3797-7-2-9-5-4-9-5-2">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9-4-1-2-4-1-09"
+         d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3426);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1-8-7-3-8-7-73"
+         d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+    </g>
+    <g
+       style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.80022953,0,0,0.80021786,53.465027,32.851882)"
+       id="g3797-7-2-9-5-4-9-5-9-7">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9-4-1-2-4-1-0-2"
+         d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3323-8);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1-8-7-3-8-7-0-6"
+         d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+    </g>
+    <g
+       style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.80022953,0,0,0.80021786,37.465027,40.851882)"
+       id="g3797-7-2-9-5-4-9-5-4-0">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9-4-1-2-4-1-4-1"
+         d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3323-3-1);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1-8-7-3-8-7-6-6"
+         d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+    </g>
+    <g
+       style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+       transform="matrix(0.80022953,0,0,0.80021786,21.46443,48.851882)"
+       id="g3797-7-2-9-5-4-9-5-96-5">
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-6-9-4-1-2-4-1-3-7"
+         d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+      <path
+         inkscape:connector-curvature="0"
+         style="fill:url(#linearGradient3323-4-8);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="path4250-7-0-1-8-7-3-8-7-7-5"
+         d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConflictingConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConflictingConstraints.svg
index 050d095ff6..c657ecf802 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConflictingConstraints.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConflictingConstraints.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_SelectConflictingConstraints_6.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_SelectConflictingConstraints.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Sketcher_ConnectLines_2._16px.png"
@@ -151,18 +151,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="17.434602"
+     inkscape:cx="34.251327"
+     inkscape:cy="15.477618"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3053"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -171,7 +181,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -179,57 +189,114 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <rect
-       style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#ff0b00;stroke-width:1.51539098999999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3770"
-       width="31.601168"
-       height="5.3651643"
-       x="-49.716938"
-       y="5.9711123"
-       rx="0.085922487"
-       ry="0.059399907"
-       transform="matrix(7.1126702e-4,-0.99999975,0.99999974,7.2658644e-4,0,0)" />
     <g
-       id="g3351"
-       transform="matrix(0.55290064,0,0,0.52097158,8.1896408,36.821416)"
-       style="stroke:#ff0b00;stroke-width:2.82354115999999999;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-      <path
-         sodipodi:nodetypes="czcccccccc"
-         id="path3837"
-         style="font-size:54.21519088999999525px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#ff0b00;stroke-width:2.82354115999999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-         d="m 31.21246,46.732411 c 0,0 8.118752,-6.003528 11.824574,-8.828516 3.705823,-2.824987 10.410361,-8.12141 10.410361,-8.12141 l 0,-10.607141 -7.541059,-5.736475 -14.693876,-11.1776169 0,12.7214039 13.513052,9.532093 -13.513052,9.567929 0,12.649733"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="czccccccc"
-         id="path3839"
-         style="font-size:54.21519088999999525px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#ff0b00;stroke-width:2.82354115999999999;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-         d="m 83.160164,46.732411 c 0,0 -7.941975,-6.003528 -11.647798,-8.828516 -3.705822,-2.824987 -10.587138,-8.12141 -10.587138,-8.12141 l 0,-10.607141 22.234936,-16.9140919 0,12.7214039 -13.513052,9.532093 13.513052,9.567929 0,12.649733"
-         inkscape:connector-curvature="0" />
+       id="g3114"
+       transform="matrix(0.62846906,0,0,0.63449019,18.864964,33.515676)">
+      <g
+         transform="matrix(-0.73872768,0,0,1.3536788,60.44706,-11.747782)"
+         id="g3852-7"
+         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:3.47018266;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial">
+        <path
+           style="fill:#73d216;stroke:#a40000;stroke-width:3.16720104;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 3.9935419,8.0780181 0,10.3727259 16.4481981,5.927271 -16.4481981,5.927273 0,10.372724 30.1550301,-11.854542 0,-8.890908 z"
+           id="path3044-5"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 6.1324762,16.766495 0,6.461881 L 19.590577,33 6.1133822,42.787385 l 0.019094,6.006397 15.9116828,-11.582527 0,-8.580117 z"
+           id="path3832-3"
+           inkscape:connector-curvature="0"
+           transform="scale(1.3536788,0.73872768)"
+           sodipodi:nodetypes="cccccccc" />
+        <path
+           style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+           d="m 8.301403,36.045318 -0.025847,-4.437092 0.025847,4.437092 21.539307,-8.556334 0,-6.338369 -21.539307,-8.764741 0,4.77357 0,-4.77357"
+           id="path3832-6-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
+      </g>
+      <g
+         transform="matrix(0.73872768,0,0,1.3536788,64.093791,-11.747785)"
+         id="g3852-7-4"
+         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:3.47018266;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial">
+        <path
+           style="fill:#73d216;stroke:#a40000;stroke-width:3.16720104;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m -82.163686,8.0780181 0,10.3727259 16.448198,5.927271 -16.448198,5.927273 0,10.372724 30.15503,-11.854542 0,-8.890908 z"
+           id="path3044-5-8"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m -77.855825,12.385874 0,4.77357 18.217946,7.218569 -18.243793,7.230215 0.02585,4.437089 21.539308,-8.556333 0,-6.33837 z"
+           id="path3832-3-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
+        <path
+           style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+           d="m -77.855825,36.045318 -0.02585,-5.018755 0.02585,5.018755 21.539307,-8.556334 0,-6.338369 -21.539307,-8.764741 0,4.77357 0,-4.77357"
+           id="path3832-6-5-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
+      </g>
     </g>
     <g
-       id="g4132"
-       transform="matrix(0.63620848,0,0,0.54961959,9.8273301,7.5786206)"
-       style="fill:#ff2000;fill-opacity:1;stroke:#ff0b00;stroke-width:2.56267690999999997;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-      <rect
-         transform="matrix(0.69700031,-0.71707082,0.71707082,0.69700031,0,0)"
-         ry="0.10354951"
-         rx="0.1578715"
-         y="37.121048"
-         x="-5.0995173"
-         height="8.5"
-         width="52.25"
-         id="rect8680"
-         style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#ff0b00;stroke-width:2.56267690999999997;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         transform="matrix(0.69700031,-0.71707082,0.71707082,0.69700031,0,0)"
-         ry="0.10354951"
-         rx="0.1578715"
-         y="57.535442"
-         x="-5.4776645"
-         height="8.5"
-         width="52.25"
-         id="rect8680-5"
-         style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#ff0b00;stroke-width:2.56267690999999997;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       id="g3055"
+       transform="matrix(0.58631468,0,0,0.58631468,-49.778993,5.5671257)">
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,52.254762,65.557142)"
+         id="g3071">
+        <path
+           transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+           style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 78.590216,32.671238 53.064834,-0.03817 0.007,9.648151 -53.064833,0.03817 z"
+           id="rect3770-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,65.224283,78.516555)"
+         id="g3071-2"
+         style="fill:#73d216;stroke:#a40000">
+        <path
+           transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+           style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 78.58376,33.633026 53.06483,-0.03818 0.007,9.648152 -53.064829,0.03817 z"
+           id="rect3770-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         id="g3109"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,37.731223,122.21926)">
+        <g
+           id="g3071-4"
+           transform="matrix(0.70710679,-0.70710679,0.70710679,0.70710679,-4.0290077,36.562472)">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="rect3770-1-0"
+             d="m 76.867483,32.638193 54.578187,-0.03926 0.007,10.233409 -54.578185,0.03929 z"
+             style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)" />
+        </g>
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path3065-9"
+           d="M 113.22434,-29.631228 77.043759,6.549349"
+           style="fill:none;stroke:#8ae234;stroke-width:3.41113758;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
     </g>
+    <path
+       style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 49.7,5.1 29.1,25.7"
+       id="path3065"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 57.7,13.1 37.1,33.7"
+       id="path3065-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConstraints.svg
index 1633383a00..44d0c341c8 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConstraints.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectConstraints.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_SelectConstraints_1.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_SelectConstraints.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Sketcher_ConnectLines_2._16px.png"
@@ -165,6 +165,48 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3426"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-61"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-61">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-4" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -173,18 +215,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="6.1640625"
+     inkscape:cx="30.310969"
+     inkscape:cy="42.081085"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3018"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -193,7 +243,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -202,122 +252,165 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g3320"
-       transform="translate(-45.019011,0.32446134)">
-      <rect
-         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.66605568;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect2269"
-         width="3.4154592"
-         height="42.019638"
-         x="53.430199"
-         y="2.4981198"
-         transform="matrix(0.98770354,0.15633846,0.00139872,0.99999902,0,0)"
-         ry="0" />
+       id="g3114"
+       transform="matrix(0.62846906,0,0,0.63449019,18.864964,33.515677)">
       <g
-         transform="matrix(-0.07817104,0.07348351,-0.08311112,-0.07763103,123.98813,50.0557)"
-         id="g3865">
-        <g
-           id="g3867">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3869"
-             style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999970999999981;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc"
-             transform="translate(-31.043012,30.173819)" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-378.52976,249.75771)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3871"
-             style="fill:url(#radialGradient3331);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-        </g>
+         transform="matrix(-0.73872768,0,0,1.3536788,69.994068,-11.747782)"
+         id="g3852-7"
+         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:3.47018266;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial">
+        <path
+           style="fill:#73d216;stroke:#a40000;stroke-width:3.16720104;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 3.9935419,8.0780181 0,10.3727259 16.4481981,5.927271 -16.4481981,5.927273 0,10.372724 30.1550301,-11.854542 0,-8.890908 z"
+           id="path3044-5"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 6.1324762,16.766495 0,6.461881 L 19.590577,33 6.1133822,42 l 0.019094,6.793782 15.9116828,-11.582527 0,-8.580117 z"
+           id="path3832-3"
+           inkscape:connector-curvature="0"
+           transform="scale(1.3536788,0.73872768)"
+           sodipodi:nodetypes="cccccccc" />
+        <path
+           style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+           d="m 8.301403,36.045318 -0.025847,-5.018755 0.025847,5.018755 21.539307,-8.556334 0,-6.338369 -21.539307,-8.764741 0,4.77357 0,-4.77357"
+           id="path3832-6-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
       </g>
       <g
-         transform="matrix(-0.07817103,0.07348352,-0.08311111,-0.07763103,124.6718,85.622368)"
-         id="g3865-3">
-        <g
-           id="g3867-3">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3869-0"
-             style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc"
-             transform="translate(45.992573,-44.234787)" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-302.10009,177.574)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3871-4"
-             style="fill:url(#radialGradient3333);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-        </g>
+         transform="matrix(0.73872768,0,0,1.3536788,64.093791,-11.747785)"
+         id="g3852-7-4"
+         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:3.47018266;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial">
+        <path
+           style="fill:#73d216;stroke:#a40000;stroke-width:3.16720104;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m -69.240103,8.0780181 0,10.3727259 16.448198,5.927271 -16.448198,5.927273 0,10.372724 30.15503,-11.854542 0,-8.890908 z"
+           id="path3044-5-8"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m -64.932242,12.385874 0,4.77357 18.217946,7.218569 -18.243793,6.64855 0.02585,5.018754 21.539308,-8.556333 0,-6.33837 z"
+           id="path3832-3-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
+        <path
+           style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+           d="m -64.932242,36.045318 -0.02585,-5.018755 0.02585,5.018755 21.539307,-8.556334 0,-6.338369 -21.539307,-8.764741 0,4.77357 0,-4.77357"
+           id="path3832-6-5-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
       </g>
     </g>
-    <rect
-       style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97615963;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3770"
-       width="26.072323"
-       height="3.9899218"
-       x="-46.233047"
-       y="22.631947"
-       rx="0.070889749"
-       ry="0.044174038"
-       transform="matrix(6.4111715e-4,-0.99999979,0.99999968,8.0608819e-4,0,0)" />
     <g
-       id="g3351"
-       transform="matrix(0.4111766,0,0,0.42982396,26.468568,40.718613)">
-      <path
-         sodipodi:nodetypes="czcccccccc"
-         id="path3837"
-         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-         d="m 31.21246,46.732411 c 0,0 8.118752,-6.003528 11.824574,-8.828516 3.705823,-2.824987 10.410361,-8.12141 10.410361,-8.12141 l 0,-10.607141 -7.541059,-5.736475 -14.693876,-11.1776169 0,12.7214039 13.513052,9.532093 -13.513052,9.567929 0,12.649733"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="czccccccc"
-         id="path3839"
-         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-         d="m 83.160164,46.732411 c 0,0 -7.941975,-6.003528 -11.647798,-8.828516 -3.705822,-2.824987 -10.587138,-8.12141 -10.587138,-8.12141 l 0,-10.607141 22.234936,-16.9140919 0,12.7214039 -13.513052,9.532093 13.513052,9.567929 0,12.649733"
-         inkscape:connector-curvature="0" />
-    </g>
-    <g
-       id="g4132"
-       transform="matrix(0.47313029,0,0,0.4534598,23.955165,6.3715162)"
-       style="stroke:#000000;stroke-opacity:1;fill:#ff2000;fill-opacity:1">
-      <rect
-         transform="matrix(0.69700031,-0.71707082,0.71707082,0.69700031,0,0)"
-         ry="0.10354951"
-         rx="0.1578715"
-         y="37.121048"
-         x="-5.0995173"
-         height="8.5"
-         width="52.25"
-         id="rect8680"
-         style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.92547666999999989;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         transform="matrix(0.69700031,-0.71707082,0.71707082,0.69700031,0,0)"
-         ry="0.10354951"
-         rx="0.1578715"
-         y="57.535442"
-         x="-5.4776645"
-         height="8.5"
-         width="52.25"
-         id="rect8680-5"
-         style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.92547666999999989;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       id="g3055"
+       transform="matrix(0.58631468,0,0,0.58631468,-49.778993,5.5671259)">
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,52.254762,65.557142)"
+         id="g3071">
+        <path
+           transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+           style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 78.590216,32.671238 53.064834,-0.03817 0.007,9.648151 -53.064833,0.03817 z"
+           id="rect3770-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,65.224283,78.516555)"
+         id="g3071-2"
+         style="fill:#73d216;stroke:#a40000">
+        <path
+           transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+           style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 78.58376,33.633026 53.06483,-0.03818 0.007,9.648152 -53.064829,0.03817 z"
+           id="rect3770-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         id="g3109"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,58.198051,122.21926)">
+        <g
+           id="g3071-4"
+           transform="matrix(0.70710679,-0.70710679,0.70710679,0.70710679,-4.0290077,36.562472)">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="rect3770-1-0"
+             d="m 76.867483,32.638193 54.578187,-0.03926 0.007,10.233409 -54.578185,0.03929 z"
+             style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)" />
+        </g>
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path3065-9"
+           d="M 113.22434,-29.631228 77.043759,6.549349"
+           style="fill:none;stroke:#8ae234;stroke-width:3.41113758;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <g
+         transform="matrix(1.7055688,0,0,1.7055688,3.0341923,31.438533)"
+         id="g3529">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3491"
+           d="M 56,-13.999999 56,32"
+           style="fill:none;stroke:#2e3436;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3491-4"
+           d="M 56,-13.999999 56,32"
+           style="fill:none;stroke:#d3d7cf;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3491-4-1"
+           d="M 55,-13.999999 55,32"
+           style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+      </g>
+      <g
+         style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="matrix(1.3648465,0,0,1.3648266,121.51079,-8.042453)"
+         id="g3797-7-2-9-5-4-9-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1"
+           d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3043);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-7"
+           d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+      </g>
+      <g
+         style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="matrix(1.3648465,0,0,1.3648266,121.51079,73.824849)"
+         id="g3797-7-2-9-5-4-9-5-2">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1-09"
+           d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3426);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-7-73"
+           d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+      </g>
     </g>
+    <path
+       style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 49.7,5.1000002 29.1,25.700001"
+       id="path3065"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 57.7,13.100001 -20.6,20.6"
+       id="path3065-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectElementsAssociatedWithConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectElementsAssociatedWithConstraints.svg
index 4df9509661..def37c3e57 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectElementsAssociatedWithConstraints.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectElementsAssociatedWithConstraints.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Select_Elements_via_Constraints_2.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_SelectElementsAssociatedWithConstraints.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Sketcher_ConnectLines_2._16px.png"
@@ -211,6 +211,90 @@
          offset="1"
          id="stop3148-6-5-6" />
     </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3426"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-61"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-61">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-5" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-4" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3426-1"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-61-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-61-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-5-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-4-0" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3043-9"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-4"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-4">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-8" />
+    </linearGradient>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -219,18 +303,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="8.7173008"
+     inkscape:cx="-39.720633"
+     inkscape:cy="30.404425"
+     inkscape:current-layer="g3055"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3033"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -239,7 +333,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -248,183 +342,173 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g3320"
-       transform="matrix(1,0,0,0.97082581,-45.100126,2.7748752)"
-       style="stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none">
-      <rect
-         style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00631738;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect2269"
-         width="3.4154592"
-         height="42.019638"
-         x="53.430199"
-         y="2.4981198"
-         transform="matrix(0.98770354,0.15633846,0.00139872,0.99999902,0,0)"
-         ry="0" />
+       id="g3055"
+       transform="matrix(0.58631468,0,0,0.58631468,-135.77899,7.5671254)">
       <g
-         transform="matrix(-0.07817104,0.07348351,-0.08311112,-0.07763103,123.98813,50.0557)"
-         id="g3865"
-         style="stroke-width:9.06256962;stroke-miterlimit:4;stroke-dasharray:none">
-        <g
-           id="g3867"
-           style="stroke-width:9.06256962;stroke-miterlimit:4;stroke-dasharray:none">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3869"
-             style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:9.06256962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc"
-             transform="translate(-31.043012,30.173819)" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-378.52976,249.75771)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3871"
-             style="fill:url(#radialGradient3331);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-        </g>
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,178.46684,62.146004)"
+         id="g3071"
+         style="fill:#cc0000;stroke:#280000">
+        <path
+           transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+           style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 78.590216,32.671238 53.064834,-0.03817 0.007,9.648151 -53.064833,0.03817 z"
+           id="rect3770-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
       </g>
       <g
-         transform="matrix(-0.07817103,0.07348352,-0.08311111,-0.07763103,124.6718,85.622368)"
-         id="g3865-3"
-         style="stroke-width:9.06256962;stroke-miterlimit:4;stroke-dasharray:none">
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,191.43637,75.105417)"
+         id="g3071-2"
+         style="fill:#cc0000;stroke:#280000">
+        <path
+           transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+           style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 78.58376,33.633026 53.06483,-0.03818 0.007,9.648152 -53.064829,0.03817 z"
+           id="rect3770-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         id="g3109"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,245.81062,139.27494)"
+         style="stroke:#280000">
         <g
-           id="g3867-3"
-           style="stroke-width:9.06256962;stroke-miterlimit:4;stroke-dasharray:none">
+           id="g3071-4"
+           transform="matrix(0.70710679,-0.70710679,0.70710679,0.70710679,-4.0290077,36.562472)"
+           style="fill:#cc0000;stroke:#280000">
           <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3869-0"
-             style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:9.06256962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc"
-             transform="translate(45.992573,-44.234787)" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-302.10009,177.574)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3871-4"
-             style="fill:url(#radialGradient3333);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="rect3770-1-0"
+             d="m 76.867483,32.638193 54.578187,-0.03926 0.007,10.233409 -54.578185,0.03929 z"
+             style="color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)" />
         </g>
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path3065-9"
+           d="M 113.22434,-29.631228 77.043759,6.549349"
+           style="fill:none;stroke:#ef2929;stroke-width:3.41113758;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
+      <g
+         transform="matrix(1.7055688,0,0,1.7055688,149.7131,28.027395)"
+         id="g3529"
+         style="stroke:#172a04;stroke-width:1">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3491"
+           d="M 56,-13.999999 56,32"
+           style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3491-4"
+           d="M 56,-13.999999 56,32"
+           style="fill:none;stroke:#73d216;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3491-4-1"
+           d="M 55,-13.999999 55,32"
+           style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+      </g>
+      <g
+         style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="matrix(1.3648465,0,0,1.3648266,268.18971,-11.453591)"
+         id="g3797-7-2-9-5-4-9-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1"
+           d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3043);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-7"
+           d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+      </g>
+      <g
+         style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="matrix(1.3648465,0,0,1.3648266,268.18971,70.413711)"
+         id="g3797-7-2-9-5-4-9-5-2">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1-09"
+           d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3426);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-7-73"
+           d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+      </g>
+      <g
+         transform="matrix(1.7055688,0,0,1.7055688,231.5804,28.027396)"
+         id="g3529-2"
+         style="stroke:#172a04;stroke-width:1">
+        <path
+           inkscape:connector-curvature="0"
+           id="path3491-45"
+           d="M 56,-13.999999 56,32"
+           style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3491-4-5"
+           d="M 56,-13.999999 56,32"
+           style="fill:none;stroke:#73d216;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           id="path3491-4-1-1"
+           d="M 55,-13.999999 55,32"
+           style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           sodipodi:nodetypes="cc" />
+      </g>
+      <g
+         style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="matrix(1.3648465,0,0,1.3648266,350.05701,-11.45359)"
+         id="g3797-7-2-9-5-4-9-5-7">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1-1"
+           d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3043-9);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-7-1"
+           d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
+      </g>
+      <g
+         style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none"
+         transform="matrix(1.3648465,0,0,1.3648266,350.05701,70.413711)"
+         id="g3797-7-2-9-5-4-9-5-2-5">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-4-1-2-4-1-09-2"
+           d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3426-1);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-8-7-3-8-7-73-7"
+           d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z" />
       </g>
     </g>
-    <g
-       id="g4132"
-       transform="matrix(0.47313029,0,0,0.4534598,4.4874844,12.617397)"
-       style="fill:#ff2000;fill-opacity:1;stroke:#731200;stroke-width:3.23840737;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-      <rect
-         transform="matrix(0.69700031,-0.71707082,0.71707082,0.69700031,0,0)"
-         ry="0.10354951"
-         rx="0.1578715"
-         y="37.121048"
-         x="-5.0995173"
-         height="8.5"
-         width="52.25"
-         id="rect8680"
-         style="color:#000000;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:3.23840737;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         transform="matrix(0.69700031,-0.71707082,0.71707082,0.69700031,0,0)"
-         ry="0.10354951"
-         rx="0.1578715"
-         y="57.535442"
-         x="-5.4776645"
-         height="8.5"
-         width="52.25"
-         id="rect8680-5"
-         style="color:#000000;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:3.23840737;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    </g>
-    <g
-       id="g3320-4"
-       transform="matrix(1,0,0,0.93609463,-0.44028366,-1.9224234)"
-       style="stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none">
-      <rect
-         style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.00631738;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect2269-6"
-         width="3.4154592"
-         height="42.019638"
-         x="53.430199"
-         y="2.4981198"
-         transform="matrix(0.98770354,0.15633846,0.00139872,0.99999902,0,0)"
-         ry="0" />
-      <g
-         transform="matrix(-0.07817104,0.07348351,-0.08311112,-0.07763103,123.98813,50.0557)"
-         id="g3865-0"
-         style="stroke-width:9.06256962;stroke-miterlimit:4;stroke-dasharray:none">
-        <g
-           id="g3867-36"
-           style="stroke-width:9.06256962;stroke-miterlimit:4;stroke-dasharray:none">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3869-2"
-             style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:9.06256962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc"
-             transform="translate(-31.043012,30.173819)" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-378.52976,249.75771)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3871-2"
-             style="fill:url(#radialGradient3331-0);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-      <g
-         transform="matrix(-0.07817103,0.07348352,-0.08311111,-0.07763103,124.6718,85.622368)"
-         id="g3865-3-0"
-         style="stroke-width:9.06256962;stroke-miterlimit:4;stroke-dasharray:none">
-        <g
-           id="g3867-3-4"
-           style="stroke-width:9.06256962;stroke-miterlimit:4;stroke-dasharray:none">
-          <path
-             d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z"
-             sodipodi:ry="48.57143"
-             sodipodi:rx="48.57143"
-             sodipodi:cy="655.2193"
-             sodipodi:cx="197.14285"
-             id="path3869-0-1"
-             style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:9.06256962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-             sodipodi:type="arc"
-             transform="translate(45.992573,-44.234787)" />
-          <path
-             transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-302.10009,177.574)"
-             d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-             sodipodi:ry="23.991123"
-             sodipodi:rx="34.345188"
-             sodipodi:cy="672.79736"
-             sodipodi:cx="225.26402"
-             id="path3871-4-9"
-             style="fill:url(#radialGradient3333-5);fill-opacity:1;stroke:none"
-             sodipodi:type="arc" />
-        </g>
-      </g>
-    </g>
-    <rect
-       style="color:#000000;fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3770"
-       width="26.072323"
-       height="3.9899218"
-       x="-58.427841"
-       y="38.835171"
-       rx="0.070889749"
-       ry="0.044174038"
-       transform="matrix(6.4111715e-4,-0.99999979,0.99999968,8.0608819e-4,0,0)" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 37.7,5.0999997 17.1,25.700001"
+       id="path3065"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 45.7,13.100001 -20.6,20.6"
+       id="path3065-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectHorizontalAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectHorizontalAxis.svg
index 13583a66d1..313d491002 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectHorizontalAxis.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectHorizontalAxis.svg
@@ -14,13 +14,37 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_SelectHorizontalAxis_3.svg"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/context_menu_some/Sketcher_SelectHorizontalAxis_3_32px.png"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_SelectHorizontalAxis.svg"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/context_menu_some/Sketcher_SelectOrigin_3_32px.png"
    inkscape:export-xdpi="45"
    inkscape:export-ydpi="45">
   <defs
      id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3890">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3892" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3894" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3788" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3602">
       <stop
@@ -173,6 +197,45 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="18"
+       y1="39"
+       x2="12"
+       y2="11"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786-7"
+       id="linearGradient3792-1"
+       x1="22"
+       y1="27"
+       x2="9"
+       y2="30"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3786-7">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3788-4" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3790-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3890"
+       id="linearGradient3896"
+       x1="20.785244"
+       y1="58.824768"
+       x2="12.00527"
+       y2="36.247696"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -182,17 +245,27 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8.625"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:cx="66.596163"
+     inkscape:cy="4.3112847"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
-     inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3014"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -209,33 +282,61 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
+    <g
+       transform="matrix(0,1,-1,0,64,34)"
+       id="g3812-9">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         id="rect8776-4"
+         d="M 21,51 21,17 27,17 15,3 3,17 9,17 9,51 z"
+         style="color:#000000;fill:url(#linearGradient3792-1);fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path3784-8"
+         d="M 11,39 11,15 7.4,15 15,6.1 22.6,15 19,15 19,39"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g3812">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         id="rect8776"
+         d="M 21,51 21,17 27,17 15,3 3,17 9,17 9,51 z"
+         style="color:#000000;fill:url(#linearGradient3792);fill-opacity:1;fill-rule:nonzero;stroke:#172a04;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path3784"
+         d="M 11,39 11,15 7.4,15 15,6.1 22.6,15 19,15 19,39"
+         style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
     <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.96273834;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 20.830469,53.494966 20.506488,15.900596 27.59991,15.880636 14.56567,2.4501273 1.6780192,15.91938 l 7.299032,0.540507 0.142501,37.034148 z"
-       id="rect8776"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="fill:#008900;fill-opacity:1;stroke:#ff2600;stroke-width:3.03271651;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 11.587197,42.450189 38.620336,-2e-6 -0.242895,-7.232361 10.444496,10.848542 -9.958705,12.51755 -0.242896,-6.954195 -38.377441,0.278168 z"
-       id="path3340"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       sodipodi:ry="48.57143"
-       sodipodi:rx="48.57143"
-       sodipodi:cy="655.2193"
-       sodipodi:cx="197.14285"
-       id="path3869-0"
-       style="fill:#150f8e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        sodipodi:type="arc"
-       transform="matrix(-0.1380929,0.1336078,-0.14681978,-0.14114879,138.59384,113.43015)" />
+       style="fill:#729fcf;fill-opacity:1;stroke:#0b1521;stroke-width:2.12263083;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04"
+       id="path3870"
+       sodipodi:cx="15.768116"
+       sodipodi:cy="47.536232"
+       sodipodi:rx="13.797101"
+       sodipodi:ry="13.797101"
+       d="m 29.565217,47.536232 a 13.797101,13.797101 0 1 1 -27.594202,0 13.797101,13.797101 0 1 1 27.594202,0 z"
+       transform="matrix(0.94222692,0,0,0.94222692,1.142857,3.2100825)" />
     <path
-       style="fill:#008900;fill-opacity:1;stroke:none"
-       d="m 41.926477,3.185127 7.43103,6.770494 8.091565,-6.7704941 3.30268,3.7980821 -7.265896,6.440226 7.315088,6.970743 -3.664582,3.647024 -7.613721,-7.118319 -8.2567,7.069127 -3.632948,-4.12835 7.265896,-6.275091 -6.770494,-6.275092 z"
-       id="path4181"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccc" />
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3896);fill-opacity:1;stroke:#729fcf;stroke-width:2.50856375999999990;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000000"
+       id="path3870-2"
+       sodipodi:cx="15.768116"
+       sodipodi:cy="47.536232"
+       sodipodi:rx="13.797101"
+       sodipodi:ry="13.797101"
+       d="m 29.565217,47.536232 a 13.797101,13.797101 0 1 1 -27.594202,0 13.797101,13.797101 0 1 1 27.594202,0 z"
+       transform="matrix(0.79726894,0,0,0.79726893,3.4285709,10.100839)" />
+    <path
+       style="fill:#8ae234;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 39,5 -4,4 10,10 -10,10 4,4 9,-9 9,9 4,-4 L 51,19 61,9 57,5 48,14 z"
+       id="path3900"
+       inkscape:connector-curvature="0" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectOrigin.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectOrigin.svg
index 17c6106030..b951ce87c6 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectOrigin.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectOrigin.svg
@@ -14,13 +14,37 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_SelectOrigin_3.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_SelectOrigin.svg"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/context_menu_some/Sketcher_SelectOrigin_3_32px.png"
    inkscape:export-xdpi="45"
    inkscape:export-ydpi="45">
   <defs
      id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3890">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3892" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3894" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3788" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3602">
       <stop
@@ -173,6 +197,45 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="18"
+       y1="39"
+       x2="12"
+       y2="11"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786-7"
+       id="linearGradient3792-1"
+       x1="22"
+       y1="27"
+       x2="9"
+       y2="30"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3786-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3788-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3790-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3890"
+       id="linearGradient3896"
+       x1="20.785244"
+       y1="58.824768"
+       x2="12.00527"
+       y2="36.247696"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,18 +244,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.625"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="4.3125"
+     inkscape:cx="44.350666"
+     inkscape:cy="38.006457"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
-     inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3014"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -201,7 +274,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -209,49 +282,56 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
+    <g
+       transform="matrix(0,1,-1,0,64,34)"
+       id="g3812-9">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         id="rect8776-4"
+         d="M 21,51 21,17 27,17 15,3 3,17 9,17 9,51 z"
+         style="color:#000000;fill:url(#linearGradient3792-1);fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path3784-8"
+         d="M 11,39 11,15 7.4,15 15,6.1 22.6,15 19,15 19,39"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g3812">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         id="rect8776"
+         d="M 21,51 21,17 27,17 15,3 3,17 9,17 9,51 z"
+         style="color:#000000;fill:url(#linearGradient3792);fill-opacity:1;fill-rule:nonzero;stroke:#172a04;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path3784"
+         d="M 11,39 11,15 7.4,15 15,6.1 22.6,15 19,15 19,39"
+         style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
     <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#73d216;stroke-width:2.79176067999999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 20.906056,51.512129 20.608455,16.069947 27.124319,16.051128 15.151348,3.3894859 3.31303,16.087656 l 6.704733,0.509563 0.130899,34.914032 z"
-       id="rect8776"
-       sodipodi:nodetypes="cccccccc" />
-    <rect
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3770"
-       width="55.271896"
-       height="9.484437"
-       x="-73.631248"
-       y="41.728565"
-       rx="0.15028238"
-       ry="0.10500604"
-       transform="matrix(0.99999787,-0.00206612,0.00206612,0.99999787,0,0)" />
-    <path
-       style="fill:#ff2600;fill-opacity:1;stroke:#ff2600;stroke-width:3.03271651000000020;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 11.587197,42.450189 38.620336,-2e-6 -0.242895,-7.232361 10.444496,10.848542 -9.958705,12.51755 -0.242896,-6.954195 -38.377441,0.278168 z"
-       id="path3340"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       sodipodi:ry="48.57143"
-       sodipodi:rx="48.57143"
-       sodipodi:cy="655.2193"
-       sodipodi:cx="197.14285"
-       id="path3869-0"
-       style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#150f8e;stroke-width:11.31365790999999987;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
        sodipodi:type="arc"
-       transform="matrix(-0.18143156,0.18283616,-0.19289727,-0.19315566,177.61847,138.49669)" />
+       style="fill:#729fcf;fill-opacity:1;stroke:#0b1521;stroke-width:2.12263083;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04"
+       id="path3870"
+       sodipodi:cx="15.768116"
+       sodipodi:cy="47.536232"
+       sodipodi:rx="13.797101"
+       sodipodi:ry="13.797101"
+       d="m 29.565217,47.536232 a 13.797101,13.797101 0 1 1 -27.594202,0 13.797101,13.797101 0 1 1 27.594202,0 z"
+       transform="matrix(0.94222692,0,0,0.94222692,1.142857,3.2100825)" />
     <path
-       sodipodi:nodetypes="cccc"
-       id="path3837"
-       style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.92122614;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-       d="m -53.119276,33.099556 c 3.096998,-2.366855 6.13436,-4.806991 9.142484,-7.285485 l 1.918772,0.495402 c 3.036832,2.441923 5.255649,4.543843 8.316815,6.955217"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:nodetypes="cccccccccccc"
-       id="path3839"
-       style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.92122614;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-       d="m -33.741205,33.26469 0,-5.437159 -5.55625,-4.112525 5.55625,-4.097121 0,-5.467965 -9.142485,7.270082 -1.093102,-0.165134 c -3.047495,-2.42336 -6.09499,-4.846721 -9.142484,-7.270082 l 0,5.467965 5.55625,4.097121 -5.55625,4.112525 0,5.437159"
-       inkscape:connector-curvature="0" />
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3896);fill-opacity:1;stroke:#729fcf;stroke-width:2.50856375999999990;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000000"
+       id="path3870-2"
+       sodipodi:cx="15.768116"
+       sodipodi:cy="47.536232"
+       sodipodi:rx="13.797101"
+       sodipodi:ry="13.797101"
+       d="m 29.565217,47.536232 a 13.797101,13.797101 0 1 1 -27.594202,0 13.797101,13.797101 0 1 1 27.594202,0 z"
+       transform="matrix(0.79726894,0,0,0.79726893,3.4285709,10.100839)" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectRedundantConstraints.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectRedundantConstraints.svg
index 10a0efeb44..a2fb385fdf 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectRedundantConstraints.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectRedundantConstraints.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_SelectConflictingConstraints_3.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_SelectRedundantConstraints.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/other_Abdullah/Sketcher_ConnectLines_2._16px.png"
@@ -151,18 +151,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="12.328125"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="8.7173008"
+     inkscape:cx="40.857254"
+     inkscape:cy="24.130929"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1680"
-     inkscape:window-height="995"
-     inkscape:window-x="-2"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3006"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -171,7 +179,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -179,57 +187,115 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <rect
-       style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#ffa000;stroke-width:1.51539099;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect3770"
-       width="31.601168"
-       height="5.3651643"
-       x="-49.716938"
-       y="5.9711123"
-       rx="0.085922487"
-       ry="0.059399907"
-       transform="matrix(7.1126702e-4,-0.99999975,0.99999974,7.2658644e-4,0,0)" />
     <g
-       id="g3351"
-       transform="matrix(0.55290064,0,0,0.52097158,8.1896408,36.821416)"
-       style="stroke:#ffa000;stroke-width:2.82354116;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-      <path
-         sodipodi:nodetypes="czcccccccc"
-         id="path3837"
-         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#ffa000;stroke-width:2.82354116;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-         d="m 31.21246,46.732411 c 0,0 8.118752,-6.003528 11.824574,-8.828516 3.705823,-2.824987 10.410361,-8.12141 10.410361,-8.12141 l 0,-10.607141 -7.541059,-5.736475 -14.693876,-11.1776169 0,12.7214039 13.513052,9.532093 -13.513052,9.567929 0,12.649733"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="czccccccc"
-         id="path3839"
-         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#ffa000;stroke-width:2.82354116;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial Black;-inkscape-font-specification:'Arial Black,'"
-         d="m 83.160164,46.732411 c 0,0 -7.941975,-6.003528 -11.647798,-8.828516 -3.705822,-2.824987 -10.587138,-8.12141 -10.587138,-8.12141 l 0,-10.607141 22.234936,-16.9140919 0,12.7214039 -13.513052,9.532093 13.513052,9.567929 0,12.649733"
-         inkscape:connector-curvature="0" />
+       id="g3114"
+       transform="matrix(0.62846906,0,0,0.63449019,18.864938,33.515706)">
+      <g
+         transform="matrix(-0.73872768,0,0,1.3536788,60.44706,-11.747782)"
+         id="g3852-7"
+         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:3.47018266;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial">
+        <path
+           style="fill:#73d216;stroke:#ce5c00;stroke-width:3.16720104;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 3.9935419,8.0780181 0,10.3727259 16.4481981,5.927271 -16.4481981,5.927273 0,10.372724 30.1550301,-11.854542 0,-8.890908 z"
+           id="path3044-5"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m 6.1324762,16.766495 0,6.461881 L 19.590577,33 6.1133822,42.629731 l 0.019094,6.164051 15.9116828,-11.582527 0,-8.580117 z"
+           id="path3832-3"
+           inkscape:connector-curvature="0"
+           transform="scale(1.3536788,0.73872768)"
+           sodipodi:nodetypes="cccccccc" />
+        <path
+           style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+           d="m 8.301403,36.045318 -0.025847,-4.553555 0.025847,4.553555 21.539307,-8.556334 0,-6.338369 -21.539307,-8.764741 0,4.77357 0,-4.77357"
+           id="path3832-6-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
+      </g>
+      <g
+         transform="matrix(0.73872768,0,0,1.3536788,64.093791,-11.747785)"
+         id="g3852-7-4"
+         style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:3.47018266;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial">
+        <path
+           style="fill:#73d216;stroke:#ce5c00;stroke-width:3.16720104;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m -82.163686,8.0780181 0,10.3727259 16.448198,5.927271 -16.448198,5.927273 0,10.372724 30.15503,-11.854542 0,-8.890908 z"
+           id="path3044-5-8"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+           d="m -77.855825,12.385874 0,4.77357 18.217946,7.218569 -18.243793,7.23018 0.02585,4.437124 21.539308,-8.556333 0,-6.33837 z"
+           id="path3832-3-8"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
+        <path
+           style="font-size:54.21519089px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;color:#000000;fill:none;stroke:#8ae234;stroke-width:3.1672008;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Arial;-inkscape-font-specification:Arial"
+           d="m -77.855825,36.045318 -0.02585,-5.018755 0.02585,5.018755 21.539307,-8.556334 0,-6.338369 -21.539307,-8.764741 0,4.77357 0,-4.77357"
+           id="path3832-6-5-2"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cccccccc" />
+      </g>
     </g>
     <g
-       id="g4132"
-       transform="matrix(0.63620848,0,0,0.54961959,9.8273301,7.5786206)"
-       style="fill:#ff2000;fill-opacity:1;stroke:#ffa000;stroke-width:2.56267691;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-      <rect
-         transform="matrix(0.69700031,-0.71707082,0.71707082,0.69700031,0,0)"
-         ry="0.10354951"
-         rx="0.1578715"
-         y="37.121048"
-         x="-5.0995173"
-         height="8.5"
-         width="52.25"
-         id="rect8680"
-         style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#ffa000;stroke-width:2.56267691;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <rect
-         transform="matrix(0.69700031,-0.71707082,0.71707082,0.69700031,0,0)"
-         ry="0.10354951"
-         rx="0.1578715"
-         y="57.535442"
-         x="-5.4776645"
-         height="8.5"
-         width="52.25"
-         id="rect8680-5"
-         style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#ffa000;stroke-width:2.56267691;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       id="g3055"
+       transform="matrix(0.58631468,0,0,0.58631468,-49.779019,5.5671552)">
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,52.254762,65.557142)"
+         id="g3071">
+        <path
+           transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+           style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 78.590216,32.671238 53.064834,-0.03817 0.007,9.648151 -53.064833,0.03817 z"
+           id="rect3770-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,65.224283,78.516555)"
+         id="g3071-2"
+         style="fill:#73d216;stroke:#a40000">
+        <path
+           transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)"
+           style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 78.58376,33.633026 53.06483,-0.03818 0.007,9.648152 -53.064829,0.03817 z"
+           id="rect3770-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+      </g>
+      <g
+         id="g3109"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,37.731223,122.21926)">
+        <g
+           id="g3071-4"
+           transform="matrix(0.70710679,-0.70710679,0.70710679,0.70710679,-4.0290077,36.562472)"
+           style="stroke:#ce5c00">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="rect3770-1-0"
+             d="m 76.867483,32.638193 54.578187,-0.03926 0.007,10.233409 -54.578185,0.03929 z"
+             style="color:#000000;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:3.41113782;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             transform="matrix(0.99999974,7.1938714e-4,-7.1838503e-4,0.99999974,0,0)" />
+        </g>
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path3065-9"
+           d="M 113.22434,-29.631228 77.043759,6.549349"
+           style="fill:none;stroke:#8ae234;stroke-width:3.41113758;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      </g>
     </g>
+    <path
+       style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 49.699974,5.1000295 -20.6,20.6000005"
+       id="path3065"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 57.699974,13.10003 -20.6,20.6"
+       id="path3065-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectVerticalAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectVerticalAxis.svg
index 4414c7fc16..774d878adb 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectVerticalAxis.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_SelectVerticalAxis.svg
@@ -14,13 +14,37 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_SelectVerticalAxis_3.svg"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/context_menu_some/Sketcher_SelectVerticalAxis_3_32px.png"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_SelectOrigin.svg"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/context_menu_some/Sketcher_SelectOrigin_3_32px.png"
    inkscape:export-xdpi="45"
    inkscape:export-ydpi="45">
   <defs
      id="defs2818">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3890">
+      <stop
+         style="stop-color:#204a87;stop-opacity:1"
+         offset="0"
+         id="stop3892" />
+      <stop
+         style="stop-color:#729fcf;stop-opacity:1"
+         offset="1"
+         id="stop3894" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3786">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3788" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1"
+         id="stop3790" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3602">
       <stop
@@ -173,6 +197,45 @@
        inkscape:vp_y="0 : 1000 : 0"
        inkscape:vp_x="0 : 0.5 : 1"
        sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786"
+       id="linearGradient3792"
+       x1="18"
+       y1="39"
+       x2="12"
+       y2="11"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3786-7"
+       id="linearGradient3792-1"
+       x1="22"
+       y1="27"
+       x2="9"
+       y2="30"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3786-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3788-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3790-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3890"
+       id="linearGradient3896"
+       x1="20.785244"
+       y1="58.824768"
+       x2="12.00527"
+       y2="36.247696"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -181,18 +244,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.625"
-     inkscape:cx="32"
-     inkscape:cy="32"
+     inkscape:zoom="12.197592"
+     inkscape:cx="41.740584"
+     inkscape:cy="44.58582"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="758"
-     inkscape:window-x="0"
-     inkscape:window-y="19"
-     inkscape:window-maximized="0" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3014"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -209,32 +282,61 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
+    <g
+       transform="matrix(0,1,-1,0,64,34)"
+       id="g3812-9">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         id="rect8776-4"
+         d="M 21,51 21,17 27,17 15,3 3,17 9,17 9,51 z"
+         style="color:#000000;fill:url(#linearGradient3792-1);fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path3784-8"
+         d="M 11,39 11,15 7.4,15 15,6.1 22.6,15 19,15 19,39"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g3812">
+      <path
+         sodipodi:nodetypes="cccccccc"
+         id="rect8776"
+         d="M 21,51 21,17 27,17 15,3 3,17 9,17 9,51 z"
+         style="color:#000000;fill:url(#linearGradient3792);fill-opacity:1;fill-rule:nonzero;stroke:#172a04;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path3784"
+         d="M 11,39 11,15 7.4,15 15,6.1 22.6,15 19,15 19,39"
+         style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
     <path
-       inkscape:connector-curvature="0"
-       style="color:#000000;fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#73d216;stroke-width:2.79176068;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 20.906056,51.512129 20.608455,16.069947 27.124319,16.051128 15.151348,3.3894859 3.31303,16.087656 l 6.704733,0.509563 0.130899,34.914032 z"
-       id="rect8776"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       style="fill:#ff2600;fill-opacity:1;stroke:#ff2600;stroke-width:3.03271651000000020;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 11.587197,42.450189 38.620336,-2e-6 -0.242895,-7.232361 10.444496,10.848542 -9.958705,12.51755 -0.242896,-6.954195 -38.377441,0.278168 z"
-       id="path3340"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       sodipodi:ry="48.57143"
-       sodipodi:rx="48.57143"
-       sodipodi:cy="655.2193"
-       sodipodi:cx="197.14285"
-       id="path3869-0"
-       style="fill:#150f8e;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        sodipodi:type="arc"
-       transform="matrix(-0.1380929,0.1336078,-0.14681978,-0.14114879,138.59384,113.43015)" />
+       style="fill:#729fcf;fill-opacity:1;stroke:#0b1521;stroke-width:2.12263083;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04"
+       id="path3870"
+       sodipodi:cx="15.768116"
+       sodipodi:cy="47.536232"
+       sodipodi:rx="13.797101"
+       sodipodi:ry="13.797101"
+       d="m 29.565217,47.536232 a 13.797101,13.797101 0 1 1 -27.594202,0 13.797101,13.797101 0 1 1 27.594202,0 z"
+       transform="matrix(0.94222692,0,0,0.94222692,1.142857,3.2100825)" />
     <path
-       style="fill:#008900;fill-opacity:1;stroke:none"
-       d="m 41.926477,3.185127 7.662914,7.350204 7.859681,-7.3502041 3.30268,3.7980821 -8.309374,8.063414 0.358566,11.840309 -5.544763,-0.06675 -0.270335,-11.956251 -8.857451,-7.550454 z"
-       id="path4181"
+       sodipodi:type="arc"
+       style="fill:url(#linearGradient3896);fill-opacity:1;stroke:#729fcf;stroke-width:2.50856375999999990;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000000"
+       id="path3870-2"
+       sodipodi:cx="15.768116"
+       sodipodi:cy="47.536232"
+       sodipodi:rx="13.797101"
+       sodipodi:ry="13.797101"
+       d="m 29.565217,47.536232 a 13.797101,13.797101 0 1 1 -27.594202,0 13.797101,13.797101 0 1 1 27.594202,0 z"
+       transform="matrix(0.79726894,0,0,0.79726893,3.4285709,10.100839)" />
+    <path
+       style="fill:#8ae234;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 39,5 -4,4 10,10 0,14 6,0 0,-14 10,-10 -4,-4 -9,9 z"
+       id="path3898"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccccccc" />
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg
index 7fab95aaca..06306e75d0 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Sketch.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="Sketcher_NewSketch.svg"
+   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"
@@ -23,6 +23,30 @@
    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>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient6349">
@@ -74,6 +98,24 @@
        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"
@@ -82,18 +124,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="3.8890873"
-     inkscape:cx="24.311263"
-     inkscape:cy="23.456398"
+     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="1280"
-     inkscape:window-height="756"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -117,74 +169,54 @@
        inkscape:export-ydpi="3.2478156"
        transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
       <rect
-         style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:29.94246101;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3860"
-         width="279.46939"
-         height="242.47264"
-         x="908.45099"
-         y="1168.7698" />
+         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:#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="path3862"
+         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.6471726,0,0,7.3274701,940.43005,910.31002)" />
+         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="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483137;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888"
-         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(4.3431863,0,0,4.5377509,1040.0959,1163.3368)"
-         inkscape:transform-center-y="-1.249386" />
+         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
-         sodipodi:type="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483137;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888-9"
-         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(4.3431863,0,0,-4.5377509,1040.0959,1407.8557)"
-         inkscape:transform-center-y="9.1339339" />
+         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
-         sodipodi:type="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483133;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888-97"
-         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(3.4930984,-2.4730917,2.8142718,3.6495811,1130.1679,976.90703)"
-         inkscape:transform-center-y="-6.1667373"
-         inkscape:transform-center-x="3.9989493" />
+         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>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Symmetry.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Symmetry.svg
index 0dd0e1e6eb..db8df11144 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Symmetry.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Symmetry.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48+devel r"
-   sodipodi:docname="Sketcher_Mirror_Element3.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Symmetry.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
    inkscape:export-filename="/home/user/Downloads/Sketcher_Mirror_Element_3_22px.png"
@@ -176,6 +176,184 @@
        fx="225.26402"
        fy="672.79736"
        r="34.345188" />
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3323-4-8"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-6-8"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-6-8">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-61-2" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-8-9" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3323-4"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4-61" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7-6"
+       id="linearGradient3093-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       id="linearGradient3836-9-7-6">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0-7" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-5"
+       id="linearGradient3091-3"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       id="linearGradient3836-9-5">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-6" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3093"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       id="linearGradient3836-9-7">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-0" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3091"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       id="linearGradient3836-9">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-5"
+       id="linearGradient3155"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7-6"
+       id="linearGradient3157"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9"
+       id="linearGradient3172"
+       gradientUnits="userSpaceOnUse"
+       x1="-24.890066"
+       y1="10.114055"
+       x2="-12.869251"
+       y2="13.649589" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-7"
+       id="linearGradient3174"
+       gradientUnits="userSpaceOnUse"
+       x1="-25.073793"
+       y1="8.5160742"
+       x2="-11.638764"
+       y2="13.465822" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-6"
+       id="linearGradient3187"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2-6-8"
+       id="linearGradient3189"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.53559025,0,0,0.53556875,-6.4812797,2.8041108)"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -184,18 +362,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="9.139678"
-     inkscape:cx="19.883012"
-     inkscape:cy="29.31678"
+     inkscape:zoom="6.4627283"
+     inkscape:cx="-3.913532"
+     inkscape:cy="41.850275"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="964"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-nodes="false"
+     inkscape:snap-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3060"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -204,7 +392,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -212,160 +400,161 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path2380"
-       d="M 16.497523,5.4570406 C -2.5906767,8.1425349 -2.7840208,44.365459 15.177536,56.219143 l 2.311152,-1.972364 C 1.2777882,40.377434 1.6067272,12.911394 17.712496,8.6576893 z"
-       style="fill:#008900;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.61716294;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path2374"
-       sodipodi:cx="197.14285"
-       sodipodi:cy="655.2193"
-       sodipodi:rx="48.57143"
-       sodipodi:ry="48.57143"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       transform="matrix(0.02722827,0.10163986,-0.0963908,0.02813867,75.881628,-31.131656)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3166);fill-opacity:1;stroke:none"
-       id="path2376"
-       sodipodi:cx="225.26402"
-       sodipodi:cy="672.79736"
-       sodipodi:rx="34.345188"
-       sodipodi:ry="23.991123"
-       d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-       transform="matrix(0.07375337,0.07176258,-0.06777171,0.07728245,45.702034,-62.336232)" />
-    <rect
-       ry="0"
-       transform="matrix(0.98824401,0.15288484,0.0014311,0.99999898,0,0)"
-       y="11.241286"
-       x="30.323679"
-       height="31.96623"
-       width="3.8371737"
-       id="rect2269"
-       style="fill:#008900;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.6582976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     <g
-       id="g3865-3"
-       transform="matrix(-0.07817103,0.07182092,-0.08311111,-0.07587459,102.20286,87.739903)">
+       id="g3176"
+       transform="translate(-44.902386,-2.6777075)">
+      <path
+         style="fill:none;stroke:#172a04;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 77.902386,22.6769 0,24"
+         id="path3491-7"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#73d216;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 77.902386,22.6769 0,24"
+         id="path3491-4-7"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 76.902386,22.6769 0,24"
+         id="path3491-4-1-3"
+         inkscape:connector-curvature="0" />
       <g
-         id="g3867-3">
+         id="g3797-7-2-9-5-4-9-5-96"
+         transform="matrix(0.80022953,0,0,0.80021786,91.366816,15.528782)"
+         style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none">
         <path
-           transform="translate(-53.336546,55.046182)"
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path3869-0"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z" />
+           d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z"
+           id="path4250-6-9-4-1-2-4-1-3"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
         <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3209);fill-opacity:1;stroke:none"
-           id="path3871-4"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)" />
+           d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z"
+           id="path4250-7-0-1-8-7-3-8-7-7"
+           style="fill:url(#linearGradient3187);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+      </g>
+      <g
+         id="g3797-7-2-9-5-4-9-5-96-5"
+         transform="matrix(0.80022953,0,0,0.80021786,91.366816,39.528782)"
+         style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none">
+        <path
+           d="m -21.570202,4.8706993 a 6.2460052,6.2456584 0.01677682 1 1 9.488239,8.1250407 6.2460052,6.2456584 0.01677682 1 1 -9.488239,-8.1250407 z"
+           id="path4250-6-9-4-1-2-4-1-3-7"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930096;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
+        <path
+           d="m -19.674789,6.4961011 a 3.7491316,3.7489813 0 1 1 5.695246,4.8771099 3.7491316,3.7489813 0 0 1 -5.695246,-4.8771099 z"
+           id="path4250-7-0-1-8-7-3-8-7-7-5"
+           style="fill:url(#linearGradient3189);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930048;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           inkscape:connector-curvature="0" />
       </g>
     </g>
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path2380-1"
-       d="M 47.044806,57.401246 C 66.366872,54.888126 66.797477,19.118459 48.709182,7.2819626 L 46.359024,9.2129093 C 62.663732,23.027186 62.152821,50.148217 45.836827,54.231684 z"
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.6167835;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff2000;fill-opacity:1;stroke:#000000;stroke-width:5.80000019;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path2374-1"
-       sodipodi:cx="197.14285"
-       sodipodi:cy="655.2193"
-       sodipodi:rx="48.57143"
-       sodipodi:ry="48.57143"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       transform="matrix(-0.0268165,-0.10282401,0.09763774,-0.02774709,-41.424526,95.24316)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4019);fill-opacity:1;stroke:none"
-       id="path2376-9"
-       sodipodi:cx="225.26402"
-       sodipodi:cy="672.79736"
-       sodipodi:rx="34.345188"
-       sodipodi:ry="23.991123"
-       d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-       transform="matrix(-0.07405707,-0.0729761,0.06904927,-0.07757038,-13.485831,124.20439)" />
     <g
-       transform="matrix(-0.07817103,0.07182092,-0.08311111,-0.07587459,102.04063,64.13534)"
-       id="g3995">
+       id="g3144"
+       transform="translate(-1.1745083,-1.1475791)">
+      <path
+         style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:#172a04;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 16.999998,59.280746 4.242643,-3.606293 C 6.6523031,43.091564 5.8374941,25.493501 19.82843,13.60105 19.844491,13.587398 18.854942,12.854697 18.8703,12.841688 L 15.586254,9.9951538 c -0.101453,0.084457 0.09999,-0.085701 -4.14e-4,-3.524e-4 C -0.18734994,23.402187 0.49132306,45.248187 17.000049,59.28079 z"
+         id="path2380-7-2"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccsccsc" />
+      <path
+         style="fill:none;stroke:#8ae234;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="M 17,56.87655 C 2.1507571,44.254529 3.5649751,22.616776 14.878682,13"
+         id="path3892-7"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cc" />
       <g
-         id="g3997">
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,-13.115023,58.408305)"
+         id="g3827-0-0">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-7-9">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-6-3"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3155);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-0-60"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,-8.5755878,47.572687)"
+         id="g3797-7-6-6">
         <path
-           d="m 245.71428,655.2193 a 48.57143,48.57143 0 0 1 -48.57143,48.57143 48.57143,48.57143 0 0 1 -48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,-48.57143 48.57143,48.57143 0 0 1 48.57143,48.57143 z"
-           sodipodi:ry="48.57143"
-           sodipodi:rx="48.57143"
-           sodipodi:cy="655.2193"
-           sodipodi:cx="197.14285"
-           id="path3999"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc"
-           transform="translate(-53.336546,55.046182)" />
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-0-2"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
         <path
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-401.42921,276.85497)"
-           d="m 259.60921,672.79736 a 34.345188,23.991123 0 0 1 -34.34519,23.99113 34.345188,23.991123 0 0 1 -34.34519,-23.99113 34.345188,23.991123 0 0 1 34.34519,-23.99112 34.345188,23.991123 0 0 1 34.34519,23.99112 z"
-           sodipodi:ry="23.991123"
-           sodipodi:rx="34.345188"
-           sodipodi:cy="672.79736"
-           sodipodi:cx="225.26402"
-           id="path4001"
-           style="fill:url(#radialGradient4003);fill-opacity:1;stroke:none"
-           sodipodi:type="arc" />
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3157);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-6-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+      </g>
+    </g>
+    <g
+       id="g3159"
+       transform="translate(-54.000005,-2.9999581)">
+      <g
+         id="g3401-3"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/arc.png"
+         inkscape:export-xdpi="6.7480335"
+         inkscape:export-ydpi="6.7480335"
+         transform="matrix(0.10363852,-0.08809389,-0.10363852,-0.08809389,217.64438,58.466523)">
+        <g
+           id="g3389-6">
+          <path
+             style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:14.80067348;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             d="m -567.54661,546.61314 0,40.93691 c 141.80801,1.02697 245.62146,96.97836 245.62146,231.97582 0,0.15497 8.93268,-0.46043 8.93242,-0.3125 l 32,0.3125 c 0.0101,-0.96882 0.004,0.96884 0.004,0 0,-152.19427 -127.26694,-272.91272 -286.55837,-272.91273 z"
+             id="path2380-7"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="ccsccsc" />
+          <path
+             style="fill:none;stroke:#ffffff;stroke-width:2.1692903;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             d="M 10.999999,13 C 32,13 49,32 49,48"
+             id="path3892"
+             inkscape:connector-curvature="0"
+             transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)"
+             sodipodi:nodetypes="cc" />
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,77.713088,60.260684)"
+         id="g3827-0">
+        <g
+           transform="translate(31.322131,40.570289)"
+           id="g3797-7">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-6"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3172);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-0"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
+      </g>
+      <g
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,84.252524,49.425066)"
+         id="g3797-7-6">
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-0"
+           d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient3174);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-6"
+           d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
       </g>
     </g>
-    <path
-       transform="matrix(0.02242711,0.10290729,-0.09761962,0.02307675,105.37882,-27.653513)"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       sodipodi:ry="48.57143"
-       sodipodi:rx="48.57143"
-       sodipodi:cy="655.2193"
-       sodipodi:cx="197.14285"
-       id="path4021"
-       style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       sodipodi:type="arc" />
-    <path
-       transform="matrix(0.07031086,0.07549741,-0.07133686,0.07363821,76.419378,-59.659458)"
-       d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-       sodipodi:ry="23.991123"
-       sodipodi:rx="34.345188"
-       sodipodi:cy="672.79736"
-       sodipodi:cx="225.26402"
-       id="path4023"
-       style="fill:url(#radialGradient4025);fill-opacity:1;stroke:none"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.80000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path2339"
-       sodipodi:cx="197.14285"
-       sodipodi:cy="655.2193"
-       sodipodi:rx="48.57143"
-       sodipodi:ry="48.57143"
-       d="m 245.71428,655.2193 a 48.57143,48.57143 0 1 1 -97.14286,0 48.57143,48.57143 0 1 1 97.14286,0 z"
-       transform="matrix(0.02242711,0.10290729,-0.09761962,0.02307675,105.77684,21.393039)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient4017);fill-opacity:1;stroke:none"
-       id="path2341"
-       sodipodi:cx="225.26402"
-       sodipodi:cy="672.79736"
-       sodipodi:rx="34.345188"
-       sodipodi:ry="23.991123"
-       d="m 259.60921,672.79736 a 34.345188,23.991123 0 1 1 -68.69038,0 34.345188,23.991123 0 1 1 68.69038,0 z"
-       transform="matrix(0.07031086,0.07549741,-0.07133686,0.07363821,76.817399,-10.612906)" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstraint.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstraint.svg
index d49da4c0fe..2a32a202d2 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstraint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstraint.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="Toggle.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_ToggleConstraint.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -756,18 +756,26 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="32"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="4"
+     inkscape:cx="35.512526"
+     inkscape:cy="65.917632"
+     inkscape:current-layer="g3134-7"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="688"
+     inkscape:window-width="1920"
+     inkscape:window-height="1137"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="0" />
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3105"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -785,35 +793,53 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <g
-       id="g4312">
-      <path
-         transform="matrix(1.0452195,0,0,1.0452195,0.2861081,-1.7260972)"
-         inkscape:connector-curvature="0"
-         id="path4469"
-         d="m 24.558574,7.4735431 0,32.4088829 33.968336,0 0,-32.4088829 -33.968336,0 z m 7.014343,7.2390959 19.821431,0 0,18.895903 -19.821431,0 0,-18.895903 z"
-         style="display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.59111559;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4483);enable-background:accumulate" />
-      <path
-         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient4429);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.19;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate"
-         d="m 23.573533,3.831533 0,33.874398 35.504367,0 0,-33.874398 -35.504367,0 z m 7.331528,7.566445 20.717746,0 0,19.750367 -20.717746,0 0,-19.750367 z"
-         id="path4427"
-         inkscape:connector-curvature="0" />
+       transform="translate(22,-22)"
+       id="g3134-7">
+      <rect
+         y="28"
+         x="6"
+         height="30"
+         width="30"
+         id="rect3107-5"
+         style="fill:none;stroke:#0b1521;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="28"
+         x="6"
+         height="30"
+         width="30"
+         id="rect3107-3-3"
+         style="fill:none;stroke:#3465a4;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="27"
+         x="5"
+         height="32"
+         width="32"
+         id="rect3107-6-5"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.50000000000000000;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       id="g4316">
-      <g
-         transform="matrix(1.0555556,0,0,1.0555556,-1.8333336,-0.8333356)"
-         id="g3444">
-        <path
-           inkscape:connector-curvature="0"
-           id="path4433"
-           d="m 7.4735742,26.117542 0,32.408884 33.9683358,0 0,-32.408884 -33.9683358,0 z m 7.0143428,7.239097 19.821431,0 0,18.895903 -19.821431,0 0,-18.895903 z"
-           style="display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.59111559;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.29019608;marker:none;marker-start:none;marker-mid:none;marker-end:none;filter:url(#filter4453);enable-background:accumulate" />
-      </g>
-      <path
-         inkscape:connector-curvature="0"
-         id="rect2663"
-         d="m 3.8397555,24.839755 0,34.209378 35.8554675,0 0,-34.209378 -35.8554675,0 z m 7.4040295,7.641269 20.922622,0 0,19.945676 -20.922622,0 0,-19.945676 z"
-         style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#linearGradient3524);fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
+       id="g3134">
+      <rect
+         y="28"
+         x="6"
+         height="30"
+         width="30"
+         id="rect3107"
+         style="fill:none;stroke:#280000;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="28"
+         x="6"
+         height="30"
+         width="30"
+         id="rect3107-3"
+         style="fill:none;stroke:#cc0000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="27"
+         x="5"
+         height="32"
+         width="32"
+         id="rect3107-6"
+         style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-opacity:1;stroke-dasharray:none" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction.svg
index ffae3ced5c..98204cdee5 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Sketcher_ToggleConstruction.svg"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_ToggleNormal.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
@@ -139,18 +139,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781748"
-     inkscape:cx="41.47"
-     inkscape:cy="31.31421"
-     inkscape:current-layer="g3404"
+     inkscape:zoom="11"
+     inkscape:cx="36.611167"
+     inkscape:cy="32.173934"
+     inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="709"
-     inkscape:window-x="-4"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3020"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -164,81 +174,102 @@
     </rdf:RDF>
   </metadata>
   <g
-     style="display:inline"
+     id="layer1"
+     inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     inkscape:label="Layer 1 copy 2"
-     id="g3404">
-    <path
-       inkscape:connector-curvature="0"
-       d="m 45.026349,55.104714 0,4.75 10.90625,0 0,-4.75 -10.90625,0 z m 0.006,-15.99148 10.90909,0 0,11.215686 -10.90909,0 z m 0,-16 10.90909,0 0,11.472817 -10.90909,0 z m 0,-15.9999957 10.90909,0 0,11.4728157 -10.90909,0 z m -33.090914,0 10.909091,0 0,53.0909077 -10.909091,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path3406" />
+     style="display:inline">
+    <g
+       id="g3016"
+       transform="matrix(0,1,-1,0,52.645116,-67.323607)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3012"
+         d="m 102.3236,17.645128 -9.999993,0 5.000001,-8.0000017 z"
+         style="fill:#ffffff;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3014"
+         d="m 92.323607,21.645115 9.999993,0 -4.999992,8.000001 z"
+         style="fill:#ffffff;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
     <rect
-       y="4.727273"
-       x="9.636363"
-       height="53.090908"
-       width="10.909091"
-       id="rect3408"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="4.727273"
-       x="42.727272"
-       height="11.472816"
-       width="10.909092"
-       id="rect3410"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="20.727272"
-       x="42.727272"
-       height="11.472816"
-       width="10.909092"
-       id="rect3412"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    <rect
-       y="36.727272"
-       x="42.727272"
-       height="11.215686"
-       width="10.909092"
-       id="rect3414"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path3416"
-       d="m 42.721591,52.71875 0,4.75 10.90625,0 0,-4.75 -10.90625,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-    <path
-       transform="matrix(1,0,0,2.3078805,3.6363636,-29.753212)"
-       inkscape:transform-center-x="-1.0010325"
-       d="m 36.185946,26.363636 -6.006195,3.467678 0,-6.935356 z"
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="true"
-       sodipodi:arg2="1.0471976"
-       sodipodi:arg1="0"
-       sodipodi:r2="2.0020649"
-       sodipodi:r1="4.0041299"
-       sodipodi:cy="26.363636"
-       sodipodi:cx="32.181816"
-       sodipodi:sides="3"
-       id="path3418"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.65825373;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       sodipodi:type="star" />
-    <path
-       transform="matrix(-1,0,0,-2.3078805,59.999996,91.935028)"
-       inkscape:transform-center-x="1.0010325"
-       d="m 36.185946,26.363636 -6.006195,3.467678 0,-6.935356 z"
-       inkscape:randomized="0"
-       inkscape:rounded="0"
-       inkscape:flatsided="true"
-       sodipodi:arg2="1.0471976"
-       sodipodi:arg1="0"
-       sodipodi:r2="2.0020649"
-       sodipodi:r1="4.0041299"
-       sodipodi:cy="26.363636"
-       sodipodi:cx="32.181816"
-       sodipodi:sides="3"
-       id="path3420"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.65825373;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       sodipodi:type="star" />
+       style="fill:#ffffff;fill-opacity:1;stroke:#2e3436;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000000"
+       id="rect3022"
+       width="8"
+       height="54"
+       x="9"
+       y="5" />
+    <g
+       id="g3821"
+       transform="translate(-28,12)"
+       style="stroke:#2e3436;fill:#d3d7cf">
+      <rect
+         y="-9"
+         x="77"
+         height="10"
+         width="8"
+         id="rect3022-1"
+         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:2.04000000000000000;display:inline" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path3798-7"
+         d="m 84,-7 -5,0 0,7"
+         style="fill:#d3d7cf;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+    </g>
+    <g
+       style="display:inline;stroke:#2e3436;fill:#d3d7cf"
+       id="g3821-4"
+       transform="translate(-28,28)">
+      <rect
+         y="-9"
+         x="77"
+         height="10"
+         width="8"
+         id="rect3022-1-0"
+         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:2.04000000000000000;display:inline" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path3798-7-9"
+         d="m 84,-7 -5,0 0,7"
+         style="fill:#d3d7cf;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+    </g>
+    <g
+       style="display:inline;stroke:#2e3436;fill:#d3d7cf"
+       id="g3821-48"
+       transform="translate(-28,44)">
+      <rect
+         y="-9"
+         x="77"
+         height="10"
+         width="8"
+         id="rect3022-1-8"
+         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:2.04000000000000000;display:inline" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path3798-7-2"
+         d="m 84,-7 -5,0 0,7"
+         style="fill:#d3d7cf;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+    </g>
+    <g
+       style="display:inline;stroke:#2e3436;fill:#d3d7cf"
+       id="g3821-4-4"
+       transform="translate(-28,60)">
+      <rect
+         y="-9"
+         x="77"
+         height="10"
+         width="8"
+         id="rect3022-1-0-5"
+         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:2.04000000000000000;display:inline" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path3798-7-9-5"
+         d="m 84,-7 -5,0 0,7"
+         style="fill:#d3d7cf;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleNormal.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleNormal.svg
index 841e926eea..b840dbd031 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleNormal.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleNormal.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2726"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_ToggleNormal.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -139,18 +139,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781748"
-     inkscape:cx="41.47"
-     inkscape:cy="31.31421"
+     inkscape:zoom="11"
+     inkscape:cx="36.611167"
+     inkscape:cy="32.173934"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="709"
-     inkscape:window-x="-4"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3020"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2731">
     <rdf:RDF>
@@ -159,7 +169,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -168,77 +178,102 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
      style="display:inline">
+    <g
+       id="g3016"
+       transform="matrix(0,1,-1,0,52.645116,-67.323607)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path3012"
+         d="m 102.3236,17.645128 -9.999993,0 5.000001,-8.0000017 z"
+         style="fill:#ffffff;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3014"
+         d="m 92.323607,21.645115 9.999993,0 -4.999992,8.000001 z"
+         style="fill:#ffffff;stroke:#2e3436;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    </g>
+    <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:2.04"
+       id="rect3022"
+       width="8"
+       height="54"
+       x="9"
+       y="5" />
     <path
-       id="rect10648-9-7-7-0-2"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       d="m 45.026349,55.104714 0,4.75 10.90625,0 0,-4.75 -10.90625,0 z m 0.006,-15.99148 10.90909,0 0,11.215686 -10.90909,0 z m 0,-16 10.90909,0 0,11.472817 -10.90909,0 z m 0,-15.9999957 10.90909,0 0,11.4728157 -10.90909,0 z m -33.090914,0 10.909091,0 0,53.0909077 -10.909091,0 z"
+       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 16,7 -5,0 0,51"
+       id="path3798"
        inkscape:connector-curvature="0" />
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="rect10648"
-       width="10.909091"
-       height="53.090908"
-       x="9.636363"
-       y="4.727273" />
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="rect10648-9"
-       width="10.909092"
-       height="11.472816"
-       x="42.727272"
-       y="4.727273" />
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="rect10648-9-7"
-       width="10.909092"
-       height="11.472816"
-       x="42.727272"
-       y="20.727272" />
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="rect10648-9-7-7"
-       width="10.909092"
-       height="11.215686"
-       x="42.727272"
-       y="36.727272" />
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d2dff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.20000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       d="m 42.721591,52.71875 0,4.75 10.90625,0 0,-4.75 -10.90625,0 z"
-       id="rect10648-9-7-7-0"
-       inkscape:connector-curvature="0" />
-    <path
-       sodipodi:type="star"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.65825373;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path10725"
-       sodipodi:sides="3"
-       sodipodi:cx="32.181816"
-       sodipodi:cy="26.363636"
-       sodipodi:r1="4.0041299"
-       sodipodi:r2="2.0020649"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 36.185946,26.363636 -6.006195,3.467678 0,-6.935356 z"
-       inkscape:transform-center-x="-1.0010325"
-       transform="matrix(1,0,0,2.3078805,3.6363636,-29.753212)" />
-    <path
-       sodipodi:type="star"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b3b3b3;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.65825373;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="path10725-2"
-       sodipodi:sides="3"
-       sodipodi:cx="32.181816"
-       sodipodi:cy="26.363636"
-       sodipodi:r1="4.0041299"
-       sodipodi:r2="2.0020649"
-       sodipodi:arg1="0"
-       sodipodi:arg2="1.0471976"
-       inkscape:flatsided="true"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 36.185946,26.363636 -6.006195,3.467678 0,-6.935356 z"
-       inkscape:transform-center-x="1.0010325"
-       transform="matrix(-1,0,0,-2.3078805,59.999996,91.935028)" />
+    <g
+       id="g3821"
+       transform="translate(-28,12)">
+      <rect
+         y="-9"
+         x="77"
+         height="10"
+         width="8"
+         id="rect3022-1"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04;display:inline" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path3798-7"
+         d="m 84,-7 -5,0 0,7"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+    </g>
+    <g
+       style="display:inline"
+       id="g3821-4"
+       transform="translate(-28,28)">
+      <rect
+         y="-9"
+         x="77"
+         height="10"
+         width="8"
+         id="rect3022-1-0"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04;display:inline" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path3798-7-9"
+         d="m 84,-7 -5,0 0,7"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+    </g>
+    <g
+       style="display:inline"
+       id="g3821-48"
+       transform="translate(-28,44)">
+      <rect
+         y="-9"
+         x="77"
+         height="10"
+         width="8"
+         id="rect3022-1-8"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04;display:inline" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path3798-7-2"
+         d="m 84,-7 -5,0 0,7"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+    </g>
+    <g
+       style="display:inline"
+       id="g3821-4-4"
+       transform="translate(-28,60)">
+      <rect
+         y="-9"
+         x="77"
+         height="10"
+         width="8"
+         id="rect3022-1-0-5"
+         style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04;display:inline" />
+      <path
+         sodipodi:nodetypes="ccc"
+         inkscape:connector-curvature="0"
+         id="path3798-7-9-5"
+         d="m 84,-7 -5,0 0,7"
+         style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" />
+    </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driven.svg
index ce5e112dbc..5889e0a12e 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driven.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driven.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Toggle_Constraint_Driving.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Toggle_Constraint_Driven.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -210,20 +210,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.4999999"
-     inkscape:cx="40.22559"
-     inkscape:cy="31.296241"
+     inkscape:zoom="3.5469896"
+     inkscape:cx="92.179353"
+     inkscape:cy="10.823921"
      inkscape:current-layer="g12536"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="731"
-     inkscape:window-height="563"
-     inkscape:window-x="547"
-     inkscape:window-y="52"
-     inkscape:window-maximized="0"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
      showguides="true"
-     inkscape:guide-bbox="true" />
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3122"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -232,7 +240,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -260,30 +268,28 @@
      inkscape:label="Layer 1 copy"
      id="g12536">
     <path
-       transform="matrix(0,-0.82336199,0.56779048,0,0.4742215,63.193519)"
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19099998;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3651);enable-background:accumulate"
-       d="m 9.2298766,21.579936 c -0.080714,-1.77e-4 -0.1567867,0.137412 -0.1568273,0.309354 l 0,27.403601 c -4.05e-5,0.171941 0.076113,0.309177 0.1568273,0.309354 l 6.1631444,0.02578 0,-11.189297 c 3.2e-5,-0.118391 0.03042,-0.206358 0.0941,-0.206236 l 40.775434,0.07734 c 0.06368,1.22e-4 0.09413,0.08785 0.0941,0.206236 l 0,11.189298 6.163145,0.02578 c 0.08071,1.77e-4 0.156787,-0.137412 0.156827,-0.309354 l 0,-27.403601 c 4e-5,-0.171941 -0.07611,-0.309177 -0.156827,-0.309354 l -6.163145,-0.02578 0,11.189297 c -3.2e-5,0.118391 -0.03042,0.206358 -0.0941,0.206236 L 15.487121,33.00125 c -0.06368,-1.22e-4 -0.09413,-0.08784 -0.0941,-0.206236 l 0,-11.189298 -6.1631444,-0.02578 z"
-       id="path12538"
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       inkscape:connector-curvature="0" />
+       style="fill:#888a85;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 3,61 0,-8 8,0 0,-42 -8,0 0,-8 24,0 0,8 -8,0 0,42 8,0 0,8 z"
+       id="path3018"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       id="path12540"
-       d="m 10.606856,52.661348 c -1.02e-4,0.06645 0.07803,0.129092 0.175648,0.129125 l 15.559502,0 c 0.09762,3.4e-5 0.175548,-0.06266 0.175649,-0.129125 l 0.01463,-5.074499 -6.353177,0 c -0.06722,-2.6e-5 -0.117168,-0.02504 -0.117098,-0.07748 l 0.04392,-33.572942 c 6.9e-5,-0.05244 0.04988,-0.07751 0.117098,-0.07748 l 6.353177,0 0.01463,-5.0745002 c 1.02e-4,-0.066452 -0.07803,-0.1290924 -0.175648,-0.1291254 l -15.559503,0 c -0.09762,-3.31e-5 -0.175548,0.062665 -0.175648,0.1291254 l -0.01464,5.0745002 6.353177,0 c 0.06723,2.6e-5 0.117168,0.02505 0.117098,0.07748 l -0.04391,33.57294 c -6.9e-5,0.05243 -0.04987,0.07751 -0.117098,0.07748 l -6.353177,0 -0.01464,5.074499 z"
-       style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.49806916999999995;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#eeeeec;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5,59 0,-4 8,0 0,-46 -8,0 0,-4 20,0 0,4 -8,0 0,46 8,0 0,4 z"
+       id="path3018-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       transform="matrix(0,-0.82336199,0.56779048,0,25.481476,63.174341)"
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19099998;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3651-2);enable-background:accumulate"
-       d="m 9.2298766,21.579936 c -0.080714,-1.77e-4 -0.1567867,0.137412 -0.1568273,0.309354 l 0,27.403601 c -4.05e-5,0.171941 0.076113,0.309177 0.1568273,0.309354 l 6.1631444,0.02578 0,-11.189297 c 3.2e-5,-0.118391 0.03042,-0.206358 0.0941,-0.206236 l 40.775434,0.07734 c 0.06368,1.22e-4 0.09413,0.08785 0.0941,0.206236 l 0,11.189298 6.163145,0.02578 c 0.08071,1.77e-4 0.156787,-0.137412 0.156827,-0.309354 l 0,-27.403601 c 4e-5,-0.171941 -0.07611,-0.309177 -0.156827,-0.309354 l -6.163145,-0.02578 0,11.189297 c -3.2e-5,0.118391 -0.03042,0.206358 -0.0941,0.206236 L 15.487121,33.00125 c -0.06368,-1.22e-4 -0.09413,-0.08784 -0.0941,-0.206236 l 0,-11.189298 -6.1631444,-0.02578 z"
-       id="path12538-9"
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       inkscape:connector-curvature="0" />
+       style="fill:#3465a4;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 37,61 0,-8 8,0 0,-42 -8,0 0,-8 24,0 0,8 -8,0 0,42 8,0 0,8 z"
+       id="path3018-36"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       id="path12540-7"
-       d="m 35.61411,52.64217 c -1.02e-4,0.06645 0.07803,0.129092 0.175648,0.129125 l 15.559502,0 c 0.09762,3.4e-5 0.175548,-0.06266 0.175649,-0.129125 l 0.01463,-5.074499 -6.353177,0 c -0.06722,-2.6e-5 -0.117168,-0.02504 -0.117098,-0.07748 l 0.04392,-33.572942 c 6.9e-5,-0.05244 0.04988,-0.07751 0.117098,-0.07748 l 6.353177,0 0.01463,-5.0744997 c 1.02e-4,-0.06645 -0.07803,-0.129092 -0.175648,-0.129125 l -15.559503,0 c -0.09762,-3.4e-5 -0.175548,0.06267 -0.175648,0.129125 l -0.01464,5.0744997 6.353177,0 c 0.06723,2.6e-5 0.117168,0.02505 0.117098,0.07748 l -0.04391,33.57294 c -6.9e-5,0.05243 -0.04987,0.07751 -0.117098,0.07748 l -6.353177,0 -0.01464,5.074499 z"
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:1.49806917;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 39,59 0,-4 8,0 0,-46 -8,0 0,-4 20,0 0,4 -8,0 0,46 8,0 0,4 z"
+       id="path3018-3-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driving.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driving.svg
index 77c91d7c06..eac0cc4c11 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driving.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driving.svg
@@ -14,8 +14,8 @@
    height="64px"
    id="svg2816"
    version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="Sketcher_Toggle_Constraint_Mode.svg">
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Sketcher_Toggle_Constraint_Driving.svg">
   <defs
      id="defs2818">
     <linearGradient
@@ -194,14 +194,6 @@
          stdDeviation="0.75623179"
          id="feGaussianBlur3653" />
     </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter3651-2">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.75623179"
-         id="feGaussianBlur3653-9" />
-    </filter>
   </defs>
   <sodipodi:namedview
      id="base"
@@ -210,20 +202,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.4999999"
-     inkscape:cx="40.22559"
-     inkscape:cy="31.296241"
+     inkscape:zoom="5.0162008"
+     inkscape:cx="49.4492"
+     inkscape:cy="32.819349"
      inkscape:current-layer="g12536"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="731"
-     inkscape:window-height="563"
-     inkscape:window-x="547"
-     inkscape:window-y="52"
-     inkscape:window-maximized="0"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
      showguides="true"
-     inkscape:guide-bbox="true" />
+     inkscape:guide-bbox="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3122"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2821">
     <rdf:RDF>
@@ -260,30 +260,28 @@
      inkscape:label="Layer 1 copy"
      id="g12536">
     <path
-       transform="matrix(0,-0.82336199,0.56779048,0,0.4742215,63.193519)"
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19099998;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3651);enable-background:accumulate"
-       d="m 9.2298766,21.579936 c -0.080714,-1.77e-4 -0.1567867,0.137412 -0.1568273,0.309354 l 0,27.403601 c -4.05e-5,0.171941 0.076113,0.309177 0.1568273,0.309354 l 6.1631444,0.02578 0,-11.189297 c 3.2e-5,-0.118391 0.03042,-0.206358 0.0941,-0.206236 l 40.775434,0.07734 c 0.06368,1.22e-4 0.09413,0.08785 0.0941,0.206236 l 0,11.189298 6.163145,0.02578 c 0.08071,1.77e-4 0.156787,-0.137412 0.156827,-0.309354 l 0,-27.403601 c 4e-5,-0.171941 -0.07611,-0.309177 -0.156827,-0.309354 l -6.163145,-0.02578 0,11.189297 c -3.2e-5,0.118391 -0.03042,0.206358 -0.0941,0.206236 L 15.487121,33.00125 c -0.06368,-1.22e-4 -0.09413,-0.08784 -0.0941,-0.206236 l 0,-11.189298 -6.1631444,-0.02578 z"
-       id="path12538"
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       inkscape:connector-curvature="0" />
+       style="fill:#888a85;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 37,61 0,-8 8,0 0,-42 -8,0 0,-8 24,0 0,8 -8,0 0,42 8,0 0,8 z"
+       id="path3018"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       id="path12540"
-       d="m 10.606856,52.661348 c -1.02e-4,0.06645 0.07803,0.129092 0.175648,0.129125 l 15.559502,0 c 0.09762,3.4e-5 0.175548,-0.06266 0.175649,-0.129125 l 0.01463,-5.074499 -6.353177,0 c -0.06722,-2.6e-5 -0.117168,-0.02504 -0.117098,-0.07748 l 0.04392,-33.572942 c 6.9e-5,-0.05244 0.04988,-0.07751 0.117098,-0.07748 l 6.353177,0 0.01463,-5.0745002 c 1.02e-4,-0.066452 -0.07803,-0.1290924 -0.175648,-0.1291254 l -15.559503,0 c -0.09762,-3.31e-5 -0.175548,0.062665 -0.175648,0.1291254 l -0.01464,5.0745002 6.353177,0 c 0.06723,2.6e-5 0.117168,0.02505 0.117098,0.07748 l -0.04391,33.57294 c -6.9e-5,0.05243 -0.04987,0.07751 -0.117098,0.07748 l -6.353177,0 -0.01464,5.074499 z"
-       style="color:#000000;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:1.49806917;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#eeeeec;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 39,59 0,-4 8,0 0,-46 -8,0 0,-4 20,0 0,4 -8,0 0,46 8,0 0,4 z"
+       id="path3018-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       transform="matrix(0,-0.82336199,0.56779048,0,25.481476,63.174341)"
-       style="opacity:0.6;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.19099998;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3651-2);enable-background:accumulate"
-       d="m 9.2298766,21.579936 c -0.080714,-1.77e-4 -0.1567867,0.137412 -0.1568273,0.309354 l 0,27.403601 c -4.05e-5,0.171941 0.076113,0.309177 0.1568273,0.309354 l 6.1631444,0.02578 0,-11.189297 c 3.2e-5,-0.118391 0.03042,-0.206358 0.0941,-0.206236 l 40.775434,0.07734 c 0.06368,1.22e-4 0.09413,0.08785 0.0941,0.206236 l 0,11.189298 6.163145,0.02578 c 0.08071,1.77e-4 0.156787,-0.137412 0.156827,-0.309354 l 0,-27.403601 c 4e-5,-0.171941 -0.07611,-0.309177 -0.156827,-0.309354 l -6.163145,-0.02578 0,11.189297 c -3.2e-5,0.118391 -0.03042,0.206358 -0.0941,0.206236 L 15.487121,33.00125 c -0.06368,-1.22e-4 -0.09413,-0.08784 -0.0941,-0.206236 l 0,-11.189298 -6.1631444,-0.02578 z"
-       id="path12538-9"
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       inkscape:connector-curvature="0" />
+       style="fill:#cc0000;stroke:#280000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="m 3,61 0,-8 8,0 0,-42 -8,0 0,-8 24,0 0,8 -8,0 0,42 8,0 0,8 z"
+       id="path3018-36"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
     <path
-       sodipodi:nodetypes="ccccccccccccccccccccc"
-       id="path12540-7"
-       d="m 35.61411,52.64217 c -1.02e-4,0.06645 0.07803,0.129092 0.175648,0.129125 l 15.559502,0 c 0.09762,3.4e-5 0.175548,-0.06266 0.175649,-0.129125 l 0.01463,-5.074499 -6.353177,0 c -0.06722,-2.6e-5 -0.117168,-0.02504 -0.117098,-0.07748 l 0.04392,-33.572942 c 6.9e-5,-0.05244 0.04988,-0.07751 0.117098,-0.07748 l 6.353177,0 0.01463,-5.0744997 c 1.02e-4,-0.06645 -0.07803,-0.129092 -0.175648,-0.129125 l -15.559503,0 c -0.09762,-3.4e-5 -0.175548,0.06267 -0.175648,0.129125 l -0.01464,5.0744997 6.353177,0 c 0.06723,2.6e-5 0.117168,0.02505 0.117098,0.07748 l -0.04391,33.57294 c -6.9e-5,0.05243 -0.04987,0.07751 -0.117098,0.07748 l -6.353177,0 -0.01464,5.074499 z"
-       style="color:#000000;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:#1a1a1a;stroke-width:1.49806916999999995;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       inkscape:connector-curvature="0" />
+       style="fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 5,59 0,-4 8,0 0,-46 -8,0 0,-4 20,0 0,4 -8,0 0,46 8,0 0,4 z"
+       id="path3018-3-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Trimming.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Trimming.svg
index 78f55c32ad..c219890774 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Trimming.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Trimming.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg2869"
    sodipodi:version="0.32"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_Trimming.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
@@ -216,6 +216,35 @@
          offset="1"
          id="stop3148-33" />
     </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3092"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3836-9-3-7-2-7-7-2">
+      <stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-4-4-6-4-4" />
+      <stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-0-5-1-0-5" />
+    </linearGradient>
+    <linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3108"
+       xlink:href="#linearGradient3836-9-3-7-2-7-7-2"
+       inkscape:collect="always" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -224,18 +253,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="23.481841"
-     inkscape:cy="31.126556"
+     inkscape:zoom="15.556349"
+     inkscape:cx="9.2005031"
+     inkscape:cy="41.254369"
      inkscape:current-layer="g2337"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="756"
-     inkscape:window-x="0"
-     inkscape:window-y="22"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3017"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata2874">
     <rdf:RDF>
@@ -258,25 +297,6 @@
        inkscape:export-xdpi="6.7480335"
        inkscape:export-ydpi="6.7480335"
        transform="matrix(0.146567,0,0,0.146567,70.402359,-55.12963)">
-      <path
-         style="fill:#000000;fill-opacity:0.5098038;fill-rule:evenodd;stroke:none;stroke-width:5.79939556;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -416.36553,394.59779 -15.35134,13.006 40.93691,48.39937 15.56456,-13.006 -41.15013,-48.39937 z m 219.39625,1.27928 -65.02998,150.31521 c -7.44602,-0.36009 -15.05278,1.20369 -21.96095,4.69069 l -26.86485,-31.76875 -15.56455,13.006 26.86485,31.76875 c -11.51433,15.64804 -11.48056,37.72926 1.27927,53.51648 1.17094,1.44875 2.52956,2.57892 3.83784,3.83783 l -73.98494,170.78367 26.43843,11.51351 73.5585,-170.14403 c 6.64836,0.64116 13.41626,-0.30236 19.82882,-2.77177 l 148.18308,174.83472 21.960943,-18.54954 -148.183073,-174.83472 c 9.03375,-15.2489 8.19133,-35.05922 -3.62463,-49.67864 -1.59128,-1.96881 -3.27863,-3.71279 -5.11711,-5.33033 l 64.81677,-149.67557 -26.43842,-11.51351 z m -166.5194,60.97894 -15.56456,13.006 40.93691,48.39936 15.56455,-13.00599 -40.9369,-48.39937 z"
-         id="path3667-7" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -305.75909,573.36277 15.40227,-13.03802 -40.95656,-48.38342 -15.40226,13.03803 40.95655,48.38341 z"
-         id="path3667"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -190.85275,400.3071 -26.45707,-11.4492 -171.45098,396.19285 26.45707,11.4492 171.45098,-396.19285 z"
-         id="path3624"
-         sodipodi:nodetypes="ccccc" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path2848"
-         d="m -120.85211,798.49268 22.003231,-18.62574 -154.688211,-182.7386 -22.00323,18.62574 154.68821,182.7386 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <g
          inkscape:export-ydpi="7.0721951"
          inkscape:export-xdpi="7.0721951"
@@ -285,35 +305,63 @@
          id="g2337"
          style="stroke-width:6.44377279;stroke-miterlimit:4;stroke-dasharray:none">
         <path
-           sodipodi:type="arc"
-           style="fill:#ff2000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:6.44377278999999969;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           id="path2339"
-           sodipodi:cx="197.14285"
-           sodipodi:cy="655.2193"
-           sodipodi:rx="48.57143"
-           sodipodi:ry="48.57143"
-           d="m 245.71428,655.2193 c 0,26.82526 -21.74617,48.57143 -48.57143,48.57143 -26.82526,0 -48.57143,-21.74617 -48.57143,-48.57143 0,-26.82526 21.74617,-48.57143 48.57143,-48.57143 26.82526,0 48.57143,21.74617 48.57143,48.57143 z" />
+           style="fill:none;stroke:#2e3436;stroke-width:60.64727402;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 336.49054,470.90193 73.721296,816.52389"
+           id="path3019"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
         <path
-           sodipodi:type="arc"
-           style="fill:url(#radialGradient3675);fill-opacity:1;stroke:none"
-           id="path2341"
-           sodipodi:cx="225.26402"
-           sodipodi:cy="672.79736"
-           sodipodi:rx="34.345188"
-           sodipodi:ry="23.991123"
-           d="m 259.60921,672.79736 c 0,13.24993 -15.37686,23.99113 -34.34519,23.99113 -18.96832,0 -34.34519,-10.7412 -34.34519,-23.99113 0,-13.24993 15.37687,-23.99112 34.34519,-23.99112 18.96833,0 34.34519,10.74119 34.34519,23.99112 z"
-           transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" />
+           style="fill:none;stroke:#2e3436;stroke-width:60.64727402;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+           d="M 40.407566,405.42543 194.43002,656.88015"
+           id="path3795"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#2e3436;stroke-width:45.48545553;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:45.48545553,90.97091106;stroke-dashoffset:40.93690998"
+           d="M 194.43003,656.88014 331.15699,881.21789"
+           id="path3023"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;stroke:#d3d7cf;stroke-width:30.32363701;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 336.49056,470.90193 73.721306,816.52388"
+           id="path3019-1"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#d3d7cf;stroke-width:30.32363701;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 40.407586,405.42543 194.43003,656.88015"
+           id="path3795-7" />
+        <path
+           style="fill:none;stroke:#ffffff;stroke-width:15.1618185;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 343.89262,472.53885 76.525636,824.90811"
+           id="path3019-1-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#ffffff;stroke-width:15.1618185;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           d="M 32.350726,406.74935 186.37317,658.20407"
+           id="path3795-7-0" />
+        <path
+           style="fill:none;stroke:#d3d7cf;stroke-width:15.16181851000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:45.48545537999999800, 90.97091075000000200;stroke-dashoffset:40.93690981999999700"
+           d="M 194.43003,656.88015 331.15698,881.2179"
+           id="path3023-8"
+           inkscape:connector-curvature="0" />
+        <g
+           transform="matrix(-7.4020742,-1.6369126,1.6369126,-7.4020742,22.011926,723.06262)"
+           id="g3797-7-2-9-5-4-9-5">
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:#ef2929;stroke:#280000;stroke-width:1.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-6-9-4-1-2-4-1"
+             d="M -26.156204,5.582626 A 8.993818,8.9934077 0.02042283 1 1 -12.493793,17.282241 8.993818,8.9934077 0.02042283 1 1 -26.156204,5.582626 z" />
+          <path
+             inkscape:connector-curvature="0"
+             style="fill:url(#linearGradient3108);fill-opacity:1;stroke:#ef2929;stroke-width:1.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="path4250-7-0-1-8-7-3-8-7"
+             d="M -24.633588,6.893588 A 6.9999997,7.0000001 0 1 1 -14,16 6.9999997,7.0000001 0 0 1 -24.633588,6.893588 z" />
+        </g>
       </g>
-      <path
-         sodipodi:nodetypes="ccccc"
-         id="path3671"
-         d="m -358.43702,511.13248 15.40227,-13.03802 -40.95656,-48.38341 -15.40227,13.03801 40.95656,48.38342 z"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5.79939556;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m -411.11496,448.90219 15.40226,-13.03802 -40.95656,-48.38342 -15.40226,13.03802 40.95656,48.38342 z"
-         id="path3673"
-         sodipodi:nodetypes="ccccc" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ViewSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ViewSketch.svg
index f43d286913..ec64e14d15 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ViewSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ViewSketch.svg
@@ -14,7 +14,7 @@
    height="64px"
    id="svg5821"
    sodipodi:version="0.32"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="Sketcher_NewSketch.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1"
@@ -23,6 +23,42 @@
    inkscape:export-ydpi="45">
   <defs
      id="defs5823">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3857">
+      <stop
+         style="stop-color:#34e0e2;stop-opacity:1"
+         offset="0"
+         id="stop3859" />
+      <stop
+         style="stop-color:#06989a;stop-opacity:1"
+         offset="1"
+         id="stop3861" />
+    </linearGradient>
+    <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>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient6349">
@@ -74,61 +110,89 @@
        r="194.40614"
        gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
        gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient2695"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(5.6470637,0.01334924,-0.03399104,2.0869569,1549.027,102.22394)"
-       cx="44.286785"
-       cy="6.4023118"
-       fx="44.286785"
-       fy="6.4023118"
-       r="27.986706" />
     <linearGradient
-       id="linearGradient3253">
-      <stop
-         style="stop-color:#89d5f8;stop-opacity:1;"
-         offset="0"
-         id="stop3255" />
-      <stop
-         style="stop-color:#00899e;stop-opacity:1;"
-         offset="1"
-         id="stop3257" />
-    </linearGradient>
-    <radialGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3253"
-       id="radialGradient3270"
+       xlink:href="#linearGradient3768"
+       id="linearGradient3774"
+       x1="1178.153"
+       y1="1453.8708"
+       x2="1105.0463"
+       y2="1059.0945"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.3741544,0.4236661,-0.5825572,-0.5144765,35.157782,16.985792)"
-       cx="18.195206"
-       cy="17.38835"
-       fx="18.195206"
-       fy="17.38835"
-       r="27.986706" />
+       gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)" />
     <linearGradient
-       id="linearGradient3098">
+       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:#89d5f8;stop-opacity:1;"
+         style="stop-color:#555753;stop-opacity:1"
          offset="0"
-         id="stop3100" />
+         id="stop3876" />
       <stop
-         style="stop-color:#00899e;stop-opacity:1;"
+         style="stop-color:#babdb6;stop-opacity:1"
          offset="1"
-         id="stop3102" />
+         id="stop3878" />
     </linearGradient>
-    <radialGradient
-       r="27.986706"
-       fy="17.38835"
-       fx="18.195206"
-       cy="17.38835"
-       cx="18.195206"
-       gradientTransform="matrix(-0.3741544,0.4236661,-0.5825572,-0.5144765,35.157782,16.985792)"
+    <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="radialGradient3106"
-       xlink:href="#linearGradient3253"
+       id="linearGradient3127"
+       xlink:href="#linearGradient3866"
        inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3857"
+       id="radialGradient3863"
+       cx="43.783218"
+       cy="41.446495"
+       fx="43.783218"
+       fy="41.446495"
+       r="12.458333"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.38461542,0.38461546,-0.84615388,0.84615382,61.897077,-11.243146)" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -137,18 +201,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.7781746"
-     inkscape:cx="59.216468"
-     inkscape:cy="24.797857"
+     inkscape:zoom="20.387325"
+     inkscape:cx="30.091296"
+     inkscape:cy="13.967094"
      inkscape:current-layer="g3360"
      showgrid="true"
      inkscape:document-units="px"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1863"
-     inkscape:window-height="1056"
-     inkscape:window-x="57"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1" />
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2997"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
      id="metadata5826">
     <rdf:RDF>
@@ -172,108 +246,98 @@
        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"
-         style="opacity:0.6523605;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 939.30104,1042.2626 0,360.0859 275.79216,0 50.4598,-47.9468 0,-312.1391 -326.25196,0 z"
-         id="path3650" />
+         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"
-         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#242121;stroke-width:14.41509247;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 912.0654,1011.6363 0,360.0859 275.7922,0 50.4598,-47.9467 0,-312.1392 -326.252,0 z"
-         id="rect3643" />
+         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"
-         style="fill:none;stroke:#242121;stroke-width:14.41509247;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="m 1235.7011,1322.2371 -46.2257,-4.7916 0,52.7082"
-         id="path3648" />
+         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:#ff1e00;stroke-width:20.20775795;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3860"
-         width="187.16376"
-         height="164.90605"
-         x="941.80249"
-         y="1153.5219" />
+         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:#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="path3862"
+         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.1213961,0,0,4.9834247,963.21922,977.74292)" />
+         transform="matrix(5.4281292,0,0,5.1424383,996.04635,999.19155)" />
       <path
-         sodipodi:type="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888"
-         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.9086799,0,0,3.086132,1029.9665,1149.8268)"
-         inkscape:transform-center-y="-0.84971719" />
+         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
-         sodipodi:type="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888-9"
-         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.9086799,0,0,-3.086132,1029.9665,1316.1246)"
-         inkscape:transform-center-y="6.2120078" />
+         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
-         sodipodi:type="star"
-         style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.60459292;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3888-97"
-         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.3393667,-1.6819538,1.884749,2.4820862,1090.2888,1023.0357)"
-         inkscape:transform-center-y="-4.1940025"
-         inkscape:transform-center-x="2.6781346" />
+         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" />
+      <path
+         style="fill:#16d0d2;fill-opacity:1;stroke:#042a2a;stroke-width:14.62134743;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:2.04"
+         d="m 1200.085,1329.5894 29.2427,-29.2427 87.7281,87.7282 -29.2427,29.2426 z"
+         id="rect3057"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccc" />
+      <path
+         style="fill:none;stroke:#34e0e2;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 1301.7035,1393.1923 -73.1068,-73.1067"
+         id="path3865"
+         inkscape:connector-curvature="0" />
       <path
          sodipodi:type="arc"
-         style="color:#000000;fill:url(#radialGradient3106);fill-opacity:1;fill-rule:nonzero;stroke:#004c5b;stroke-width:2.41611409;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path2683"
-         sodipodi:cx="27.400389"
-         sodipodi:cy="25.019028"
-         sodipodi:rx="18.208"
-         sodipodi:ry="18.208"
-         d="m 45.608389,25.019028 a 18.208,18.208 0 1 1 -36.4160005,0 18.208,18.208 0 1 1 36.4160005,0 z"
-         transform="matrix(5.1990146,0,0,5.1990146,1007.7281,1131.0879)" />
-      <rect
-         style="color:#000000;fill:url(#radialGradient2695);fill-opacity:1;fill-rule:nonzero;stroke:#004c5b;stroke-width:12.57079124;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect2689"
-         width="97.446526"
-         height="54.679829"
-         x="1814.3544"
-         y="41.378105"
-         transform="matrix(0.70253188,0.71165228,-0.67223381,0.74033891,0,0)"
-         ry="19.084164" />
+         style="fill:url(#radialGradient3863);stroke:#042a2a;stroke-width:1.91666662999999990;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000000;fill-opacity:1"
+         id="path3055"
+         sodipodi:cx="47.5"
+         sodipodi:cy="44.5"
+         sodipodi:rx="11.5"
+         sodipodi:ry="11.5"
+         d="m 59,44.5 a 11.5,11.5 0 1 1 -23,0 11.5,11.5 0 1 1 23,0 z"
+         transform="matrix(7.6285292,0,0,7.6285292,808.48719,931.6345)" />
+      <path
+         sodipodi:type="arc"
+         style="fill:none;stroke:#34e0e2;stroke-width:2.29999995000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04000000000000000"
+         id="path3055-1"
+         sodipodi:cx="47.5"
+         sodipodi:cy="44.5"
+         sodipodi:rx="11.5"
+         sodipodi:ry="11.5"
+         d="m 59,44.5 a 11.5,11.5 0 1 1 -23,0 11.5,11.5 0 1 1 23,0 z"
+         transform="matrix(6.3571078,0,0,6.3571075,868.87971,988.21276)" />
     </g>
   </g>
 </svg>