diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_Edge.svg
index f696c30d58..636ab20f65 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_Edge.svg
@@ -1,58 +1,53 @@
 <?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="svg2869" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Arc_MidPoint.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2869" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/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">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <radialGradient 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 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 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="radialGradient2370" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2877"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836" id="linearGradient3801" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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" />
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3082" xlink:href="#linearGradient3836-9-3" />
+    <linearGradient 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3082-3" xlink:href="#linearGradient3836-9-7" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Arc_Edge</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -75,26 +70,26 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <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.146567,0,0,0.146567,94.1836,-69.115448)">
+  <g id="layer1">
+    <g id="g3401-3" 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"/>
+        <path style="fill:#73d216;fill-opacity:1;fill-rule:evenodd;stroke:#172a04;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" />
+        <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" transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)" />
       </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"/>
+        <path style="fill:none;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 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"/>
+      <path 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 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"/>
+      <path 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 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/elements/Sketcher_Element_Arc_EndPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_EndPoint.svg
index 173e35a9c1..be14a1c237 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_EndPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_EndPoint.svg
@@ -1,58 +1,53 @@
 <?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="svg2869" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Arc_StartingPoint.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2869" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/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">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <radialGradient 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 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 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="radialGradient2370" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2877"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836" id="linearGradient3801" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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" />
+    <linearGradient 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"/>
+      <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 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:#4e9a06;stop-opacity:1" offset="0" id="stop3838-8"/>
-      <stop style="stop-color:#8ae234;stop-opacity:1" offset="1" id="stop3840-1"/>
+      <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-0" id="linearGradient3801-1" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3082" xlink:href="#linearGradient3836-9-3" />
+    <linearGradient 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3082-3" xlink:href="#linearGradient3836-9-7" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Arc_EndPoint</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -75,26 +70,26 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <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.146567,0,0,0.146567,94.1836,-69.115448)">
+  <g id="layer1">
+    <g id="g3401-3" 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"/>
+        <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" />
+        <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" transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)" />
       </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"/>
+        <path 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 style="fill:url(#linearGradient3801-7);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="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"/>
+      <path 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 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"/>
+      <path 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 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/elements/Sketcher_Element_Arc_MidPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_MidPoint.svg
index 3fe1ed3ed4..5312a9dcd7 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_MidPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_MidPoint.svg
@@ -1,62 +1,57 @@
 <?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="svg2869" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Arc_EndPoint.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2869" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/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"/>
+      <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">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <radialGradient 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 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 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="radialGradient2370" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2877"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836" id="linearGradient3801" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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" />
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 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"/>
+      <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 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"/>
+      <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="#linearGradient3836-9-7" id="linearGradient3801-7-2" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3082" xlink:href="#linearGradient3123" />
+    <linearGradient 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3082-3" xlink:href="#linearGradient3836-9-7" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Arc_MidPoint</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -79,26 +74,26 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <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.146567,0,0,0.146567,94.1836,-69.115448)">
+  <g id="layer1">
+    <g id="g3401-3" 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"/>
+        <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" />
+        <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" transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)" />
       </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"/>
+        <path style="fill:none;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 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:#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 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"/>
+      <path style="fill:none;stroke:#172a04;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 style="fill:url(#linearGradient3082);fill-opacity:1;stroke:#8ae234;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"/>
+      <path 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 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/elements/Sketcher_Element_Arc_StartingPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_StartingPoint.svg
index 4f681e01c8..f6ab6a5795 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_StartingPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_StartingPoint.svg
@@ -1,62 +1,57 @@
 <?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="svg2869" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_CreateArc.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2869" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/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"/>
+      <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" 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">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <radialGradient 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 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 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="radialGradient2370" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2877"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836" id="linearGradient3801" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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" />
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3082" xlink:href="#linearGradient3836-9-3" />
+    <linearGradient 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"/>
+      <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="#linearGradient3026" inkscape:collect="always"/>
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3082-3" xlink:href="#linearGradient3026" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Arc_StartingPoint</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -79,26 +74,26 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <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.146567,0,0,0.146567,94.1836,-69.115448)">
+  <g id="layer1">
+    <g id="g3401-3" 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"/>
+        <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" />
+        <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" transform="matrix(6.8228182,0,0,6.8228182,-628.95197,471.56214)" />
       </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"/>
+        <path style="fill:none;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 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"/>
+      <path 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 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:#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"/>
+      <path 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 style="fill:url(#linearGradient3082-3);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>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_Edge.svg
index af5c8a0fb7..5117da565c 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_Edge.svg
@@ -1,61 +1,56 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="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" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3880" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient4654" gradientUnits="userSpaceOnUse" gradientTransform="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="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"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3880" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient4654" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3131-3" xlink:href="#linearGradient3836-9-3-6" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3131-2" xlink:href="#linearGradient3836-9-3-9" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3171-7" xlink:href="#linearGradient3836-9-3-6-0" />
     <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"/>
+      <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"/>
+    <linearGradient xlink:href="#linearGradient3836-9-3" id="linearGradient3262" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient xlink:href="#linearGradient3836-9-3-6" id="linearGradient3264" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_BSpline_Edge</dc:title>
         <dc:date>2017-01-07</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -78,31 +73,31 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <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 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="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path style="fill:none;stroke:#172a04;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" />
+      <path style="fill:none;stroke:#73d216;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" />
+      <path style="fill:none;stroke:#8ae234;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" />
+      <g transform="matrix(-0.9680744,0.53235022,-0.12931811,-0.72812354,2190.7606,902.97673)" id="g3177" />
+      <g 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 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"/>
+          <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" />
+          <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" />
         </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"/>
+          <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" />
+          <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" />
         </g>
       </g>
       <g transform="matrix(-1,0,0,-1,3041.8251,1222.9463)" id="g3194-6">
         <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"/>
+          <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" />
+          <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" />
         </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"/>
+          <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" />
+          <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" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_EndPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_EndPoint.svg
index da33b7af4a..8d2f551c53 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_EndPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_EndPoint.svg
@@ -1,61 +1,56 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="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" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3880" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient4654" gradientUnits="userSpaceOnUse" gradientTransform="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="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"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3880" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient4654" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3131-3" xlink:href="#linearGradient3836-9-3-6" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3131-2" xlink:href="#linearGradient3836-9-3-9" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3171-7" xlink:href="#linearGradient3836-9-3-6-0" />
     <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"/>
+      <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"/>
+    <linearGradient xlink:href="#linearGradient3836-9-3" id="linearGradient3262" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient xlink:href="#linearGradient3836-9-3-6" id="linearGradient3264" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_BSpline_EndPoint</dc:title>
         <dc:date>2017-01-07</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -78,31 +73,31 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <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 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="layer1">
+    <g id="g4470" 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" />
+      <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" />
+      <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" />
+      <g transform="matrix(-0.9680744,0.53235022,-0.12931811,-0.72812354,2190.7606,902.97673)" id="g3177" />
+      <g 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 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"/>
+          <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" />
+          <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" />
         </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"/>
+          <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" />
+          <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" />
         </g>
       </g>
       <g transform="matrix(-1,0,0,-1,3041.8251,1222.9463)" id="g3194-6">
         <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"/>
+          <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" />
+          <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" />
         </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"/>
+          <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.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <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.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_StartPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_StartPoint.svg
index 245bb89e6f..93cb224dee 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_StartPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_StartPoint.svg
@@ -1,65 +1,60 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <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"/>
+      <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">
-      <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 id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="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" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3880" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient4654" gradientUnits="userSpaceOnUse" gradientTransform="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="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"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3880" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient4654" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3131-3" xlink:href="#linearGradient3836-9-3-6" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3131-2" xlink:href="#linearGradient3836-9-3-9" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3171-7" xlink:href="#linearGradient3836-9-3-6-0" />
     <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"/>
+      <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"/>
+    <linearGradient xlink:href="#linearGradient3836-9-3" id="linearGradient3262" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient xlink:href="#linearGradient3186" id="linearGradient3264" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_BSpline_StartPoint</dc:title>
         <dc:date>2017-01-07</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -82,31 +77,31 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <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 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="layer1">
+    <g id="g4470" 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" />
+      <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" />
+      <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" />
+      <g transform="matrix(-0.9680744,0.53235022,-0.12931811,-0.72812354,2190.7606,902.97673)" id="g3177" />
+      <g 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 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"/>
+          <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" />
+          <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" />
         </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"/>
+          <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.99999988;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+          <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.99999952;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
         </g>
       </g>
       <g transform="matrix(-1,0,0,-1,3041.8251,1222.9463)" id="g3194-6">
         <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"/>
+          <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" />
+          <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" />
         </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"/>
+          <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" />
+          <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" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_Edge.svg
index e2e38400c2..150b2222cb 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_Edge.svg
@@ -1,55 +1,50 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Circle_MidPoint.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/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">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <radialGradient 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 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="radialGradient3183" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <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"/>
+    <radialGradient 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" />
+    <linearGradient xlink:href="#linearGradient3892" id="linearGradient3898" x1="37.429146" y1="41.590584" x2="24.483221" y2="4.9104676" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 xlink:href="#linearGradient3850" id="linearGradient3856" x1="22.84341" y1="4.8241611" x2="30.783579" y2="28.644661" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 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"/>
+      <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" xlink:href="#linearGradient3836-0-7-7" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Circle_Edge</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -72,18 +67,18 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g id="g4428"/>
+  <g id="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <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)"/>
+        <path style="fill:none;stroke:#172a04;stroke-width:8.27354717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path3044" 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 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" 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 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" 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 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" 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"/>
+        <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_MidPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_MidPoint.svg
index f6b4ad19a6..cf075c12a5 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_MidPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_MidPoint.svg
@@ -1,60 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_CreateCircle.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/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"/>
+      <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" 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">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <radialGradient 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 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="radialGradient3183" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <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"/>
+    <radialGradient 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" />
+    <linearGradient xlink:href="#linearGradient3892" id="linearGradient3898" x1="37.429146" y1="41.590584" x2="24.483221" y2="4.9104676" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 xlink:href="#linearGradient3850" id="linearGradient3856" x1="22.84341" y1="4.8241611" x2="30.783579" y2="28.644661" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 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"/>
+      <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 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"/>
+      <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 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"/>
+      <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"/>
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3080" xlink:href="#linearGradient3024" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Circle_MidPoint</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -77,18 +72,18 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g id="g4428"/>
+  <g id="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <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)"/>
+        <path 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" 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 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" 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 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" 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 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" 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"/>
+        <path style="fill:none;stroke:#172a04;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 style="fill:url(#linearGradient3080);fill-opacity:1;stroke:#8ae234;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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_All.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_All.svg
index c27ffc051e..4e5a19a9dc 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_All.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_All.svg
@@ -1,256 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg2918"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Sketcher_Element_Ellipse_All.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
-  <defs
-     id="defs2920">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148" />
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs2920">
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2926" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-5" />
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3958"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3960"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient5352"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-18" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-52" />
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 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 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 xlink:href="#linearGradient3888-7" id="linearGradient3901-1" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365" />
+    <linearGradient 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 xlink:href="#linearGradient3880-4" id="linearGradient3903-9" gradientUnits="userSpaceOnUse" x1="29.993565" y1="54.846851" x2="36.094769" y2="20.854424" />
+    <linearGradient 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:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient id="linearGradient3836-0-7-7">
+      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3838-2-4-5" />
+      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3840-5-0-3" />
     </linearGradient>
-    <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3962"
-       xlink:href="#linearGradient3836-0-7-7-5"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3836-0-7-7-5">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5-3" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3-5" />
+    <linearGradient 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" />
+    <linearGradient id="linearGradient3836-0-7-7-5">
+      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3838-2-4-5-3" />
+      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3840-5-0-3-5" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3836-0-7-7-2">
-      <stop
-         style="stop-color:#a40000;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5-7" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3-0" />
+    <linearGradient id="linearGradient3836-0-7-7-2">
+      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.7430632"
-     inkscape:cx="-22.911025"
-     inkscape:cy="31.197658"
-     inkscape:current-layer="g4470-2"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3016"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2923">
+  <metadata id="metadata2923">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Ellipse_All</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -273,172 +76,47 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g4470"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-       inkscape:export-xdpi="6.7850704"
-       inkscape:export-ydpi="6.7850704"
-       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g3800-6"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778-7">
-          <g
-             id="g3780-2">
-            <g
-               inkscape:export-ydpi="7.2934141"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
-               id="g3784-5" />
-            <g
-               inkscape:export-ydpi="7.2934141"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
-               id="g3790-2" />
+  <g id="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g id="g3800-6" transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+        <g transform="translate(-10.941933,-540.84412)" id="g3778-7">
+          <g id="g3780-2">
+            <g transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" id="g3784-5" />
+            <g transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" id="g3790-2" />
           </g>
         </g>
       </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
-         id="g3019">
-        <g
-           id="g3021"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g3023">
-            <g
-               id="g3025"
-               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-ydpi="7.2934141" />
-            <g
-               id="g3027"
-               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-ydpi="7.2934141" />
+      <g transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)" id="g3019">
+        <g id="g3021" transform="translate(-10.941933,-540.84412)">
+          <g id="g3023">
+            <g id="g3025" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+            <g id="g3027" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
           </g>
         </g>
       </g>
-      <g
-         id="g4470-2"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         inkscape:export-xdpi="6.7850704"
-         inkscape:export-ydpi="6.7850704"
-         transform="translate(-493.0338,-13.695763)">
-        <g
-           id="g3896"
-           transform="translate(493.03404,13.695735)">
-          <path
-             transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)"
-             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
-             sodipodi:ry="17.926489"
-             sodipodi:rx="35.852978"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074"
-             style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)"
-             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
-             sodipodi:ry="17.926489"
-             sodipodi:rx="35.852978"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074-3"
-             style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)"
-             d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z"
-             sodipodi:ry="17.078087"
-             sodipodi:rx="36.772079"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074-3-6"
-             style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+      <g id="g4470-2" 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" 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" />
+          <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" 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" />
+          <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" 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" />
         </g>
-        <g
-           id="g3217">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3037-36"
-             d="M 2294.682,693.64582 2143.8571,542.99659"
-             style="fill:none;stroke:#0b1521;stroke-width:54.78153992;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3037-3-7"
-             d="M 2294.682,693.64582 2143.8571,542.9966"
-             style="fill:none;stroke:#3465a4;stroke-width:27.39076996;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3037-3-6-5"
-             d="M 2298.6531,689.08892 2148.9073,537.64164"
-             style="fill:none;stroke:#729fcf;stroke-width:13.69538498;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <g id="g3217">
+          <path id="path3037-36" d="M 2294.682,693.64582 2143.8571,542.99659" style="fill:none;stroke:#0b1521;stroke-width:54.78153992;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path id="path3037-3-7" d="M 2294.682,693.64582 2143.8571,542.9966" style="fill:none;stroke:#3465a4;stroke-width:27.39076996;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path id="path3037-3-6-5" d="M 2298.6531,689.08892 2148.9073,537.64164" style="fill:none;stroke:#729fcf;stroke-width:13.69538498;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
-        <g
-           id="g3174"
-           transform="matrix(1.1663232,0,0,1.2222049,-599.64255,-162.50398)">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3037"
-             d="M 2287.8343,762.12275 2546.1632,515.60582"
-             style="fill:none;stroke:#0b1521;stroke-width:45.88309479;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3037-3"
-             d="M 2287.8343,762.12275 2546.1632,515.60583"
-             style="fill:none;stroke:#3465a4;stroke-width:22.94154739;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3037-3-6"
-             d="M 2286.2092,754.91791 2541.6504,510.16473"
-             style="fill:none;stroke:#729fcf;stroke-width:11.4707737;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <g id="g3174" transform="matrix(1.1663232,0,0,1.2222049,-599.64255,-162.50398)">
+          <path id="path3037" d="M 2287.8343,762.12275 2546.1632,515.60582" style="fill:none;stroke:#0b1521;stroke-width:45.88309479;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path id="path3037-3" d="M 2287.8343,762.12275 2546.1632,515.60583" style="fill:none;stroke:#3465a4;stroke-width:22.94154739;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path id="path3037-3-6" d="M 2286.2092,754.91791 2541.6504,510.16473" style="fill:none;stroke:#729fcf;stroke-width:11.4707737;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
-        <g
-           transform="matrix(4.5913999,0,0,4.591325,2232.5385,640.93267)"
-           id="g3797-9-4-5">
-          <path
-             inkscape:connector-curvature="0"
-             style="fill:#729fcf;stroke:#204a87;stroke-width:2.98285842;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path4250-71-8-6"
-             d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z" />
-          <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:2.98285769999999983;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path4250-7-3-8-2"
-             d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z" />
+        <g transform="matrix(4.5913999,0,0,4.591325,2232.5385,640.93267)" id="g3797-9-4-5">
+          <path 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 style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;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:#729fcf;stroke-width:2.98285769999999983;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path4250-7-3-8-2-9"
-             d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z" />
+        <g transform="matrix(4.5913999,0,0,4.591325,2383.1877,490.2835)" id="g3797-9-4-5-6">
+          <path 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 style="fill:url(#linearGradient3962);fill-opacity:1;stroke:#729fcf;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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_CentrePoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_CentrePoint.svg
index f56915c78d..070ce99411 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_CentrePoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_CentrePoint.svg
@@ -1,64 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Ellipse_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <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"/>
+      <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 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 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">
-      <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 id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <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"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <linearGradient xlink:href="#linearGradient3888" id="linearGradient3901" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365" />
+    <linearGradient 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" />
     <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"/>
+      <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="#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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient4260" 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" 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922-1" xlink:href="#linearGradient3836-0-7-7-2" 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"/>
+      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="12.328125" 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="1920" inkscape:window-height="1137" 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="grid3072" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
   <metadata id="metadata2923">
     <rdf:RDF>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Ellipse_CentrePoint</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -81,16 +76,16 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+  <g id="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
       <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"/>
+        <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" 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" />
+        <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" 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" />
+        <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" 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" />
       </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"/>
+        <path style="fill:#8ae234;stroke:#172a04;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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_1.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_1.svg
index 15e92be527..9237ddf4d0 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_1.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_1.svg
@@ -1,62 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <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 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 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">
-      <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 id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <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"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <linearGradient xlink:href="#linearGradient3888" id="linearGradient3901" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365" />
+    <linearGradient 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" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" 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" 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"/>
+      <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 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" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922-1" xlink:href="#linearGradient3836-0-7-7-2" 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"/>
+      <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"/>
+    <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" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="1137" 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="grid3072" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
   <metadata id="metadata2923">
     <rdf:RDF>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Ellipse_Edge_1</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -79,24 +74,24 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+  <g id="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
       <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"/>
+        <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" id="path3074" style="fill:none;stroke:#172a04;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" />
+        <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" 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" />
+        <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" 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" />
       </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"/>
+        <path 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 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(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"/>
+        <path 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 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"/>
+        <path 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 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/elements/Sketcher_Element_Ellipse_Edge_2.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_2.svg
index 1de2d3d47c..7411bf3a15 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_2.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_2.svg
@@ -1,62 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_Ellipse_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <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 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 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">
-      <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 id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <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"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <linearGradient xlink:href="#linearGradient3888" id="linearGradient3901" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365" />
+    <linearGradient 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" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" 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" 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"/>
+      <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 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" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922-1" xlink:href="#linearGradient3836-0-7-7-2" 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"/>
+      <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"/>
+    <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" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="12.328125" 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="1920" inkscape:window-height="1137" 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="grid3072" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
   <metadata id="metadata2923">
     <rdf:RDF>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Ellipse_Edge_2</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -79,16 +74,16 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+  <g id="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
       <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"/>
+        <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" id="path3074" style="fill:none;stroke:#172a04;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none" />
+        <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" 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" />
+        <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" 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" />
       </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"/>
+        <path 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 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/elements/Sketcher_Element_Ellipse_Focus1.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus1.svg
index c1ead81b5d..8e62ab35d3 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus1.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus1.svg
@@ -1,256 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg2918"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Sketcher_Element_Ellipse_Focus1.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
-  <defs
-     id="defs2920">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148" />
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs2920">
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2926" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-5" />
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3958"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3960"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient5352"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-18" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-52" />
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 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 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 xlink:href="#linearGradient3888-7" id="linearGradient3901-1" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365" />
+    <linearGradient 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 xlink:href="#linearGradient3880-4" id="linearGradient3903-9" gradientUnits="userSpaceOnUse" x1="29.993565" y1="54.846851" x2="36.094769" y2="20.854424" />
+    <linearGradient id="linearGradient3880-4">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3882-8" />
+      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="1" id="stop3884-8" />
     </linearGradient>
-    <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3922"
-       xlink:href="#linearGradient3836-0-7-7"
-       inkscape:collect="always"
-       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
-    <linearGradient
-       id="linearGradient3836-0-7-7">
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5" />
-      <stop
-         style="stop-color:#73d216;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" 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:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5-3" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3-5" />
+    <linearGradient 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" />
+    <linearGradient id="linearGradient3836-0-7-7-5">
+      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3838-2-4-5-3" />
+      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3840-5-0-3-5" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3836-0-7-7-2">
-      <stop
-         style="stop-color:#a40000;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5-7" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3-0" />
+    <linearGradient id="linearGradient3836-0-7-7-2">
+      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.848863"
-     inkscape:cx="36.682103"
-     inkscape:cy="37.168183"
-     inkscape:current-layer="g3797-9-4-5-6"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3016"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2923">
+  <metadata id="metadata2923">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Ellipse_Focus1</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -273,115 +76,33 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g4470"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-       inkscape:export-xdpi="6.7850704"
-       inkscape:export-ydpi="6.7850704"
-       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g3800-6"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778-7">
-          <g
-             id="g3780-2">
-            <g
-               inkscape:export-ydpi="7.2934141"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
-               id="g3784-5" />
-            <g
-               inkscape:export-ydpi="7.2934141"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
-               id="g3790-2" />
+  <g id="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g id="g3800-6" transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+        <g transform="translate(-10.941933,-540.84412)" id="g3778-7">
+          <g id="g3780-2">
+            <g transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" id="g3784-5" />
+            <g transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" id="g3790-2" />
           </g>
         </g>
       </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
-         id="g3019">
-        <g
-           id="g3021"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g3023">
-            <g
-               id="g3025"
-               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-ydpi="7.2934141" />
-            <g
-               id="g3027"
-               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-ydpi="7.2934141" />
+      <g transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)" id="g3019">
+        <g id="g3021" transform="translate(-10.941933,-540.84412)">
+          <g id="g3023">
+            <g id="g3025" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+            <g id="g3027" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
           </g>
         </g>
       </g>
-      <g
-         id="g4470-2"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         inkscape:export-xdpi="6.7850704"
-         inkscape:export-ydpi="6.7850704"
-         transform="translate(-493.0338,-13.695763)">
-        <g
-           id="g3896"
-           transform="translate(493.03404,13.695735)">
-          <path
-             transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)"
-             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
-             sodipodi:ry="17.926489"
-             sodipodi:rx="35.852978"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074"
-             style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)"
-             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
-             sodipodi:ry="17.926489"
-             sodipodi:rx="35.852978"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074-3"
-             style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)"
-             d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z"
-             sodipodi:ry="17.078087"
-             sodipodi:rx="36.772079"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074-3-6"
-             style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+      <g id="g4470-2" 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" 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" />
+          <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" 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" />
+          <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" 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" />
         </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:#0b1521;stroke-width:2.98285841999999990;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path4250-71-8-6-2"
-             d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z" />
-          <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3962);fill-opacity:1;stroke:#729fcf;stroke-width:2.98285769999999983;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path4250-7-3-8-2-9"
-             d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z" />
+        <g transform="matrix(4.5913999,0,0,4.591325,2383.1877,490.2835)" id="g3797-9-4-5-6">
+          <path style="fill:#729fcf;stroke:#0b1521;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 style="fill:url(#linearGradient3962);fill-opacity:1;stroke:#729fcf;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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus2.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus2.svg
index 343706a705..fbd273a0fc 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus2.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus2.svg
@@ -1,256 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg2918"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Sketcher_Element_Ellipse_Focus2.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
-  <defs
-     id="defs2920">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148" />
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs2920">
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2926" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-5" />
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3958"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3960"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient5352"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-18" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-52" />
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 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 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 xlink:href="#linearGradient3888-7" id="linearGradient3901-1" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365" />
+    <linearGradient 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 xlink:href="#linearGradient3880-4" id="linearGradient3903-9" gradientUnits="userSpaceOnUse" x1="29.993565" y1="54.846851" x2="36.094769" y2="20.854424" />
+    <linearGradient 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:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient id="linearGradient3836-0-7-7">
+      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3838-2-4-5" />
+      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3840-5-0-3" />
     </linearGradient>
-    <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3962"
-       xlink:href="#linearGradient3836-0-7-7-5"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3836-0-7-7-5">
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5-3" />
-      <stop
-         style="stop-color:#73d216;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3-5" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" gradientUnits="userSpaceOnUse" id="linearGradient3962" xlink:href="#linearGradient3836-0-7-7-5" />
+    <linearGradient id="linearGradient3836-0-7-7-5">
+      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5-3" />
+      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3-5" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3836-0-7-7-2">
-      <stop
-         style="stop-color:#a40000;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5-7" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3-0" />
+    <linearGradient id="linearGradient3836-0-7-7-2">
+      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.4280539"
-     inkscape:cx="188.70296"
-     inkscape:cy="111.27543"
-     inkscape:current-layer="g3797-9-4-5"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3016"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2923">
+  <metadata id="metadata2923">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Ellipse_Focus2</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -273,115 +76,33 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g4470"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-       inkscape:export-xdpi="6.7850704"
-       inkscape:export-ydpi="6.7850704"
-       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g3800-6"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778-7">
-          <g
-             id="g3780-2">
-            <g
-               inkscape:export-ydpi="7.2934141"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
-               id="g3784-5" />
-            <g
-               inkscape:export-ydpi="7.2934141"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
-               id="g3790-2" />
+  <g id="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g id="g3800-6" transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+        <g transform="translate(-10.941933,-540.84412)" id="g3778-7">
+          <g id="g3780-2">
+            <g transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" id="g3784-5" />
+            <g transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" id="g3790-2" />
           </g>
         </g>
       </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
-         id="g3019">
-        <g
-           id="g3021"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g3023">
-            <g
-               id="g3025"
-               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-ydpi="7.2934141" />
-            <g
-               id="g3027"
-               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-ydpi="7.2934141" />
+      <g transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)" id="g3019">
+        <g id="g3021" transform="translate(-10.941933,-540.84412)">
+          <g id="g3023">
+            <g id="g3025" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+            <g id="g3027" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
           </g>
         </g>
       </g>
-      <g
-         id="g4470-2"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         inkscape:export-xdpi="6.7850704"
-         inkscape:export-ydpi="6.7850704"
-         transform="translate(-493.0338,-13.695763)">
-        <g
-           id="g3896"
-           transform="translate(493.03404,13.695735)">
-          <path
-             transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)"
-             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
-             sodipodi:ry="17.926489"
-             sodipodi:rx="35.852978"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074"
-             style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)"
-             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
-             sodipodi:ry="17.926489"
-             sodipodi:rx="35.852978"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074-3"
-             style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)"
-             d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z"
-             sodipodi:ry="17.078087"
-             sodipodi:rx="36.772079"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074-3-6"
-             style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+      <g id="g4470-2" 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" 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" />
+          <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" 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" />
+          <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" 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" />
         </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:#0b1521;stroke-width:2.98285841999999990;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path4250-71-8-6"
-             d="m -26.070652,5.662872 a 8.9452063,8.9447998 0.02049963 1 1 13.588566,11.63638 8.9452063,8.9447998 0.02049963 1 1 -13.588566,-11.63638 z" />
-          <path
-             inkscape:connector-curvature="0"
-             style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;stroke-width:2.98285769999999983;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-             id="path4250-7-3-8-2"
-             d="m -23.843046,7.5698578 a 5.9654783,5.9659886 0 1 1 9.062062,7.7612492 5.9654783,5.9659886 0 0 1 -9.062062,-7.7612492 z" />
+        <g transform="matrix(4.5913999,0,0,4.591325,2232.5385,640.93267)" id="g3797-9-4-5">
+          <path style="fill:#729fcf;stroke:#0b1521;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 style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#729fcf;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/elements/Sketcher_Element_Ellipse_MajorAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MajorAxis.svg
index 827f1e88c2..b7f1cc6bae 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MajorAxis.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MajorAxis.svg
@@ -1,256 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg2918"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Sketcher_Element_Ellipse_MajorAxis.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
-  <defs
-     id="defs2920">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148" />
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs2920">
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2926" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-5" />
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3958"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3960"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient5352"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-18" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-52" />
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 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 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 xlink:href="#linearGradient3888-7" id="linearGradient3901-1" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365" />
+    <linearGradient 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 xlink:href="#linearGradient3880-4" id="linearGradient3903-9" gradientUnits="userSpaceOnUse" x1="29.993565" y1="54.846851" x2="36.094769" y2="20.854424" />
+    <linearGradient id="linearGradient3880-4">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3882-8" />
+      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="1" id="stop3884-8" />
     </linearGradient>
-    <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3922"
-       xlink:href="#linearGradient3836-0-7-7"
-       inkscape:collect="always"
-       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
-    <linearGradient
-       id="linearGradient3836-0-7-7">
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5" />
-      <stop
-         style="stop-color:#73d216;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient id="linearGradient3836-0-7-7">
+      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5" />
+      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3" />
     </linearGradient>
-    <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3962"
-       xlink:href="#linearGradient3836-0-7-7-5"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3836-0-7-7-5">
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5-3" />
-      <stop
-         style="stop-color:#73d216;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3-5" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" gradientUnits="userSpaceOnUse" id="linearGradient3962" xlink:href="#linearGradient3836-0-7-7-5" />
+    <linearGradient id="linearGradient3836-0-7-7-5">
+      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5-3" />
+      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3-5" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3836-0-7-7-2">
-      <stop
-         style="stop-color:#a40000;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5-7" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3-0" />
+    <linearGradient id="linearGradient3836-0-7-7-2">
+      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.8109197"
-     inkscape:cx="12.676309"
-     inkscape:cy="31.733621"
-     inkscape:current-layer="g4470-2"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3016"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2923">
+  <metadata id="metadata2923">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Ellipse_MajorAxis</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -273,123 +76,34 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g4470"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-       inkscape:export-xdpi="6.7850704"
-       inkscape:export-ydpi="6.7850704"
-       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g3800-6"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778-7">
-          <g
-             id="g3780-2">
-            <g
-               inkscape:export-ydpi="7.2934141"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
-               id="g3784-5" />
-            <g
-               inkscape:export-ydpi="7.2934141"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
-               id="g3790-2" />
+  <g id="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g id="g3800-6" transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+        <g transform="translate(-10.941933,-540.84412)" id="g3778-7">
+          <g id="g3780-2">
+            <g transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" id="g3784-5" />
+            <g transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" id="g3790-2" />
           </g>
         </g>
       </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
-         id="g3019">
-        <g
-           id="g3021"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g3023">
-            <g
-               id="g3025"
-               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-ydpi="7.2934141" />
-            <g
-               id="g3027"
-               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-ydpi="7.2934141" />
+      <g transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)" id="g3019">
+        <g id="g3021" transform="translate(-10.941933,-540.84412)">
+          <g id="g3023">
+            <g id="g3025" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+            <g id="g3027" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
           </g>
         </g>
       </g>
-      <g
-         id="g4470-2"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         inkscape:export-xdpi="6.7850704"
-         inkscape:export-ydpi="6.7850704"
-         transform="translate(-493.0338,-13.695763)">
-        <g
-           id="g3896"
-           transform="translate(493.03404,13.695735)">
-          <path
-             transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)"
-             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
-             sodipodi:ry="17.926489"
-             sodipodi:rx="35.852978"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074"
-             style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)"
-             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
-             sodipodi:ry="17.926489"
-             sodipodi:rx="35.852978"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074-3"
-             style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)"
-             d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z"
-             sodipodi:ry="17.078087"
-             sodipodi:rx="36.772079"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074-3-6"
-             style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+      <g id="g4470-2" 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" 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" />
+          <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" 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" />
+          <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" 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" />
         </g>
-        <g
-           id="g3174"
-           transform="matrix(1.1663232,0,0,1.2222049,-599.51733,-162.65672)">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3037"
-             d="M 2287.8343,762.12275 2546.1632,515.60582"
-             style="fill:none;stroke:#0b1521;stroke-width:45.88309479;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3037-3"
-             d="M 2287.8343,762.12275 2546.1632,515.60583"
-             style="fill:none;stroke:#3465a4;stroke-width:22.94154739;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3037-3-6"
-             d="M 2286.2092,754.91791 2541.6504,510.16473"
-             style="fill:none;stroke:#729fcf;stroke-width:11.4707737;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <g id="g3174" transform="matrix(1.1663232,0,0,1.2222049,-599.51733,-162.65672)">
+          <path id="path3037" d="M 2287.8343,762.12275 2546.1632,515.60582" style="fill:none;stroke:#0b1521;stroke-width:45.88309479;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path id="path3037-3" d="M 2287.8343,762.12275 2546.1632,515.60583" style="fill:none;stroke:#3465a4;stroke-width:22.94154739;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path id="path3037-3-6" d="M 2286.2092,754.91791 2541.6504,510.16473" style="fill:none;stroke:#729fcf;stroke-width:11.4707737;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MinorAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MinorAxis.svg
index f023466f2e..cdbc786f13 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MinorAxis.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MinorAxis.svg
@@ -1,256 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg2918"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Sketcher_Element_Ellipse_MinorAxis.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/sketcher/Sketcher_CreateCircle_from_3points_2_16px.png"
-   inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
-  <defs
-     id="defs2920">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148" />
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs2920">
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2926" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-3">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-1" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-5" />
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient3958"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-3"
-       id="radialGradient3960"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144"
-       id="radialGradient4043"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3144-7"
-       id="radialGradient5352"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3144-7">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3146-18" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3148-52" />
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 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 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 xlink:href="#linearGradient3888-7" id="linearGradient3901-1" gradientUnits="userSpaceOnUse" x1="30.202745" y1="56.729507" x2="35.013981" y2="19.843365" />
+    <linearGradient 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 xlink:href="#linearGradient3880-4" id="linearGradient3903-9" gradientUnits="userSpaceOnUse" x1="29.993565" y1="54.846851" x2="36.094769" y2="20.854424" />
+    <linearGradient id="linearGradient3880-4">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3882-8" />
+      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="1" id="stop3884-8" />
     </linearGradient>
-    <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3922"
-       xlink:href="#linearGradient3836-0-7-7"
-       inkscape:collect="always"
-       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
-    <linearGradient
-       id="linearGradient3836-0-7-7">
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5" />
-      <stop
-         style="stop-color:#73d216;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3922" xlink:href="#linearGradient3836-0-7-7" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" />
+    <linearGradient id="linearGradient3836-0-7-7">
+      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5" />
+      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3" />
     </linearGradient>
-    <linearGradient
-       y2="5"
-       x2="-22"
-       y1="18"
-       x1="-18"
-       gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3962"
-       xlink:href="#linearGradient3836-0-7-7-5"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient3836-0-7-7-5">
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5-3" />
-      <stop
-         style="stop-color:#73d216;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3-5" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientTransform="matrix(0.85221122,0,0,0.85228409,-2.8500258,1.6945624)" gradientUnits="userSpaceOnUse" id="linearGradient3962" xlink:href="#linearGradient3836-0-7-7-5" />
+    <linearGradient id="linearGradient3836-0-7-7-5">
+      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-4-5-3" />
+      <stop style="stop-color:#73d216;stop-opacity:1" offset="1" id="stop3840-5-0-3-5" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3836-0-7-7-2">
-      <stop
-         style="stop-color:#a40000;stop-opacity:1"
-         offset="0"
-         id="stop3838-2-4-5-7" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3840-5-0-3-0" />
+    <linearGradient id="linearGradient3836-0-7-7-2">
+      <stop style="stop-color:#a40000;stop-opacity:1" offset="0" id="stop3838-2-4-5-7" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3840-5-0-3-0" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="13.874735"
-     inkscape:cx="40.297497"
-     inkscape:cy="31.347204"
-     inkscape:current-layer="g4470-2"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-global="true"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3016"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2923">
+  <metadata id="metadata2923">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Ellipse_MinorAxis</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -273,120 +76,33 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g4470"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-       inkscape:export-xdpi="6.7850704"
-       inkscape:export-ydpi="6.7850704"
-       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g
-         id="g3800-6"
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
-        <g
-           transform="translate(-10.941933,-540.84412)"
-           id="g3778-7">
-          <g
-             id="g3780-2">
-            <g
-               inkscape:export-ydpi="7.2934141"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
-               id="g3784-5" />
-            <g
-               inkscape:export-ydpi="7.2934141"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
-               id="g3790-2" />
+  <g id="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g id="g3800-6" transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,87.426763,535.82687)">
+        <g transform="translate(-10.941933,-540.84412)" id="g3778-7">
+          <g id="g3780-2">
+            <g transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" id="g3784-5" />
+            <g transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" id="g3790-2" />
           </g>
         </g>
       </g>
-      <g
-         transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)"
-         id="g3019">
-        <g
-           id="g3021"
-           transform="translate(-10.941933,-540.84412)">
-          <g
-             id="g3023">
-            <g
-               id="g3025"
-               transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-ydpi="7.2934141" />
-            <g
-               id="g3027"
-               transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)"
-               inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-               inkscape:export-xdpi="7.2934141"
-               inkscape:export-ydpi="7.2934141" />
+      <g transform="matrix(0.92220412,-0.03691994,0.03792293,0.9113265,289.62872,488.80008)" id="g3019">
+        <g id="g3021" transform="translate(-10.941933,-540.84412)">
+          <g id="g3023">
+            <g id="g3025" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+            <g id="g3027" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
           </g>
         </g>
       </g>
-      <g
-         id="g4470-2"
-         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
-         inkscape:export-xdpi="6.7850704"
-         inkscape:export-ydpi="6.7850704"
-         transform="translate(-493.0338,-13.695763)">
-        <g
-           id="g3896"
-           transform="translate(493.03404,13.695735)">
-          <path
-             transform="matrix(4.0990202,-4.0990208,4.0990198,4.0990204,1435.7244,581.35092)"
-             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
-             sodipodi:ry="17.926489"
-             sodipodi:rx="35.852978"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074"
-             style="fill:none;stroke:#2e3436;stroke-width:9.45016003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(4.2698131,-4.2698132,4.2698127,4.2698129,1423.6161,580.38115)"
-             d="m 68.461342,38.286438 c 0,9.900526 -16.051925,17.926489 -35.852978,17.926489 -19.801053,0 -35.8529776,-8.025963 -35.8529776,-17.926489 0,-9.900526 16.0519246,-17.926489 35.8529776,-17.926489 19.801053,0 35.852978,8.025963 35.852978,17.926489 z"
-             sodipodi:ry="17.926489"
-             sodipodi:rx="35.852978"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074-3"
-             style="fill:none;stroke:url(#linearGradient3901-1);stroke-width:2.26803851;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
-          <path
-             transform="matrix(3.9282278,-3.9282282,3.9282274,3.9282279,1447.8327,582.32069)"
-             d="m 69.380444,38.286438 c 0,9.431967 -16.463421,17.078087 -36.77208,17.078087 -20.308659,0 -36.7720794,-7.64612 -36.7720794,-17.078087 0,-9.431967 16.4634204,-17.078087 36.7720794,-17.078087 20.308659,0 36.77208,7.64612 36.77208,17.078087 z"
-             sodipodi:ry="17.078087"
-             sodipodi:rx="36.772079"
-             sodipodi:cy="38.286438"
-             sodipodi:cx="32.608364"
-             id="path3074-3-6"
-             style="fill:none;stroke:url(#linearGradient3903-9);stroke-width:2.46525931;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:1.89999998;stroke-opacity:1;stroke-dasharray:none"
-             sodipodi:type="arc" />
+      <g id="g4470-2" 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" 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" />
+          <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" 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" />
+          <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" 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" />
         </g>
-        <path
-           style="fill:none;stroke:#0b1521;stroke-width:54.78153992;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 2294.682,693.64582 2143.8571,542.99659"
-           id="path3037"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#3465a4;stroke-width:27.39076996;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 2294.682,693.64582 2143.8571,542.9966"
-           id="path3037-3"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
-        <path
-           style="fill:none;stroke:#729fcf;stroke-width:13.69538498;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="M 2298.6531,689.08892 2148.9073,537.64164"
-           id="path3037-3-6"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="cc" />
+        <path style="fill:none;stroke:#0b1521;stroke-width:54.78153992;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" d="M 2294.682,693.64582 2143.8571,542.99659" id="path3037" />
+        <path style="fill:none;stroke:#3465a4;stroke-width:27.39076996;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" d="M 2294.682,693.64582 2143.8571,542.9966" id="path3037-3" />
+        <path style="fill:none;stroke:#729fcf;stroke-width:13.69538498;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" d="M 2298.6531,689.08892 2148.9073,537.64164" id="path3037-3-6" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Centre_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Centre_Point.svg
index 39952c52d8..6e68530429 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Centre_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Centre_Point.svg
@@ -1,62 +1,57 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="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" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="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" id="radialGradient3877" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-9-3" id="linearGradient3262" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-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 xlink:href="#linearGradient3144" id="radialGradient3877" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 xlink:href="#linearGradient3186" id="linearGradient3075" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient xlink:href="#linearGradient3836-9-3" id="linearGradient3077" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3096" xlink:href="#linearGradient3836-9-3-7" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3096-8" xlink:href="#linearGradient3836-9-3-7-2" />
     <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"/>
+      <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" xlink:href="#linearGradient3836-9-3-7-2" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="6.1640625" inkscape:cx="51.309676" inkscape:cy="26.237893" inkscape:current-layer="g4470" showgrid="true" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" inkscape:snap-bbox="true" inkscape:snap-nodes="true">
-    <inkscape:grid type="xygrid" id="grid3032" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
   <metadata id="metadata2923">
     <rdf:RDF>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Elliptical_Arc_Centre_Point</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -79,26 +74,26 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <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="layer1">
+    <g id="g4470" 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" />
+      <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" />
+      <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" />
       <g transform="matrix(6.8476923,0,0,6.8476923,1858.6356,389.40446)" id="g3797-7-2">
-        <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" d="M -26.156204,5.582626 A 8.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"/>
+        <path 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 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 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"/>
+        <path 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 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 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"/>
+        <path 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 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 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"/>
+        <path 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 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/elements/Sketcher_Element_Elliptical_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Edge.svg
index f8d233e193..8ed9d894bb 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Edge.svg
@@ -1,68 +1,63 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="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" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="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" id="radialGradient3877" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-9-3" id="linearGradient3262" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-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 xlink:href="#linearGradient3144" id="radialGradient3877" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 xlink:href="#linearGradient3186" id="linearGradient3075" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient xlink:href="#linearGradient3836-9-3" id="linearGradient3077" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3096" xlink:href="#linearGradient3836-9-3-7" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3096-8" xlink:href="#linearGradient3836-9-3-7-2" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3136" xlink:href="#linearGradient3836-9-3-7-2" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3136-2" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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" xlink:href="#linearGradient3836-9-3-7-2-7" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="12.328125" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Elliptical_Arc_Edge</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -85,26 +80,26 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <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="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <path style="fill:none;stroke:#172a04;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" />
+      <path style="fill:none;stroke:#73d216;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" />
+      <path style="fill:none;stroke:#8ae234;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" />
       <g transform="matrix(6.8476923,0,0,6.8476923,1858.6356,389.40446)" id="g3797-7-2">
-        <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" d="M -26.156204,5.582626 A 8.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"/>
+        <path 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 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 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"/>
+        <path 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 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 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"/>
+        <path 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 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 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"/>
+        <path 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 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/elements/Sketcher_Element_Elliptical_Arc_End_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_End_Point.svg
index ec7e001925..3d5df8f232 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_End_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_End_Point.svg
@@ -1,68 +1,63 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="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" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="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" id="radialGradient3877" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-9-3" id="linearGradient3262" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-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 xlink:href="#linearGradient3144" id="radialGradient3877" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 xlink:href="#linearGradient3186" id="linearGradient3075" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient xlink:href="#linearGradient3836-9-3" id="linearGradient3077" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3096" xlink:href="#linearGradient3836-9-3-7" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3096-8" xlink:href="#linearGradient3836-9-3-7-2" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3136" xlink:href="#linearGradient3836-9-3-7-2" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3136-2" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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" xlink:href="#linearGradient3836-9-3-7-2-7" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Elliptical_Arc_End_Point</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -85,26 +80,26 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <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="layer1">
+    <g id="g4470" 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" />
+      <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" />
+      <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" />
       <g transform="matrix(6.8476923,0,0,6.8476923,1858.6356,389.40446)" id="g3797-7-2">
-        <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" d="M -26.156204,5.582626 A 8.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"/>
+        <path 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 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 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"/>
+        <path 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 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 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"/>
+        <path 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 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 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"/>
+        <path 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 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/elements/Sketcher_Element_Elliptical_Arc_Start_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Start_Point.svg
index b85271db21..c5ef9ea6a5 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Start_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Start_Point.svg
@@ -1,74 +1,69 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="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" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="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" id="radialGradient3877" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-9-3" id="linearGradient3262" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient 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 xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-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 xlink:href="#linearGradient3144" id="radialGradient3877" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 xlink:href="#linearGradient3186" id="linearGradient3075" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient xlink:href="#linearGradient3836-9-3" id="linearGradient3077" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
+    <linearGradient 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3096" xlink:href="#linearGradient3836-9-3-7" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3096-8" xlink:href="#linearGradient3836-9-3-7-2" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3136" xlink:href="#linearGradient3836-9-3-7-2" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3136-2" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203-2" xlink:href="#linearGradient3836-9-3-7-2-7-2" />
     <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"/>
+      <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="linearGradient3245" xlink:href="#linearGradient3836-9-3-7-2-7-2" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Elliptical_Arc_Start_Point</dc:title>
         <dc:date>2014-11-11</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -91,26 +86,26 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <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="layer1">
+    <g id="g4470" 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" />
+      <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" />
+      <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" />
       <g transform="matrix(6.8476923,0,0,6.8476923,1858.6356,389.40446)" 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"/>
+        <path 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 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 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"/>
+        <path 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 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 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"/>
+        <path 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 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,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"/>
+        <path 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 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/elements/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg
index dbe5af4893..0241aaf1b3 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg
@@ -1,58 +1,53 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="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" id="radialGradient3877" 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"/>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" inkscape:collect="always"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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 xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-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 xlink:href="#linearGradient3144" id="radialGradient3877" 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" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3292" xlink:href="#linearGradient3186" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203-1" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
     <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"/>
+      <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" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="9.6072693" 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="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" 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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Hyperbolic_Arc_Centre_Point</dc:title>
         <dc:date>2016-09-03</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -75,35 +70,35 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g 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,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,2179.3276,655.76224)" id="g3185"/>
-      <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="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)" id="g3177" />
+      <g transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)" id="g3185" />
+      <g id="g3784" transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)" />
       <g id="g3857" 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">
           <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"/>
+              <g id="g3034" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+              <g id="g3036" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
             </g>
           </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"/>
+        <path 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 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"/>
+      <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" />
+      <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" />
+      <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" />
       <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"/>
+        <path 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 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"/>
+        <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Edge.svg
index b1604aa525..3b9099cd28 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Edge.svg
@@ -1,64 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="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" id="radialGradient3877" 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"/>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" inkscape:collect="always"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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 xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-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 xlink:href="#linearGradient3144" id="radialGradient3877" 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" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3292" xlink:href="#linearGradient3186" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203-1" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3079" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3079-4" xlink:href="#linearGradient3836-9-3-7-2-7-7-5" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3146" xlink:href="#linearGradient3836-9-3-7-2-7-7-5" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="9.6072693" 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="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" 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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Hyperbolic_Arc_Edge</dc:title>
         <dc:date>2016-09-03</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -81,35 +76,35 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g 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,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,2179.3276,655.76224)" id="g3185"/>
-      <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="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)" id="g3177" />
+      <g transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)" id="g3185" />
+      <g id="g3784" transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)" />
       <g id="g3857" 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">
           <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"/>
+              <g id="g3034" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+              <g id="g3036" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
             </g>
           </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"/>
+      <path style="fill:none;stroke:#172a04;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" />
+      <path style="fill:none;stroke:#73d216;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" />
+      <path style="fill:none;stroke:#8ae234;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" />
       <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"/>
+        <path 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 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"/>
+        <path 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 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"/>
+        <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_End_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_End_Point.svg
index 6f28d7300e..4856c70727 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_End_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_End_Point.svg
@@ -1,60 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="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="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" inkscape:collect="always"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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 xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="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="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203-1" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3079-4" xlink:href="#linearGradient3836-9-3-7-2-7-7-5" />
     <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"/>
+      <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="#linearGradient3186" id="linearGradient3169" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3146" xlink:href="#linearGradient3836-9-3-7-2-7-7-5" />
+    <linearGradient xlink:href="#linearGradient3186" id="linearGradient3169" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="9.6072693" 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="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="grid3025" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
   <metadata id="metadata2923">
     <rdf:RDF>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Hyperbolic_Arc_End_Point</dc:title>
         <dc:date>2016-09-03</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -77,35 +72,35 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g 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,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,2179.3276,655.76224)" id="g3185"/>
-      <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="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)" id="g3177" />
+      <g transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)" id="g3185" />
+      <g id="g3784" transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)" />
       <g id="g3857" 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">
           <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"/>
+              <g id="g3034" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+              <g id="g3036" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
             </g>
           </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"/>
+      <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" />
+      <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" />
+      <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" />
       <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"/>
+        <path 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 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"/>
+        <path 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 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"/>
+        <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg
index 56f44514c2..5c3ef05bac 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg
@@ -1,60 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="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="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" inkscape:collect="always"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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 xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="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="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203-1" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3079-4" xlink:href="#linearGradient3836-9-3-7-2-7-7-5" />
     <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"/>
+      <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="#linearGradient3186" id="linearGradient3169" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3146" xlink:href="#linearGradient3836-9-3-7-2-7-7-5" />
+    <linearGradient xlink:href="#linearGradient3186" id="linearGradient3169" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="9.6072693" 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="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="grid3025" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
   <metadata id="metadata2923">
     <rdf:RDF>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Hyperbolic_Arc_Start_Point</dc:title>
         <dc:date>2016-09-03</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -77,35 +72,35 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g 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,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,2179.3276,655.76224)" id="g3185"/>
-      <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="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)" id="g3177" />
+      <g transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)" id="g3185" />
+      <g id="g3784" transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)" />
       <g id="g3857" 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">
           <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"/>
+              <g id="g3034" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+              <g id="g3036" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
             </g>
           </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"/>
+      <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" />
+      <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" />
+      <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" />
       <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"/>
+        <path 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 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"/>
+        <path 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 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"/>
+        <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_Edge.svg
index 7d97f8be07..ef7260ef75 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_Edge.svg
@@ -1,45 +1,40 @@
 <?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.48.5 r10040" sodipodi:docname="Sketcher_CreateLine.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2726" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/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"/>
+    <radialGradient 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 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" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2734"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-0" id="linearGradient3801-1" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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" />
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 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"/>
+      <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" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Line_Edge</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -62,22 +57,22 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
+  <g id="layer1">
     <g id="g4289" transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <g id="g3242">
-        <g id="g3154" transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png" inkscape:export-xdpi="7.0721951" inkscape:export-ydpi="7.0721951">
-          <path 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="g3154" transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)">
+          <path style="fill:#73d216;stroke:#172a04;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" />
+          <path style="fill:none;stroke:#8ae234;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" />
           <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"/>
+              <path 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 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(-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"/>
+              <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_EndPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_EndPoint.svg
index a290529ccc..f3034b7f54 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_EndPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_EndPoint.svg
@@ -1,45 +1,40 @@
 <?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.48.5 r10040" sodipodi:docname="Sketcher_Element_Line_Edge.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2726" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/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"/>
+    <radialGradient 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 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" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2734"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-0" id="linearGradient3801-1" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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" />
+    <linearGradient 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"/>
+      <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 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"/>
+      <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 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:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-7-7"/>
-      <stop style="stop-color:#8ae234;stop-opacity:1" offset="1" id="stop3840-5-5-5"/>
+      <stop style="stop-color:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-7-7" />
+      <stop style="stop-color:#8ae234;stop-opacity:1" offset="1" id="stop3840-5-5-5" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Line_EndPoint</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -62,22 +57,22 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
+  <g id="layer1">
     <g id="g4289" transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <g id="g3242">
-        <g id="g3154" transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png" inkscape:export-xdpi="7.0721951" inkscape:export-ydpi="7.0721951">
-          <path 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="g3154" transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)">
+          <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" />
+          <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" />
           <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"/>
+              <path 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 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(-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"/>
+              <path style="fill:none;stroke:#172a04;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 style="fill:url(#linearGradient3801-1-3-3);fill-opacity:1;stroke:#8ae234;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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_StartingPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_StartingPoint.svg
index a1d7fe11e3..cee3616072 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_StartingPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_StartingPoint.svg
@@ -1,45 +1,40 @@
 <?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.48.5 r10040" sodipodi:docname="Sketcher_Element_Line_EndPoint.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2726" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/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"/>
+    <radialGradient 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 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" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2734"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3836-0" id="linearGradient3801-1" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <radialGradient 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" />
+    <linearGradient 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"/>
+      <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 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:#4e9a06;stop-opacity:1" offset="0" id="stop3838-2-7"/>
-      <stop style="stop-color:#8ae234;stop-opacity:1" offset="1" id="stop3840-5-5"/>
+      <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" xlink:href="#linearGradient3836-0-6-6" id="linearGradient3801-1-3-3" gradientUnits="userSpaceOnUse" x1="-18" y1="18" x2="-22" y2="5"/>
+    <linearGradient 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"/>
+      <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" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Line_StartingPoint</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -62,22 +57,22 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
+  <g id="layer1">
     <g id="g4289" transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <g id="g3242">
-        <g id="g3154" transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png" inkscape:export-xdpi="7.0721951" inkscape:export-ydpi="7.0721951">
-          <path 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="g3154" transform="matrix(-0.9996417,2.6765153e-2,-2.6765153e-2,-0.9996417,238.03783,1359.7845)">
+          <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" />
+          <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" />
           <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:#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"/>
+              <path style="fill:none;stroke:#172a04;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 style="fill:url(#linearGradient3801-1-3);fill-opacity:1;stroke:#8ae234;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(-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"/>
+              <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Centre_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Centre_Point.svg
index 045ee5aac1..55808042be 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Centre_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Centre_Point.svg
@@ -1,58 +1,53 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="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" id="radialGradient3877" 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"/>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" inkscape:collect="always"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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 xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-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 xlink:href="#linearGradient3144" id="radialGradient3877" 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" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3292" xlink:href="#linearGradient3186" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203-1" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
     <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"/>
+      <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" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="1920" inkscape:window-height="1017" inkscape:window-x="1912" inkscape:window-y="-8" inkscape:window-maximized="1" 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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Parabolic_Arc_Centre_Point</dc:title>
         <dc:date>2016-12-24</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -75,35 +70,35 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g 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,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,2179.3276,655.76224)" id="g3185"/>
-      <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="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)" id="g3177" />
+      <g transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)" id="g3185" />
+      <g id="g3784" transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)" />
       <g id="g3857" 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">
           <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"/>
+              <g id="g3034" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+              <g id="g3036" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
             </g>
           </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"/>
+      <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" />
+      <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" />
+      <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" />
       <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"/>
+        <path 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 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"/>
+        <path 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 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"/>
+        <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Edge.svg
index d7cd820909..d1b81cf579 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Edge.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Edge.svg
@@ -1,70 +1,65 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="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" id="radialGradient3877" 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"/>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" inkscape:collect="always"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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 xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-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 xlink:href="#linearGradient3144" id="radialGradient3877" 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" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3292" xlink:href="#linearGradient3186" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203-1" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3079" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3292-1" xlink:href="#linearGradient3186-7" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3052" xlink:href="#linearGradient3186-7" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203-8" xlink:href="#linearGradient3836-9-3-7-2-7-2" />
     <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"/>
+      <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"/>
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3092" xlink:href="#linearGradient3836-9-3-7-2-7-2" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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="grid3025" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
   <metadata id="metadata2923">
     <rdf:RDF>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Parabolic_Arc_Edge</dc:title>
         <dc:date>2016-12-24</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -87,35 +82,35 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g 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,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,2179.3276,655.76224)" id="g3185"/>
-      <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="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)" id="g3177" />
+      <g transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)" id="g3185" />
+      <g id="g3784" transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)" />
       <g id="g3857" 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">
           <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"/>
+              <g id="g3034" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+              <g id="g3036" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
             </g>
           </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"/>
+      <path style="fill:none;stroke:#172a04;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" />
+      <path style="fill:none;stroke:#73d216;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" />
+      <path style="fill:none;stroke:#8ae234;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" />
       <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"/>
+        <path 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 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"/>
+        <path 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 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"/>
+        <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_End_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_End_Point.svg
index 34fe837386..b7e01ff778 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_End_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_End_Point.svg
@@ -1,64 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="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" id="radialGradient3877" 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"/>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" inkscape:collect="always"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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 xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-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 xlink:href="#linearGradient3144" id="radialGradient3877" 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" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3292" xlink:href="#linearGradient3186" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203-1" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3079" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3292-1" xlink:href="#linearGradient3186-7" />
     <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"/>
+      <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="linearGradient3052" xlink:href="#linearGradient3186-7" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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="grid3025" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
   <metadata id="metadata2923">
     <rdf:RDF>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Parabolic_Arc_End_Point</dc:title>
         <dc:date>2016-12-24</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -81,35 +76,35 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g 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,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,2179.3276,655.76224)" id="g3185"/>
-      <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="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)" id="g3177" />
+      <g transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)" id="g3185" />
+      <g id="g3784" transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)" />
       <g id="g3857" 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">
           <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"/>
+              <g id="g3034" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+              <g id="g3036" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
             </g>
           </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"/>
+      <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" />
+      <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" />
+      <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" />
       <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"/>
+        <path 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 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"/>
+        <path 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 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"/>
+        <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Start_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Start_Point.svg
index 71bba1f519..7980cbf5dd 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Start_Point.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Start_Point.svg
@@ -1,64 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2918" sodipodi:version="0.32" inkscape:version="0.48.5 r10040" sodipodi:docname="Sketcher_Element_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" inkscape:export-xdpi="22.5" inkscape:export-ydpi="22.5">
+
+<svg width="64px" height="64px" id="svg2918" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2920">
-    <linearGradient inkscape:collect="always" id="linearGradient3144">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148"/>
+    <linearGradient id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2926"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-1"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-5"/>
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-1" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-5" />
     </linearGradient>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3958" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient4043" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="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="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="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" id="radialGradient3877" 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"/>
-    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" inkscape:collect="always"/>
+    <radialGradient 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 xlink:href="#linearGradient3144-3" id="radialGradient3960" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-3" id="radialGradient4041" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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 xlink:href="#linearGradient3144" id="radialGradient3033" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3056" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3068" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-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 xlink:href="#linearGradient3144" id="radialGradient3877" 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" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203" xlink:href="#linearGradient3836-9-3-7-2-7" />
     <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"/>
+      <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 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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3292" xlink:href="#linearGradient3186" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3203-1" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
     <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"/>
+      <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 y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3079" xlink:href="#linearGradient3836-9-3-7-2-7-7" />
+    <linearGradient y2="5" x2="-22" y1="18" x1="-18" gradientUnits="userSpaceOnUse" id="linearGradient3292-1" xlink:href="#linearGradient3186-7" />
     <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"/>
+      <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="linearGradient3052" xlink:href="#linearGradient3186-7" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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="grid3025" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true"/>
-  </sodipodi:namedview>
   <metadata id="metadata2923">
     <rdf:RDF>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Parabolic_Arc_Start_Point</dc:title>
         <dc:date>2016-12-24</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -81,35 +76,35 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g id="g4470" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png" inkscape:export-xdpi="6.7850704" inkscape:export-ydpi="6.7850704" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
-      <g 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,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,2179.3276,655.76224)" id="g3185"/>
-      <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="layer1">
+    <g id="g4470" transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)">
+      <g transform="matrix(-0.272555,1.070644,-0.62008436,-0.40296707,2229.857,490.31348)" id="g3177" />
+      <g transform="matrix(-0.26379798,1.0762112,-0.62386014,-0.38785381,2179.3276,655.76224)" id="g3185" />
+      <g id="g3784" transform="matrix(-0.585465,0.71342489,-0.70637362,-0.57712184,2400.1881,948.89093)" />
       <g id="g3857" 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">
           <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"/>
+              <g id="g3034" transform="matrix(-0.9996843,0.02512527,-0.02512527,-0.9996843,2082.1146,1248.1357)" />
+              <g id="g3036" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,1922.9598,1240.4934)" />
             </g>
           </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"/>
+      <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" />
+      <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" />
+      <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" />
       <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"/>
+        <path 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 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"/>
+        <path 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 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"/>
+        <path 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 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>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Point_StartingPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Point_StartingPoint.svg
index cb309eaa98..236f3503c3 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Point_StartingPoint.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Point_StartingPoint.svg
@@ -1,41 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2726" sodipodi:version="0.32" 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" inkscape:export-xdpi="45" inkscape:export-ydpi="45">
+
+<svg width="64px" height="64px" id="svg2726" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2728">
-    <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 id="linearGradient3144">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2734"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3850" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144-3" id="radialGradient3850-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188"/>
-    <linearGradient inkscape:collect="always" id="linearGradient3144-3">
-      <stop style="stop-color:#ffffff;stop-opacity:1;" offset="0" id="stop3146-7"/>
-      <stop style="stop-color:#ffffff;stop-opacity:0;" offset="1" id="stop3148-1"/>
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3850" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144-3" id="radialGradient3850-4" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <linearGradient id="linearGradient3144-3">
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="0" id="stop3146-7" />
+      <stop style="stop-color:#ffffff;stop-opacity:0" offset="1" id="stop3148-1" />
     </linearGradient>
-    <radialGradient r="34.345188" fy="672.79736" fx="225.26402" cy="672.79736" cx="225.26402" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" gradientUnits="userSpaceOnUse" id="radialGradient3888" xlink:href="#linearGradient3144-3" inkscape:collect="always"/>
-    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3144" id="radialGradient3767" gradientUnits="userSpaceOnUse" gradientTransform="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" 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"/>
+    <radialGradient r="34.345188" fy="672.79736" fx="225.26402" cy="672.79736" cx="225.26402" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" gradientUnits="userSpaceOnUse" id="radialGradient3888" xlink:href="#linearGradient3144-3" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3767" gradientUnits="userSpaceOnUse" gradientTransform="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 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"/>
+      <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" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_Point_StartingPoint</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -58,13 +53,13 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
+  <g id="layer1">
     <g id="g4289" transform="matrix(0.1621282,0,0,0.1621282,6.3605986,-66.108806)">
       <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"/>
+            <path style="fill:none;fill-opacity:1;stroke:#172a04;stroke-width:6.49510956;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4250" d="m 145.08885,535.18229 a 48.571431,48.571431 0 1 1 -97.142854,0 48.571431,48.571431 0 1 1 97.142854,0 z" />
+            <path style="fill:url(#linearGradient3922);fill-opacity:1;stroke:#8ae234;stroke-width:6.49510956;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4250-7" d="m 138.55997,535.14385 a 42.216398,42.21834 49.289969 1 1 -84.435028,0.002 42.216398,42.21834 49.289969 0 1 84.435028,-0.002 z" />
           </g>
         </g>
       </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_SelectionTypeInvalid.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_SelectionTypeInvalid.svg
index f39a7c0f01..2e5bd0ab83 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_SelectionTypeInvalid.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_SelectionTypeInvalid.svg
@@ -1,108 +1,59 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="64px" height="64px" id="svg2816" version="1.1" inkscape:version="0.48.5 r10040" sodipodi:docname="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">
+
+<svg width="64px" height="64px" id="svg2816" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <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 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 style="stop-color:#ff2600;stop-opacity:1;" offset="0" id="stop3604"/>
-      <stop style="stop-color:#ff5f00;stop-opacity:1;" offset="1" id="stop3606"/>
+      <stop style="stop-color:#ff2600;stop-opacity:1" offset="0" id="stop3604" />
+      <stop style="stop-color:#ff5f00;stop-opacity:1" offset="1" id="stop3606" />
     </linearGradient>
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2824"/>
-    <inkscape:perspective id="perspective3618" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3602-7" id="linearGradient3608-5" x1="3.909091" y1="14.363636" x2="24.81818" y2="14.363636" gradientUnits="userSpaceOnUse"/>
+    <linearGradient xlink:href="#linearGradient3602-7" id="linearGradient3608-5" x1="3.909091" y1="14.363636" x2="24.81818" y2="14.363636" gradientUnits="userSpaceOnUse" />
     <linearGradient id="linearGradient3602-7">
-      <stop style="stop-color:#c51900;stop-opacity:1;" offset="0" id="stop3604-1"/>
-      <stop style="stop-color:#ff5f00;stop-opacity:1;" offset="1" id="stop3606-3"/>
+      <stop style="stop-color:#c51900;stop-opacity:1" offset="0" id="stop3604-1" />
+      <stop style="stop-color:#ff5f00;stop-opacity:1" offset="1" id="stop3606-3" />
     </linearGradient>
-    <inkscape:perspective id="perspective3677" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3602-5" id="linearGradient3608-1" x1="3.909091" y1="14.363636" x2="24.81818" y2="14.363636" gradientUnits="userSpaceOnUse"/>
+    <linearGradient xlink:href="#linearGradient3602-5" id="linearGradient3608-1" x1="3.909091" y1="14.363636" x2="24.81818" y2="14.363636" gradientUnits="userSpaceOnUse" />
     <linearGradient id="linearGradient3602-5">
-      <stop style="stop-color:#c51900;stop-opacity:1;" offset="0" id="stop3604-9"/>
-      <stop style="stop-color:#ff5f00;stop-opacity:1;" offset="1" id="stop3606-9"/>
+      <stop style="stop-color:#c51900;stop-opacity:1" offset="0" id="stop3604-9" />
+      <stop style="stop-color:#ff5f00;stop-opacity:1" offset="1" id="stop3606-9" />
     </linearGradient>
-    <linearGradient y2="14.363636" x2="24.81818" y1="14.363636" x1="3.909091" gradientUnits="userSpaceOnUse" id="linearGradient3686" xlink:href="#linearGradient3602-5" inkscape:collect="always"/>
-    <inkscape:perspective id="perspective3717" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3602-58" id="linearGradient3608-8" x1="3.909091" y1="14.363636" x2="24.81818" y2="14.363636" gradientUnits="userSpaceOnUse"/>
+    <linearGradient y2="14.363636" x2="24.81818" y1="14.363636" x1="3.909091" gradientUnits="userSpaceOnUse" id="linearGradient3686" xlink:href="#linearGradient3602-5" />
+    <linearGradient xlink:href="#linearGradient3602-58" id="linearGradient3608-8" x1="3.909091" y1="14.363636" x2="24.81818" y2="14.363636" gradientUnits="userSpaceOnUse" />
     <linearGradient id="linearGradient3602-58">
-      <stop style="stop-color:#c51900;stop-opacity:1;" offset="0" id="stop3604-2"/>
-      <stop style="stop-color:#ff5f00;stop-opacity:1;" offset="1" id="stop3606-2"/>
+      <stop style="stop-color:#c51900;stop-opacity:1" offset="0" id="stop3604-2" />
+      <stop style="stop-color:#ff5f00;stop-opacity:1" offset="1" id="stop3606-2" />
     </linearGradient>
-    <linearGradient y2="14.363636" x2="24.81818" y1="14.363636" x1="3.909091" gradientUnits="userSpaceOnUse" id="linearGradient3726" xlink:href="#linearGradient3602-58" inkscape:collect="always"/>
-    <inkscape:perspective id="perspective4410" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective4944" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective4966" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective5009" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective5165" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7581" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7606" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7638" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7660" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7704" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7730" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7762" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7783" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7843" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7881" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7932" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective7983" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8036" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8057" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8080" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8137" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8205" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8233" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8254" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8276" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8346" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3602-1" id="linearGradient3608" x1="3.909091" y1="14.363636" x2="24.81818" y2="14.363636" gradientUnits="userSpaceOnUse"/>
+    <linearGradient y2="14.363636" x2="24.81818" y1="14.363636" x1="3.909091" gradientUnits="userSpaceOnUse" id="linearGradient3726" xlink:href="#linearGradient3602-58" />
+    <linearGradient xlink:href="#linearGradient3602-1" id="linearGradient3608" x1="3.909091" y1="14.363636" x2="24.81818" y2="14.363636" gradientUnits="userSpaceOnUse" />
     <linearGradient id="linearGradient3602-1">
-      <stop style="stop-color:#ff2600;stop-opacity:1;" offset="0" id="stop3604-22"/>
-      <stop style="stop-color:#ff5f00;stop-opacity:1;" offset="1" id="stop3606-1"/>
+      <stop style="stop-color:#ff2600;stop-opacity:1" offset="0" id="stop3604-22" />
+      <stop style="stop-color:#ff5f00;stop-opacity:1" offset="1" id="stop3606-1" />
     </linearGradient>
-    <inkscape:perspective id="perspective8386" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
     <linearGradient id="linearGradient3602-1-9">
-      <stop style="stop-color:#ff2600;stop-opacity:1;" offset="0" id="stop3604-22-5"/>
-      <stop style="stop-color:#ff5f00;stop-opacity:1;" offset="1" id="stop3606-1-4"/>
+      <stop style="stop-color:#ff2600;stop-opacity:1" offset="0" id="stop3604-22-5" />
+      <stop style="stop-color:#ff5f00;stop-opacity:1" offset="1" id="stop3606-1-4" />
     </linearGradient>
-    <linearGradient y2="14.363636" x2="24.81818" y1="14.363636" x1="3.909091" gradientUnits="userSpaceOnUse" id="linearGradient8395" xlink:href="#linearGradient3602-1-9" inkscape:collect="always"/>
-    <inkscape:perspective id="perspective8423" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8452" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
+    <linearGradient y2="14.363636" x2="24.81818" y1="14.363636" x1="3.909091" gradientUnits="userSpaceOnUse" id="linearGradient8395" xlink:href="#linearGradient3602-1-9" />
     <linearGradient id="linearGradient3602-1-2">
-      <stop style="stop-color:#ff2600;stop-opacity:1;" offset="0" id="stop3604-22-55"/>
-      <stop style="stop-color:#ff5f00;stop-opacity:1;" offset="1" id="stop3606-1-8"/>
+      <stop style="stop-color:#ff2600;stop-opacity:1" offset="0" id="stop3604-22-55" />
+      <stop style="stop-color:#ff5f00;stop-opacity:1" offset="1" id="stop3606-1-8" />
     </linearGradient>
-    <inkscape:perspective id="perspective8519" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8540" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8562" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8584" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8584-3" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8616" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8637" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8690" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8711" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8733" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8789" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <inkscape:perspective id="perspective8810" inkscape:persp3d-origin="0.5 : 0.33333333 : 1" inkscape:vp_z="1 : 0.5 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 0.5 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3846" id="linearGradient3852" x1="36" y1="57" x2="22" y2="8" gradientUnits="userSpaceOnUse"/>
+    <linearGradient xlink:href="#linearGradient3846" id="linearGradient3852" x1="36" y1="57" x2="22" y2="8" gradientUnits="userSpaceOnUse" />
   </defs>
-  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="8.625" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_Element_SelectionTypeInvalid</dc:title>
         <dc:date>2014-08-04</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -125,8 +76,8 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <path 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 id="layer1">
+    <path style="color:#000000;fill:url(#linearGradient3852);fill-opacity:1;fill-rule:nonzero;stroke:#280000;stroke-width:1.99999988;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" />
+    <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" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_EditSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_EditSketch.svg
index 04b706c728..8acb2bac90 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_EditSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_EditSketch.svg
@@ -1,61 +1,53 @@
 <?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.48.5 r10040" sodipodi:docname="Sketcher_LeaveSketch.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2726" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2728">
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2734"/>
-    <inkscape:perspective id="perspective3045" inkscape:persp3d-origin="32 : 21.333333 : 1" inkscape:vp_z="64 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 32 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="1076.6174" x2="3935.5251" y1="1286.7291" x1="3709.3296" id="linearGradient3847" xlink:href="#linearGradient3841" inkscape:collect="always"/>
+    <linearGradient gradientUnits="userSpaceOnUse" y2="1076.6174" x2="3935.5251" y1="1286.7291" x1="3709.3296" id="linearGradient3847" xlink:href="#linearGradient3841" />
     <linearGradient id="linearGradient3841">
-      <stop id="stop3843" offset="0" style="stop-color:#0619c0;stop-opacity:1;"/>
-      <stop id="stop3845" offset="1" style="stop-color:#379cfb;stop-opacity:1;"/>
+      <stop id="stop3843" offset="0" style="stop-color:#0619c0;stop-opacity:1" />
+      <stop id="stop3845" offset="1" style="stop-color:#379cfb;stop-opacity:1" />
     </linearGradient>
-    <inkscape:perspective id="perspective2971" inkscape:persp3d-origin="32 : 21.333333 : 1" inkscape:vp_z="64 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 32 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="1218.0156" x2="2032.5356" y1="1218.0156" x1="1634.3081" id="linearGradient3376" xlink:href="#linearGradient3354" inkscape:collect="always"/>
+    <linearGradient gradientUnits="userSpaceOnUse" y2="1218.0156" x2="2032.5356" y1="1218.0156" x1="1634.3081" id="linearGradient3376" xlink:href="#linearGradient3354" />
     <linearGradient id="linearGradient3354">
-      <stop id="stop3356" offset="0" style="stop-color:#2157c7;stop-opacity:1;"/>
-      <stop id="stop3358" offset="1" style="stop-color:#6daaff;stop-opacity:1;"/>
+      <stop id="stop3356" offset="0" style="stop-color:#2157c7;stop-opacity:1" />
+      <stop id="stop3358" offset="1" style="stop-color:#6daaff;stop-opacity:1" />
     </linearGradient>
-    <inkscape:perspective id="perspective3238" inkscape:persp3d-origin="32 : 21.333333 : 1" inkscape:vp_z="64 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 32 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient y2="711.11219" x2="2839.0713" y1="711.11219" x1="2732.3571" gradientTransform="matrix(0.7802234,0,0,1,599.85156,0)" gradientUnits="userSpaceOnUse" id="linearGradient2403" xlink:href="#linearGradient3255" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3255" inkscape:collect="always">
-      <stop id="stop3257" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
-      <stop id="stop3259" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/>
+    <linearGradient y2="711.11219" x2="2839.0713" y1="711.11219" x1="2732.3571" gradientTransform="matrix(0.7802234,0,0,1,599.85156,0)" gradientUnits="userSpaceOnUse" id="linearGradient2403" xlink:href="#linearGradient3255" />
+    <linearGradient id="linearGradient3255">
+      <stop id="stop3257" offset="0" style="stop-color:#ffffff;stop-opacity:1" />
+      <stop id="stop3259" offset="1" style="stop-color:#ffffff;stop-opacity:0" />
     </linearGradient>
-    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1344.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2405" xlink:href="#linearGradient3293" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3293" inkscape:collect="always">
-      <stop id="stop3295" offset="0" style="stop-color:#808000;stop-opacity:1;"/>
-      <stop id="stop3297" offset="1" style="stop-color:#808000;stop-opacity:0;"/>
+    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1344.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2405" xlink:href="#linearGradient3293" />
+    <linearGradient id="linearGradient3293">
+      <stop id="stop3295" offset="0" style="stop-color:#808000;stop-opacity:1" />
+      <stop id="stop3297" offset="1" style="stop-color:#808000;stop-opacity:0" />
     </linearGradient>
-    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1376.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2407" xlink:href="#linearGradient3293" inkscape:collect="always"/>
-    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1408.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2409" xlink:href="#linearGradient3293" inkscape:collect="always"/>
-    <radialGradient r="38.829369" fy="552.89736" fx="2787.5991" cy="552.89736" cx="2787.5991" gradientTransform="matrix(1,0,0,1.0807499,0,-44.646407)" gradientUnits="userSpaceOnUse" id="radialGradient2411" xlink:href="#linearGradient3273" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3273" inkscape:collect="always">
-      <stop id="stop3275" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
-      <stop id="stop3277" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/>
+    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1376.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2407" xlink:href="#linearGradient3293" />
+    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1408.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2409" xlink:href="#linearGradient3293" />
+    <radialGradient r="38.829369" fy="552.89736" fx="2787.5991" cy="552.89736" cx="2787.5991" gradientTransform="matrix(1,0,0,1.0807499,0,-44.646407)" gradientUnits="userSpaceOnUse" id="radialGradient2411" xlink:href="#linearGradient3273" />
+    <linearGradient id="linearGradient3273">
+      <stop id="stop3275" offset="0" style="stop-color:#ffffff;stop-opacity:1" />
+      <stop id="stop3277" 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 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" />
     <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"/>
+      <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"/>
+    <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" />
+    <linearGradient 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" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_EditSketch</dc:title>
         <dc:date>2014-07-13</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -78,16 +70,16 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g inkscape:label="Layer 1" id="g3436" transform="translate(107.50353,10.589633)"/>
-    <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="layer1">
+    <g id="g3436" transform="translate(107.50353,10.589633)" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
     <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"/>
+      <path 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" />
+      <path 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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_LeaveSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_LeaveSketch.svg
index 3f021dac61..698393938f 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_LeaveSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_LeaveSketch.svg
@@ -1,61 +1,53 @@
 <?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.48.5 r10040" sodipodi:docname="Sketcher_EditSketch.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.1">
+
+<svg width="64px" height="64px" id="svg2726" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs id="defs2728">
-    <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="64 : 32 : 1" inkscape:persp3d-origin="32 : 21.333333 : 1" id="perspective2734"/>
-    <inkscape:perspective id="perspective3045" inkscape:persp3d-origin="32 : 21.333333 : 1" inkscape:vp_z="64 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 32 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="1076.6174" x2="3935.5251" y1="1286.7291" x1="3709.3296" id="linearGradient3847" xlink:href="#linearGradient3841" inkscape:collect="always"/>
+    <linearGradient gradientUnits="userSpaceOnUse" y2="1076.6174" x2="3935.5251" y1="1286.7291" x1="3709.3296" id="linearGradient3847" xlink:href="#linearGradient3841" />
     <linearGradient id="linearGradient3841">
-      <stop id="stop3843" offset="0" style="stop-color:#0619c0;stop-opacity:1;"/>
-      <stop id="stop3845" offset="1" style="stop-color:#379cfb;stop-opacity:1;"/>
+      <stop id="stop3843" offset="0" style="stop-color:#0619c0;stop-opacity:1" />
+      <stop id="stop3845" offset="1" style="stop-color:#379cfb;stop-opacity:1" />
     </linearGradient>
-    <inkscape:perspective id="perspective2971" inkscape:persp3d-origin="32 : 21.333333 : 1" inkscape:vp_z="64 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 32 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient gradientUnits="userSpaceOnUse" y2="1218.0156" x2="2032.5356" y1="1218.0156" x1="1634.3081" id="linearGradient3376" xlink:href="#linearGradient3354" inkscape:collect="always"/>
+    <linearGradient gradientUnits="userSpaceOnUse" y2="1218.0156" x2="2032.5356" y1="1218.0156" x1="1634.3081" id="linearGradient3376" xlink:href="#linearGradient3354" />
     <linearGradient id="linearGradient3354">
-      <stop id="stop3356" offset="0" style="stop-color:#2157c7;stop-opacity:1;"/>
-      <stop id="stop3358" offset="1" style="stop-color:#6daaff;stop-opacity:1;"/>
+      <stop id="stop3356" offset="0" style="stop-color:#2157c7;stop-opacity:1" />
+      <stop id="stop3358" offset="1" style="stop-color:#6daaff;stop-opacity:1" />
     </linearGradient>
-    <inkscape:perspective id="perspective3238" inkscape:persp3d-origin="32 : 21.333333 : 1" inkscape:vp_z="64 : 32 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 32 : 1" sodipodi:type="inkscape:persp3d"/>
-    <linearGradient y2="711.11219" x2="2839.0713" y1="711.11219" x1="2732.3571" gradientTransform="matrix(0.7802234,0,0,1,599.85156,0)" gradientUnits="userSpaceOnUse" id="linearGradient2403" xlink:href="#linearGradient3255" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3255" inkscape:collect="always">
-      <stop id="stop3257" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
-      <stop id="stop3259" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/>
+    <linearGradient y2="711.11219" x2="2839.0713" y1="711.11219" x1="2732.3571" gradientTransform="matrix(0.7802234,0,0,1,599.85156,0)" gradientUnits="userSpaceOnUse" id="linearGradient2403" xlink:href="#linearGradient3255" />
+    <linearGradient id="linearGradient3255">
+      <stop id="stop3257" offset="0" style="stop-color:#ffffff;stop-opacity:1" />
+      <stop id="stop3259" offset="1" style="stop-color:#ffffff;stop-opacity:0" />
     </linearGradient>
-    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1344.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2405" xlink:href="#linearGradient3293" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3293" inkscape:collect="always">
-      <stop id="stop3295" offset="0" style="stop-color:#808000;stop-opacity:1;"/>
-      <stop id="stop3297" offset="1" style="stop-color:#808000;stop-opacity:0;"/>
+    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1344.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2405" xlink:href="#linearGradient3293" />
+    <linearGradient id="linearGradient3293">
+      <stop id="stop3295" offset="0" style="stop-color:#808000;stop-opacity:1" />
+      <stop id="stop3297" offset="1" style="stop-color:#808000;stop-opacity:0" />
     </linearGradient>
-    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1376.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2407" xlink:href="#linearGradient3293" inkscape:collect="always"/>
-    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1408.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2409" xlink:href="#linearGradient3293" inkscape:collect="always"/>
-    <radialGradient r="38.829369" fy="552.89736" fx="2787.5991" cy="552.89736" cx="2787.5991" gradientTransform="matrix(1,0,0,1.0807499,0,-44.646407)" gradientUnits="userSpaceOnUse" id="radialGradient2411" xlink:href="#linearGradient3273" inkscape:collect="always"/>
-    <linearGradient id="linearGradient3273" inkscape:collect="always">
-      <stop id="stop3275" offset="0" style="stop-color:#ffffff;stop-opacity:1;"/>
-      <stop id="stop3277" offset="1" style="stop-color:#ffffff;stop-opacity:0;"/>
+    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1376.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2407" xlink:href="#linearGradient3293" />
+    <linearGradient y2="671.11081" x2="2900.148" y1="671.11081" x1="2754.6858" gradientTransform="matrix(-1,0,0,-1,5656.8338,1408.2216)" gradientUnits="userSpaceOnUse" id="linearGradient2409" xlink:href="#linearGradient3293" />
+    <radialGradient r="38.829369" fy="552.89736" fx="2787.5991" cy="552.89736" cx="2787.5991" gradientTransform="matrix(1,0,0,1.0807499,0,-44.646407)" gradientUnits="userSpaceOnUse" id="radialGradient2411" xlink:href="#linearGradient3273" />
+    <linearGradient id="linearGradient3273">
+      <stop id="stop3275" offset="0" style="stop-color:#ffffff;stop-opacity:1" />
+      <stop id="stop3277" 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 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" />
     <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"/>
+      <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"/>
+    <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" />
+    <linearGradient 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" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" 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="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>
       <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_LeaveSketch</dc:title>
         <dc:date>2011-10-10</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -78,16 +70,16 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
-    <g inkscape:label="Layer 1" id="g3436" transform="translate(107.50353,10.589633)"/>
-    <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="layer1">
+    <g id="g3436" transform="translate(107.50353,10.589633)" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
+    <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" />
     <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"/>
+      <path 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" />
+      <path 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" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MapSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MapSketch.svg
index 859c935508..db99ec2b44 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MapSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MapSketch.svg
@@ -1,347 +1,80 @@
 <?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="svg3364"
-   sodipodi:version="0.32"
-   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" />
+<svg width="64px" height="64px" id="svg3364" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs3366">
+    <linearGradient 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 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
-         id="stop3837"
-         offset="0"
-         style="stop-color:#637dca;stop-opacity:1;" />
-      <stop
-         id="stop3839"
-         offset="1"
-         style="stop-color:#9eaede;stop-opacity:1;" />
+    <linearGradient id="linearGradient3835">
+      <stop id="stop3837" offset="0" style="stop-color:#637dca;stop-opacity:1" />
+      <stop id="stop3839" offset="1" style="stop-color:#9eaede;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3827">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3829" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3831" />
+    <linearGradient id="linearGradient3827">
+      <stop style="stop-color:#000000;stop-opacity:1" offset="0" id="stop3829" />
+      <stop style="stop-color:#000000;stop-opacity:0" offset="1" id="stop3831" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3864">
-      <stop
-         id="stop3866"
-         offset="0"
-         style="stop-color:#840000;stop-opacity:1;" />
-      <stop
-         id="stop3868"
-         offset="1"
-         style="stop-color:#ff2b1e;stop-opacity:1;" />
+    <linearGradient id="linearGradient3864">
+      <stop id="stop3866" offset="0" style="stop-color:#840000;stop-opacity:1" />
+      <stop id="stop3868" offset="1" style="stop-color:#ff2b1e;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3593">
-      <stop
-         style="stop-color:#00aff9;stop-opacity:1;"
-         offset="0"
-         id="stop3595" />
-      <stop
-         style="stop-color:#001ccc;stop-opacity:1;"
-         offset="1"
-         id="stop3597" />
+    <linearGradient id="linearGradient3593">
+      <stop style="stop-color:#00aff9;stop-opacity:1" offset="0" id="stop3595" />
+      <stop style="stop-color:#001ccc;stop-opacity:1" offset="1" id="stop3597" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="-24.909091 : 16.545455 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="116.36364 : 23.818182 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective3372" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="radialGradient2998"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6696601,0.63911498,-0.09121381,0.31244488,-540.88725,-258.46199)"
-       cx="342.58258"
-       cy="27.256668"
-       fx="342.58258"
-       fy="27.256668"
-       r="19.571428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3593-0"
-       id="radialGradient3004-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-320.59978,-6.63068)"
-       cx="330.63791"
-       cy="39.962704"
-       fx="330.63791"
-       fy="39.962704"
-       r="19.571428" />
-    <linearGradient
-       id="linearGradient3593-0">
-      <stop
-         style="stop-color:#c8e0f9;stop-opacity:1;"
-         offset="0"
-         id="stop3595-2" />
-      <stop
-         style="stop-color:#637dca;stop-opacity:1;"
-         offset="1"
-         id="stop3597-1" />
+    <radialGradient xlink:href="#linearGradient3864" id="radialGradient2998" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6696601,0.63911498,-0.09121381,0.31244488,-540.88725,-258.46199)" cx="342.58258" cy="27.256668" fx="342.58258" fy="27.256668" r="19.571428" />
+    <radialGradient xlink:href="#linearGradient3593-0" id="radialGradient3004-8" gradientUnits="userSpaceOnUse" gradientTransform="translate(-320.59978,-6.63068)" cx="330.63791" cy="39.962704" fx="330.63791" fy="39.962704" r="19.571428" />
+    <linearGradient id="linearGradient3593-0">
+      <stop style="stop-color:#c8e0f9;stop-opacity:1" offset="0" id="stop3595-2" />
+      <stop style="stop-color:#637dca;stop-opacity:1" offset="1" id="stop3597-1" />
     </linearGradient>
-    <radialGradient
-       r="19.571428"
-       fy="39.962704"
-       fx="330.63791"
-       cy="39.962704"
-       cx="330.63791"
-       gradientTransform="matrix(-0.93227784,0,0,1.3554421,396.33347,-27.208207)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3036"
-       xlink:href="#linearGradient3593-0"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3593"
-       id="linearGradient3799"
-       x1="5.3636365"
-       y1="34"
-       x2="57"
-       y2="34"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.3500116,0,0,1.3348951,9.2846859,-20.430802)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3593-3"
-       id="linearGradient3799-2"
-       x1="5.3636365"
-       y1="34"
-       x2="57"
-       y2="34"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6308426,0,0,1.5945248,9.3400117,-34.898933)" />
-    <linearGradient
-       id="linearGradient3593-3">
-      <stop
-         style="stop-color:#00aff9;stop-opacity:1;"
-         offset="0"
-         id="stop3595-23" />
-      <stop
-         style="stop-color:#001ccc;stop-opacity:1;"
-         offset="1"
-         id="stop3597-7" />
+    <radialGradient r="19.571428" fy="39.962704" fx="330.63791" cy="39.962704" cx="330.63791" gradientTransform="matrix(-0.93227784,0,0,1.3554421,396.33347,-27.208207)" gradientUnits="userSpaceOnUse" id="radialGradient3036" xlink:href="#linearGradient3593-0" />
+    <linearGradient xlink:href="#linearGradient3593" id="linearGradient3799" x1="5.3636365" y1="34" x2="57" y2="34" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.3500116,0,0,1.3348951,9.2846859,-20.430802)" />
+    <linearGradient xlink:href="#linearGradient3593-3" id="linearGradient3799-2" x1="5.3636365" y1="34" x2="57" y2="34" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6308426,0,0,1.5945248,9.3400117,-34.898933)" />
+    <linearGradient id="linearGradient3593-3">
+      <stop style="stop-color:#00aff9;stop-opacity:1" offset="0" id="stop3595-23" />
+      <stop style="stop-color:#001ccc;stop-opacity:1" offset="1" id="stop3597-7" />
     </linearGradient>
-    <linearGradient
-       y2="34"
-       x2="57"
-       y1="34"
-       x1="5.3636365"
-       gradientTransform="matrix(1.0632565,0,0,1.0632566,-4.7659293,-8.6027115)"
-       gradientUnits="userSpaceOnUse"
-       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 y2="34" x2="57" y1="34" x1="5.3636365" gradientTransform="matrix(1.0632565,0,0,1.0632566,-4.7659293,-8.6027115)" gradientUnits="userSpaceOnUse" id="linearGradient3919" xlink:href="#linearGradient3593-3" />
+    <linearGradient 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 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" />
+    <linearGradient 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 gradientTransform="matrix(0.72697598,0.06131813,0,0.63519063,-6.5732894,25.249529)" xlink:href="#linearGradient3874" id="linearGradient3880" x1="56" y1="47" x2="53" y2="39" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 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 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" />
+    <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" />
+    <linearGradient 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 xlink:href="#linearGradient3776" id="linearGradient3927" gradientUnits="userSpaceOnUse" x1="33.052631" y1="73.676765" x2="23.483253" y2="19.131313" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.5947266"
-     inkscape:cx="51.336854"
-     inkscape:cy="22.104664"
-     inkscape:current-layer="g3929"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="873"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3020"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3369">
+  <metadata id="metadata3369">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_MapSketch</dc:title>
         <dc:date>2012-12-03</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -364,99 +97,24 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g3780"
-       transform="matrix(0.82780005,0,0,0.83717425,-0.2499405,9.0601524)">
-      <g
-         id="g3848"
-         transform="translate(-72.481264,-2.5728951e-6)">
-        <path
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           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
-           inkscape:connector-curvature="0"
-           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
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           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
-           sodipodi:nodetypes="ccccc"
-           inkscape:connector-curvature="0"
-           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
-           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 id="layer1">
+    <g id="g3780" transform="matrix(0.82780005,0,0,0.83717425,-0.2499405,9.0601524)">
+      <g id="g3848" transform="translate(-72.481264,-2.5728951e-6)">
+        <path 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="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="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 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 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 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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <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 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" 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)" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MergeSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MergeSketch.svg
index 0173c765fd..98f743217b 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MergeSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MergeSketch.svg
@@ -1,194 +1,45 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Sketcher_MergeSketch.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
-  <defs
-     id="defs5823">
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Mend"
-       style="overflow:visible;">
-      <path
-         id="path4003"
-         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) rotate(180) translate(0,0)" />
+<svg width="64px" height="64px" id="svg5821" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs5823">
+    <marker orient="auto" refY="0.0" refX="0.0" id="Arrow2Mend" style="overflow:visible">
+      <path id="path4003" style="fill-rule:evenodd;stroke-width:0.625;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 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:1pt" transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6349">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6351" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop6353" />
+    <linearGradient id="linearGradient6349">
+      <stop style="stop-color:#000000;stop-opacity:1" offset="0" id="stop6351" />
+      <stop style="stop-color:#000000;stop-opacity:0" offset="1" id="stop6353" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
-         offset="0"
-         id="stop3379" />
-      <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
-         offset="1"
-         id="stop3381" />
+    <linearGradient id="linearGradient3377">
+      <stop style="stop-color:#0019a3;stop-opacity:1" offset="0" id="stop3379" />
+      <stop style="stop-color:#0069ff;stop-opacity:1" offset="1" id="stop3381" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3768"
-       id="linearGradient3774"
-       x1="1178.153"
-       y1="1453.8708"
-       x2="1105.0463"
-       y2="1059.0945"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3768">
-      <stop
-         style="stop-color:#cc0000;stop-opacity:1"
-         offset="0"
-         id="stop3770" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3772" />
+    <linearGradient xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <radialGradient xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" r="194.40614" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 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 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 id="linearGradient3768-5">
+      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770-6" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772-2" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.0391464"
-     inkscape:cx="17.793844"
-     inkscape:cy="52.547104"
-     inkscape:current-layer="g3047"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="837"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3045"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5826">
+  <metadata id="metadata5826">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_MergeSketch</dc:title>
         <dc:date>2014-11-26</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -211,160 +62,28 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g3360"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-       inkscape:export-xdpi="3.2478156"
-       inkscape:export-ydpi="3.2478156"
-       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <g
-         id="g3047"
-         transform="matrix(0.62222324,0,0,0.61432167,842.63789,423.10469)">
-        <rect
-           y="1059.0725"
-           x="104.49656"
-           height="190.40639"
-           width="187.98843"
-           id="rect3860-3"
-           style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.94758606000000611;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           transform="matrix(5.1840059,0,0,5.236176,135.76185,896.75102)"
-           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-           sodipodi:ry="18.181818"
-           sodipodi:rx="18.181818"
-           sodipodi:cy="33.272728"
-           sodipodi:cx="30.181818"
-           id="path3862-6"
-           style="color:#000000;fill:none;stroke:#a40000;stroke-width:13.61751175000000025;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-        <rect
-           y="1059.0725"
-           x="104.49656"
-           height="190.40639"
-           width="187.98842"
-           id="rect3860-3-9"
-           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:23.64919498000000075;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           transform="matrix(5.1840059,0,0,5.236176,135.76186,896.75101)"
-           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-           sodipodi:ry="18.181818"
-           sodipodi:rx="18.181818"
-           sodipodi:cy="33.272728"
-           sodipodi:cx="30.181818"
-           id="path3862-6-1"
-           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917054999999969;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-        <rect
-           y="1059.0726"
-           x="456.97491"
-           height="190.40639"
-           width="187.98842"
-           id="rect3860-3-2"
-           style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           transform="matrix(5.1840059,0,0,5.236176,488.24021,896.75107)"
-           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-           sodipodi:ry="18.181818"
-           sodipodi:rx="18.181818"
-           sodipodi:cy="33.272728"
-           sodipodi:cx="30.181818"
-           id="path3862-6-6"
-           style="color:#000000;fill:none;stroke:#a40000;stroke-width:13.61751175;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-        <rect
-           y="1059.0726"
-           x="456.97491"
-           height="190.40639"
-           width="187.9884"
-           id="rect3860-3-9-1"
-           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:23.64919472000000056;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           transform="matrix(5.1840059,0,0,5.236176,488.24022,896.75106)"
-           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-           sodipodi:ry="18.181818"
-           sodipodi:rx="18.181818"
-           sodipodi:cy="33.272728"
-           sodipodi:cx="30.181818"
-           id="path3862-6-1-8"
-           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917074000000031;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-        <rect
-           y="1427.9849"
-           x="268.98648"
-           height="190.40639"
-           width="187.98842"
-           id="rect3860-3-8"
-           style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.94758606000000611;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           transform="matrix(5.1840059,0,0,5.236176,300.25178,1265.6633)"
-           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-           sodipodi:ry="18.181818"
-           sodipodi:rx="18.181818"
-           sodipodi:cy="33.272728"
-           sodipodi:cx="30.181818"
-           id="path3862-6-9"
-           style="color:#000000;fill:none;stroke:#a40000;stroke-width:13.61751175000000025;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-        <rect
-           y="1427.9849"
-           x="268.98648"
-           height="190.40639"
-           width="187.9884"
-           id="rect3860-3-9-7"
-           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:23.64919472000000056;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           transform="matrix(5.1840059,0,0,5.236176,300.25179,1265.6633)"
-           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-           sodipodi:ry="18.181818"
-           sodipodi:rx="18.181818"
-           sodipodi:cy="33.272728"
-           sodipodi:cx="30.181818"
-           id="path3862-6-1-3"
-           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917074000000031;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-        <path
-           style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;marker-end:none"
-           d="m 6.9999999,35.000001 c 0,6 0.9999999,8 7.0000001,8"
-           id="path3202"
-           inkscape:connector-curvature="0"
-           transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)"
-           sodipodi:nodetypes="cc" />
-        <path
-           inkscape:connector-curvature="0"
-           id="path3012-6-3"
-           d="m 198.49078,1475.5865 0,-95.2032 70.49567,47.6016 z"
-           style="fill:#d3d7cf;stroke:#2e3436;stroke-width:23.64919280999999884;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-        <path
-           style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 6.9999999,35.000001 c 0,6 0.9999999,8 7.0000001,8"
-           id="path4804"
-           inkscape:connector-curvature="0"
-           transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)"
-           sodipodi:nodetypes="cc" />
-        <g
-           id="g4830"
-           transform="matrix(-1,0,0,1,1430.918,-11.900422)">
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3202-1"
-             d="m 715.459,1344.6821 c 0,71.4024 11.74928,95.2032 82.24495,95.2032"
-             style="fill:none;stroke:#2e3436;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;marker-end:none" />
-          <path
-             style="fill:#d3d7cf;stroke:#2e3436;stroke-width:23.64919281;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-             d="m 785.95466,1487.4869 0,-95.2032 70.49566,47.6016 z"
-             id="path3012-6-3-9"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path4804-4"
-             d="m 715.459,1344.6821 c 0,71.4024 11.74928,95.2032 82.24495,95.2032"
-             style="fill:none;stroke:#d3d7cf;stroke-width:23.64919472;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+  <g id="layer1">
+    <g id="g3360" transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+      <g id="g3047" transform="matrix(0.62222324,0,0,0.61432167,842.63789,423.10469)">
+        <rect y="1059.0725" x="104.49656" height="190.40639" width="187.98843" id="rect3860-3" style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.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,135.76185,896.75102)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" id="path3862-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" />
+        <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.64919498;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path transform="matrix(5.1840059,0,0,5.236176,135.76186,896.75101)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" id="path3862-6-1" style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917055;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect y="1059.0726" x="456.97491" height="190.40639" width="187.98842" id="rect3860-3-2" style="color:#000000;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path transform="matrix(5.1840059,0,0,5.236176,488.24021,896.75107)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" 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" />
+        <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.64919472;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path transform="matrix(5.1840059,0,0,5.236176,488.24022,896.75106)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" id="path3862-6-1-8" style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917074;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect y="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.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,300.25178,1265.6633)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" id="path3862-6-9" 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" />
+        <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.64919472;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path transform="matrix(5.1840059,0,0,5.236176,300.25179,1265.6633)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" id="path3862-6-1-3" style="color:#000000;fill:none;stroke:#ef2929;stroke-width:4.53917074;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path style="fill:none;stroke:#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" transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)" />
+        <path 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.64919281;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" transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)" />
+        <g id="g4830" transform="matrix(-1,0,0,1,1430.918,-11.900422)">
+          <path 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" />
+          <path id="path4804-4" d="m 715.459,1344.6821 c 0,71.4024 11.74928,95.2032 82.24495,95.2032" style="fill:none;stroke:#d3d7cf;stroke-width:23.64919472;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MirrorSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MirrorSketch.svg
index b08d6d329d..002dbbf478 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MirrorSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_MirrorSketch.svg
@@ -1,146 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Sketcher_MirrorSketch.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
-  <defs
-     id="defs5823">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6349">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6351" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop6353" />
+<svg width="64px" height="64px" id="svg5821" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs5823">
+    <linearGradient id="linearGradient6349">
+      <stop style="stop-color:#000000;stop-opacity:1" offset="0" id="stop6351" />
+      <stop style="stop-color:#000000;stop-opacity:0" offset="1" id="stop6353" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
-         offset="0"
-         id="stop3379" />
-      <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
-         offset="1"
-         id="stop3381" />
+    <linearGradient id="linearGradient3377">
+      <stop style="stop-color:#0019a3;stop-opacity:1" offset="0" id="stop3379" />
+      <stop style="stop-color:#0069ff;stop-opacity:1" offset="1" id="stop3381" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="matrix(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 xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <radialGradient xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" r="194.40614" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" gradientUnits="userSpaceOnUse" />
+    <linearGradient gradientTransform="matrix(1,0,0,0.5757573,-365.5337,605.49565)" xlink:href="#linearGradient3768-4" id="linearGradient3774-9" x1="1178.153" y1="1453.8708" x2="1105.0463" y2="1059.0945" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16.036414"
-     inkscape:cx="34.190727"
-     inkscape:cy="32.208332"
-     inkscape:current-layer="g3187"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="873"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3040"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5826">
+  <metadata id="metadata5826">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[Abdullah Tahiri]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_MirrorSketch</dc:title>
         <dc:date>2015-08-19</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -163,101 +51,20 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g3360"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-       inkscape:export-xdpi="3.2478156"
-       inkscape:export-ydpi="3.2478156"
-       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <rect
-         style="color:#000000;fill:none;stroke:#a40000;stroke-width:43.86404037;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3860-36"
-         width="204.69887"
-         height="116.97069"
-         x="951.52222"
-         y="1051.7839" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#a40000;stroke-width:10.40140914999999900;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3862-7"
-         sodipodi:cx="30.181818"
-         sodipodi:cy="33.272728"
-         sodipodi:rx="18.181818"
-         sodipodi:ry="18.181818"
-         d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-         transform="matrix(4.4229577,0,0,4.0208706,1044.6602,961.86255)" />
-      <rect
-         style="color:#000000;fill:none;stroke:#ef2929;stroke-width:14.62134361000000027;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3860-3"
-         width="204.69887"
-         height="116.97153"
-         x="951.52222"
-         y="1051.7831" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:#ef2929;stroke-width:3.46713686000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3862-6"
-         sodipodi:cx="30.181818"
-         sodipodi:cy="33.272728"
-         sodipodi:rx="18.181818"
-         sodipodi:ry="18.181818"
-         d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-         transform="matrix(4.4229575,0,0,4.0208705,1044.6602,961.86255)" />
-      <g
-         id="g3187"
-         transform="matrix(1,0,0,-1,438.64043,2717.6642)">
-        <rect
-           y="1329.5896"
-           x="512.88171"
-           height="116.97055"
-           width="204.69887"
-           id="rect3860-36-1"
-           style="color:#000000;fill:none;stroke:#a40000;stroke-width:43.86404037;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           transform="matrix(4.4229577,0,0,4.0208706,606.01966,1239.6681)"
-           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-           sodipodi:ry="18.181818"
-           sodipodi:rx="18.181818"
-           sodipodi:cy="33.272728"
-           sodipodi:cx="30.181818"
-           id="path3862-7-6"
-           style="color:#000000;fill:none;stroke:#a40000;stroke-width:10.40140914999999900;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
-        <rect
-           y="1329.5887"
-           x="512.88171"
-           height="116.97141"
-           width="204.69887"
-           id="rect3860-3-8"
-           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:14.62134361000000027;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-        <path
-           transform="matrix(4.4229575,0,0,4.0208705,606.01966,1239.6681)"
-           d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-           sodipodi:ry="18.181818"
-           sodipodi:rx="18.181818"
-           sodipodi:cy="33.272728"
-           sodipodi:cx="30.181818"
-           id="path3862-6-5"
-           style="color:#000000;fill:none;stroke:#ef2929;stroke-width:3.46713686000000010;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-           sodipodi:type="arc" />
+  <g id="layer1">
+    <g id="g3360" 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 style="color:#000000;fill:none;stroke:#a40000;stroke-width:10.40140915;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" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" transform="matrix(4.4229577,0,0,4.0208706,1044.6602,961.86255)" />
+      <rect style="color:#000000;fill:none;stroke:#ef2929;stroke-width:14.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 style="color:#000000;fill:none;stroke:#ef2929;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" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" transform="matrix(4.4229575,0,0,4.0208705,1044.6602,961.86255)" />
+      <g id="g3187" transform="matrix(1,0,0,-1,438.64043,2717.6642)">
+        <rect y="1329.5896" x="512.88171" height="116.97055" width="204.69887" id="rect3860-36-1" style="color:#000000;fill:none;stroke:#a40000;stroke-width:43.86404037;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path transform="matrix(4.4229577,0,0,4.0208706,606.01966,1239.6681)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" id="path3862-7-6" style="color:#000000;fill:none;stroke:#a40000;stroke-width:10.40140915;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect y="1329.5887" x="512.88171" height="116.97141" width="204.69887" id="rect3860-3-8" style="color:#000000;fill:none;stroke:#ef2929;stroke-width:14.62134361;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <path transform="matrix(4.4229575,0,0,4.0208705,606.01966,1239.6681)" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" id="path3862-6-5" style="color:#000000;fill:none;stroke:#ef2929;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" />
       </g>
-      <path
-         style="fill:none;stroke:#204a87;stroke-width:5.99999996000000020;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:5.99999996000000020, 11.99999993000000000;stroke-dashoffset:2.99999998000000010"
-         d="M 4.9999998,32 58.999999,32"
-         id="path3200"
-         inkscape:connector-curvature="0"
-         transform="matrix(7.3106737,0,0,7.3106737,871.10471,985.98778)"
-         sodipodi:nodetypes="cc" />
-      <path
-         style="fill:none;stroke:#729fcf;stroke-width:14.62134731;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:43.86404164999999700, 87.72808336999997900;stroke-dashoffset:21.93202082000000200"
-         d="m 907.65808,1219.9293 394.77632,0"
-         id="path3200-8"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
+      <path style="fill:none;stroke:#204a87;stroke-width:5.99999996;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:5.99999996, 11.99999993;stroke-dashoffset:2.99999998" d="M 4.9999998,32 58.999999,32" id="path3200" transform="matrix(7.3106737,0,0,7.3106737,871.10471,985.98778)" />
+      <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.86404165, 87.72808337;stroke-dashoffset:21.93202082" d="m 907.65808,1219.9293 394.77632,0" id="path3200-8" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_NewSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_NewSketch.svg
index 4d0faa56cd..8003177e72 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_NewSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_NewSketch.svg
@@ -1,220 +1,50 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Sketcher_NewSketch.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
-  <defs
-     id="defs5823">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3776">
-      <stop
-         style="stop-color:#cc0000;stop-opacity:1"
-         offset="0"
-         id="stop3778" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3780" />
+<svg width="64px" height="64px" id="svg5821" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs5823">
+    <linearGradient 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 id="linearGradient3768">
+      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6349">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6351" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop6353" />
+    <linearGradient id="linearGradient6349">
+      <stop style="stop-color:#000000;stop-opacity:1" offset="0" id="stop6351" />
+      <stop style="stop-color:#000000;stop-opacity:0" offset="1" id="stop6353" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
-         offset="0"
-         id="stop3379" />
-      <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
-         offset="1"
-         id="stop3381" />
+    <linearGradient id="linearGradient3377">
+      <stop style="stop-color:#0019a3;stop-opacity:1" offset="0" id="stop3379" />
+      <stop style="stop-color:#0069ff;stop-opacity:1" offset="1" id="stop3381" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3768"
-       id="linearGradient3774"
-       x1="1178.153"
-       y1="1453.8708"
-       x2="1105.0463"
-       y2="1059.0945"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3776"
-       id="linearGradient3782"
-       x1="33.052631"
-       y1="73.676765"
-       x2="23.483253"
-       y2="19.131313"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="matrix(7.3106737,0,0,7.3106737,841.86203,1044.4732)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3874"
-       id="linearGradient3880"
-       x1="56"
-       y1="47"
-       x2="53"
-       y2="39"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3874">
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="0"
-         id="stop3876" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="1"
-         id="stop3878" />
+    <linearGradient xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <radialGradient xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" r="194.40614" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 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)" xlink:href="#linearGradient3874" id="linearGradient3880" x1="56" y1="47" x2="53" y2="39" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 xlink:href="#linearGradient3866" id="linearGradient3872" x1="35" y1="53" x2="24" y2="9" gradientUnits="userSpaceOnUse" />
+    <linearGradient id="linearGradient3866">
+      <stop style="stop-color:#d3d7cf;stop-opacity:1" offset="0" id="stop3868" />
+      <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop3870" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0,7.3106737,7.3106737,0,900.34735,985.98777)"
-       y2="20.000008"
-       x2="6.000001"
-       y1="38.000008"
-       x1="58"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3127"
-       xlink:href="#linearGradient3866"
-       inkscape:collect="always" />
+    <linearGradient gradientTransform="matrix(0,7.3106737,7.3106737,0,900.34735,985.98777)" y2="20.000008" x2="6.000001" y1="38.000008" x1="58" gradientUnits="userSpaceOnUse" id="linearGradient3127" xlink:href="#linearGradient3866" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.0380069"
-     inkscape:cx="19.154263"
-     inkscape:cy="32.756262"
-     inkscape:current-layer="g3360"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="873"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2997"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5826">
+  <metadata id="metadata5826">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_NewSketch</dc:title>
         <dc:date>2011-10-10</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -237,63 +67,15 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g3360"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-       inkscape:export-xdpi="3.2478156"
-       inkscape:export-ydpi="3.2478156"
-       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <path
-         d="m 922.27941,1007.9198 365.53359,0 0,350.9123 -73.1067,73.1069 -292.42689,0 z"
-         id="rect3005"
-         style="color:#000000;fill:url(#linearGradient3127);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1273.1917,1022.5412 -336.29092,0 0,394.7763 271.22592,0 65.065,-66.5271 z"
-         id="path3096"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         d="m 1287.8132,1358.8322 c 0,-7.3107 -29.2428,-29.2427 -58.4855,-29.2427 0,0 14.6213,73.1067 -14.6214,102.3494 z"
-         id="path3778"
-         style="color:#000000;fill:url(#linearGradient3880);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:14.26466179;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;stroke:#babdb6;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1229.9528,1396.295 48.6777,-47.1803"
-         id="path3125"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         d="m 1287.8132,1358.8322 c 0,-7.3107 -29.2428,-29.2427 -58.4855,-29.2427 0,0 14.6213,73.1067 -14.6214,102.3494 z"
-         id="path3778-3"
-         style="color:#000000;fill:none;stroke:#3f3f3f;stroke-width:14.26466179;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <rect
-         style="color:#000000;fill:none;stroke:url(#linearGradient3774);stroke-width:29.24269676;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3860-3"
-         width="190.077"
-         height="190.07753"
-         x="958.83331"
-         y="1190.6866" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:url(#linearGradient3782);stroke-width:5.53487444;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3862-6"
-         sodipodi:cx="30.181818"
-         sodipodi:cy="33.272728"
-         sodipodi:rx="18.181818"
-         sodipodi:ry="18.181818"
-         d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-         transform="matrix(5.4281292,0,0,5.1424383,996.04635,999.19155)" />
+  <g id="layer1">
+    <g id="g3360" 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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <rect style="color:#000000;fill:none;stroke:url(#linearGradient3774);stroke-width:29.24269676;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect3860-3" width="190.077" height="190.07753" x="958.83331" y="1190.6866" />
+      <path 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" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" transform="matrix(5.4281292,0,0,5.1424383,996.04635,999.19155)" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ReorientSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ReorientSketch.svg
index 19d20b050e..7f275c9d24 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ReorientSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ReorientSketch.svg
@@ -1,391 +1,88 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   version="1.1"
-   id="svg5821"
-   height="64px"
-   width="64px">
-  <title
-     id="title2002">Sketcher_ReorientSketch</title>
-  <defs
-     id="defs5823">
-    <marker
-       style="overflow:visible;"
-       id="Arrow2Mend"
-       refX="0.0"
-       refY="0.0"
-       orient="auto">
-      <path
-         transform="scale(0.6) rotate(180) translate(0,0)"
-         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 "
-         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         id="path4003" />
+<svg version="1.1" id="svg5821" height="64px" width="64px" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title id="title2002">Sketcher_ReorientSketch</title>
+  <defs id="defs5823">
+    <marker style="overflow:visible" id="Arrow2Mend" refX="0.0" refY="0.0" orient="auto">
+      <path transform="scale(0.6) rotate(180) translate(0,0)" 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 " style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" id="path4003" />
     </marker>
-    <marker
-       style="overflow:visible;"
-       id="Arrow1Mend"
-       refX="0.0"
-       refY="0.0"
-       orient="auto">
-      <path
-         transform="scale(0.4) rotate(180) translate(10,0)"
-         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         id="path3985" />
+    <marker style="overflow:visible" id="Arrow1Mend" refX="0.0" refY="0.0" orient="auto">
+      <path transform="scale(0.4) rotate(180) translate(10,0)" style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " id="path3985" />
     </marker>
-    <linearGradient
-       id="linearGradient6349">
-      <stop
-         id="stop6351"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop6353"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
+    <linearGradient id="linearGradient6349">
+      <stop id="stop6351" offset="0" style="stop-color:#000000;stop-opacity:1" />
+      <stop id="stop6353" offset="1" style="stop-color:#000000;stop-opacity:0" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         id="stop3379"
-         offset="0"
-         style="stop-color:#0019a3;stop-opacity:1;" />
-      <stop
-         id="stop3381"
-         offset="1"
-         style="stop-color:#0069ff;stop-opacity:1;" />
+    <linearGradient id="linearGradient3377">
+      <stop id="stop3379" offset="0" style="stop-color:#0019a3;stop-opacity:1" />
+      <stop id="stop3381" offset="1" style="stop-color:#0069ff;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(-1,0,0,1,2199.356,0)"
-       gradientUnits="userSpaceOnUse"
-       y2="1190.875"
-       x2="1267.9062"
-       y1="1190.875"
-       x1="901.1875"
-       id="linearGradient3383"
-       xlink:href="#linearGradient3377" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       r="194.40614"
-       fy="1424.4465"
-       fx="1103.6399"
-       cy="1424.4465"
-       cx="1103.6399"
-       id="radialGradient6355"
-       xlink:href="#linearGradient6349" />
-    <linearGradient
-       gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)"
-       gradientUnits="userSpaceOnUse"
-       y2="1059.0945"
-       x2="1105.0463"
-       y1="1453.8708"
-       x1="1178.153"
-       id="linearGradient3774"
-       xlink:href="#linearGradient3768" />
-    <linearGradient
-       id="linearGradient3768">
-      <stop
-         id="stop3770"
-         offset="0"
-         style="stop-color:#cc0000;stop-opacity:1" />
-      <stop
-         id="stop3772"
-         offset="1"
-         style="stop-color:#ef2929;stop-opacity:1" />
+    <linearGradient gradientTransform="matrix(-1,0,0,1,2199.356,0)" gradientUnits="userSpaceOnUse" y2="1190.875" x2="1267.9062" y1="1190.875" x1="901.1875" id="linearGradient3383" xlink:href="#linearGradient3377" />
+    <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" r="194.40614" fy="1424.4465" fx="1103.6399" cy="1424.4465" cx="1103.6399" id="radialGradient6355" xlink:href="#linearGradient6349" />
+    <linearGradient gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)" gradientUnits="userSpaceOnUse" y2="1059.0945" x2="1105.0463" y1="1453.8708" x1="1178.153" id="linearGradient3774" xlink:href="#linearGradient3768" />
+    <linearGradient id="linearGradient3768">
+      <stop id="stop3770" offset="0" style="stop-color:#cc0000;stop-opacity:1" />
+      <stop id="stop3772" offset="1" style="stop-color:#ef2929;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       y2="1059.0945"
-       x2="1105.0463"
-       y1="1453.8708"
-       x1="1178.153"
-       gradientTransform="matrix(0.69497956,0,0,0.78924205,-531.38841,136.64219)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3054-3"
-       xlink:href="#linearGradient3768-5" />
-    <linearGradient
-       id="linearGradient3768-5">
-      <stop
-         id="stop3770-6"
-         offset="0"
-         style="stop-color:#cc0000;stop-opacity:1" />
-      <stop
-         id="stop3772-2"
-         offset="1"
-         style="stop-color:#ef2929;stop-opacity:1" />
+    <linearGradient y2="1059.0945" x2="1105.0463" y1="1453.8708" x1="1178.153" gradientTransform="matrix(0.69497956,0,0,0.78924205,-531.38841,136.64219)" gradientUnits="userSpaceOnUse" id="linearGradient3054-3" xlink:href="#linearGradient3768-5" />
+    <linearGradient id="linearGradient3768-5">
+      <stop id="stop3770-6" offset="0" style="stop-color:#cc0000;stop-opacity:1" />
+      <stop id="stop3772-2" offset="1" style="stop-color:#ef2929;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       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 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
-       xlink:href="#linearGradient3144"
-       id="radialGradient5114"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       xlink:href="#linearGradient3144"
-       id="radialGradient5118"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       xlink:href="#linearGradient3144"
-       id="radialGradient5130"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       xlink:href="#linearGradient3144"
-       id="radialGradient3306"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
-       cx="225.26402"
-       cy="672.79736"
-       fx="225.26402"
-       fy="672.79736"
-       r="34.345188" />
-    <radialGradient
-       xlink:href="#linearGradient3144"
-       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" />
-    <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" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient5114" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient5118" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient5130" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" id="radialGradient3306" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" cx="225.26402" cy="672.79736" fx="225.26402" fy="672.79736" r="34.345188" />
+    <radialGradient xlink:href="#linearGradient3144" 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" />
+    <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
-       id="linearGradient3924">
-      <stop
-         id="stop3926"
-         offset="0"
-         style="stop-color:#ef2929;stop-opacity:1" />
-      <stop
-         id="stop3928"
-         offset="1"
-         style="stop-color:#cc0000;stop-opacity:1" />
+    <linearGradient id="linearGradient3924">
+      <stop id="stop3926" offset="0" style="stop-color:#ef2929;stop-opacity:1" />
+      <stop id="stop3928" offset="1" style="stop-color:#cc0000;stop-opacity:1" />
     </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.2966028,0.17711231,-0.14092861,1.0317094,-32.689929,-29.109274)"
-       r="19.467436"
-       fy="83.989143"
-       fx="147.05713"
-       cy="83.989143"
-       cx="147.05713"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3705"
-       xlink:href="#linearGradient4387" />
-    <linearGradient
-       id="linearGradient4387">
-      <stop
-         id="stop4389"
-         offset="0"
-         style="stop-color:#71b2f8;stop-opacity:1;" />
-      <stop
-         id="stop4391"
-         offset="1"
-         style="stop-color:#002795;stop-opacity:1;" />
+    <radialGradient gradientTransform="matrix(1.2966028,0.17711231,-0.14092861,1.0317094,-32.689929,-29.109274)" r="19.467436" fy="83.989143" fx="147.05713" cy="83.989143" cx="147.05713" gradientUnits="userSpaceOnUse" id="radialGradient3705" xlink:href="#linearGradient4387" />
+    <linearGradient id="linearGradient4387">
+      <stop id="stop4389" offset="0" style="stop-color:#71b2f8;stop-opacity:1" />
+      <stop id="stop4391" offset="1" style="stop-color:#002795;stop-opacity:1" />
     </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0.52711064,1.8158874,-1.4534843,0.42191331,203.23405,-187.6583)"
-       r="19.467436"
-       fy="93.557289"
-       fx="131.48187"
-       cy="93.557289"
-       cx="131.48187"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient3703"
-       xlink:href="#linearGradient4387" />
-    <radialGradient
-       gradientTransform="translate(-0.23443224,0.23443198)"
-       gradientUnits="userSpaceOnUse"
-       r="19.467436"
-       fy="28.869568"
-       fx="45.883327"
-       cy="28.869568"
-       cx="45.883327"
-       id="radialGradient3692"
-       xlink:href="#linearGradient3377-7" />
-    <linearGradient
-       id="linearGradient3377-7">
-      <stop
-         style="stop-color:#faff2b;stop-opacity:1;"
-         offset="0"
-         id="stop3379-5" />
-      <stop
-         style="stop-color:#ffaa00;stop-opacity:1;"
-         offset="1"
-         id="stop3381-35" />
+    <radialGradient gradientTransform="matrix(0.52711064,1.8158874,-1.4534843,0.42191331,203.23405,-187.6583)" r="19.467436" fy="93.557289" fx="131.48187" cy="93.557289" cx="131.48187" gradientUnits="userSpaceOnUse" id="radialGradient3703" xlink:href="#linearGradient4387" />
+    <radialGradient gradientTransform="translate(-0.23443224,0.23443198)" gradientUnits="userSpaceOnUse" r="19.467436" fy="28.869568" fx="45.883327" cy="28.869568" cx="45.883327" id="radialGradient3692" xlink:href="#linearGradient3377-7" />
+    <linearGradient id="linearGradient3377-7">
+      <stop style="stop-color:#faff2b;stop-opacity:1" offset="0" id="stop3379-5" />
+      <stop style="stop-color:#ffaa00;stop-opacity:1" offset="1" id="stop3381-35" />
     </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient3377-7"
-       id="radialGradient6347"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-0.23443224,0.23443198)"
-       cx="45.883327"
-       cy="28.869568"
-       fx="45.883327"
-       fy="28.869568"
-       r="19.467436" />
-    <radialGradient
-       r="19.467436"
-       fy="28.869568"
-       fx="45.883327"
-       cy="28.869568"
-       cx="45.883327"
-       gradientTransform="matrix(0.67067175,0,0,0.64145918,-63.380792,0.83845403)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6412"
-       xlink:href="#linearGradient3377-7" />
-    <radialGradient
-       r="19.467436"
-       fy="28.869568"
-       fx="45.883327"
-       cy="28.869568"
-       cx="45.883327"
-       gradientTransform="matrix(0.67067175,0,0,0.64145918,-87.325356,-15.679193)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient6412-7"
-       xlink:href="#linearGradient3377-7" />
-    <linearGradient
-       gradientTransform="matrix(11.749278,0,0,11.9004,2701.087,690.16006)"
-       gradientUnits="userSpaceOnUse"
-       y2="34"
-       x2="58"
-       y1="13"
-       x1="43"
-       id="linearGradient3922"
-       xlink:href="#linearGradient3924" />
-    <linearGradient
-       gradientTransform="matrix(11.749278,0,0,11.9004,2701.087,690.16006)"
-       gradientUnits="userSpaceOnUse"
-       y2="34"
-       x2="55"
-       y1="49"
-       x1="43"
-       id="linearGradient3930"
-       xlink:href="#linearGradient3924" />
-    <marker
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="marker4732"
-       style="overflow:visible">
-      <path
-         id="path4734"
-         style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:#00ff08;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+    <radialGradient xlink:href="#linearGradient3377-7" id="radialGradient6347" gradientUnits="userSpaceOnUse" gradientTransform="translate(-0.23443224,0.23443198)" cx="45.883327" cy="28.869568" fx="45.883327" fy="28.869568" r="19.467436" />
+    <radialGradient r="19.467436" fy="28.869568" fx="45.883327" cy="28.869568" cx="45.883327" gradientTransform="matrix(0.67067175,0,0,0.64145918,-63.380792,0.83845403)" gradientUnits="userSpaceOnUse" id="radialGradient6412" xlink:href="#linearGradient3377-7" />
+    <radialGradient r="19.467436" fy="28.869568" fx="45.883327" cy="28.869568" cx="45.883327" gradientTransform="matrix(0.67067175,0,0,0.64145918,-87.325356,-15.679193)" gradientUnits="userSpaceOnUse" id="radialGradient6412-7" xlink:href="#linearGradient3377-7" />
+    <linearGradient gradientTransform="matrix(11.749278,0,0,11.9004,2701.087,690.16006)" gradientUnits="userSpaceOnUse" y2="34" x2="58" y1="13" x1="43" id="linearGradient3922" xlink:href="#linearGradient3924" />
+    <linearGradient gradientTransform="matrix(11.749278,0,0,11.9004,2701.087,690.16006)" gradientUnits="userSpaceOnUse" y2="34" x2="55" y1="49" x1="43" id="linearGradient3930" xlink:href="#linearGradient3924" />
+    <marker orient="auto" refY="0" refX="0" id="marker4732" style="overflow:visible">
+      <path id="path4734" style="fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:#00ff08;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
     </marker>
-    <marker
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow2Lstart"
-       style="overflow:visible">
-      <path
-         id="path4174"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
-         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
-         transform="matrix(1.1,0,0,1.1,1.1,0)" />
+    <marker orient="auto" refY="0" refX="0" id="Arrow2Lstart" style="overflow:visible">
+      <path id="path4174" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1" d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z" transform="matrix(1.1,0,0,1.1,1.1,0)" />
     </marker>
-    <marker
-       orient="auto"
-       refY="0"
-       refX="0"
-       id="Arrow1Lstart"
-       style="overflow:visible">
-      <path
-         id="path4156"
-         d="M 0,0 5,-5 -12.5,0 5,5 0,0 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
-         transform="matrix(0.8,0,0,0.8,10,0)" />
+    <marker orient="auto" refY="0" refX="0" id="Arrow1Lstart" style="overflow:visible">
+      <path id="path4156" d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1" transform="matrix(0.8,0,0,0.8,10,0)" />
     </marker>
-    <radialGradient
-       xlink:href="#linearGradient4067-6"
-       id="radialGradient4081-3"
-       cx="16.481266"
-       cy="23.519165"
-       fx="16.481266"
-       fy="23.519165"
-       r="6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.63761699,0.70479955,-0.91978898,0.75319585,27.605199,-5.8113614)" />
-    <linearGradient
-       id="linearGradient4067-6">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop4069-7" />
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="1"
-         id="stop4071-5" />
+    <radialGradient xlink:href="#linearGradient4067-6" id="radialGradient4081-3" cx="16.481266" cy="23.519165" fx="16.481266" fy="23.519165" r="6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.63761699,0.70479955,-0.91978898,0.75319585,27.605199,-5.8113614)" />
+    <linearGradient id="linearGradient4067-6">
+      <stop style="stop-color:#888a85;stop-opacity:1" offset="0" id="stop4069-7" />
+      <stop style="stop-color:#2e3436;stop-opacity:1" offset="1" id="stop4071-5" />
     </linearGradient>
-    <radialGradient
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355-6"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       xlink:href="#linearGradient3768"
-       id="linearGradient3782"
-       x1="33.052631"
-       y1="73.676765"
-       x2="23.483253"
-       y2="19.131313"
-       gradientUnits="userSpaceOnUse" />
+    <radialGradient xlink:href="#linearGradient6349" id="radialGradient6355-6" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" r="194.40614" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" gradientUnits="userSpaceOnUse" />
+    <linearGradient xlink:href="#linearGradient3768" id="linearGradient3782" x1="33.052631" y1="73.676765" x2="23.483253" y2="19.131313" gradientUnits="userSpaceOnUse" />
   </defs>
-  <metadata
-     id="metadata5826">
+  <metadata id="metadata5826">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title>Sketcher_ReorientSketch</dc:title>
         <dc:creator>
           <cc:Agent>
@@ -406,8 +103,7 @@
             <dc:title>CC-BY-SA 4.0</dc:title>
           </cc:Agent>
         </dc:rights>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/">https://www.gnu.org/copyleft/lesser.html</cc:license>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/">https://www.gnu.org/copyleft/lesser.html</cc:license>
         <dc:contributor>
           <cc:Agent>
             <dc:title>[agryson] Alexander Gryson</dc:title>
@@ -415,155 +111,48 @@
         </dc:contributor>
         <dc:description>A coordinate axis system with three axes (red, blue, green) and three gray planes, next to a red sketch (square and circle). It was created from the 'MergeSketch' and 'Std_CoordinateSystem' icons.</dc:description>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1">
-    <g
-       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)"
-       id="g3360">
-      <g
-         transform="matrix(0.62222324,0,0,0.61432167,842.63789,423.10469)"
-         id="g3047">
-        <rect
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           id="rect3860-3-8"
-           width="187.98842"
-           height="190.40639"
-           x="445.22565"
-           y="1416.0845" />
-        <ellipse
-           ry="95.203201"
-           rx="94.254654"
-           cy="1427.9849"
-           cx="632.95361"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           id="path3862-6-9" />
-        <rect
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ef2929;stroke-width:23.64919472;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           id="rect3860-3-9-7"
-           width="187.9884"
-           height="190.40639"
-           x="445.22565"
-           y="1416.0845" />
-        <ellipse
-           ry="95.203201"
-           rx="94.254654"
-           cy="1427.9849"
-           cx="632.95361"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ef2929;stroke-width:23.64919662;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           id="path3862-6-1-3" />
-        <g
-           id="g3931"
-           transform="matrix(11.749278,0,0,11.9004,1660.2543,896.21458)" />
-        <g
-           style="stroke-width:1.43283892"
-           id="layer1-1"
-           transform="matrix(8.1997341,0,0,8.3057381,42.104442,-7262.9004)">
-          <g
-             id="g4036-9-5"
-             transform="matrix(0.92040759,-0.64428531,1.0101525,0.70710678,-1.7070363,1006.0233)"
-             style="fill:#73d216;fill-opacity:1;stroke:#172a04;stroke-width:2.51176929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-            <g
-               id="g4033-8-3"
-               transform="matrix(0.70857077,0.64561924,-0.7760537,0.70710678,30.848953,1.7173836)"
-               style="fill:#73d216;fill-opacity:1;stroke:#172a04;stroke-width:2.50917339;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-              <rect
-                 style="fill:#73d216;fill-opacity:1;stroke:#172a04;stroke-width:2.50917339;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 id="rect3261-1-56"
-                 width="23"
-                 height="6"
-                 x="-25"
-                 y="-38"
-                 transform="scale(-1)" />
+  <g id="layer1">
+    <g transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)" id="g3360">
+      <g transform="matrix(0.62222324,0,0,0.61432167,842.63789,423.10469)" id="g3047">
+        <rect style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="rect3860-3-8" width="187.98842" height="190.40639" x="445.22565" y="1416.0845" />
+        <ellipse ry="95.203201" rx="94.254654" cy="1427.9849" cx="632.95361" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path3862-6-9" />
+        <rect style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ef2929;stroke-width:23.64919472;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="rect3860-3-9-7" width="187.9884" height="190.40639" x="445.22565" y="1416.0845" />
+        <ellipse ry="95.203201" rx="94.254654" cy="1427.9849" cx="632.95361" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ef2929;stroke-width:23.64919662;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path3862-6-1-3" />
+        <g id="g3931" transform="matrix(11.749278,0,0,11.9004,1660.2543,896.21458)" />
+        <g style="stroke-width:1.43283892" id="layer1-1" transform="matrix(8.1997341,0,0,8.3057381,42.104442,-7262.9004)">
+          <g id="g4036-9-5" transform="matrix(0.92040759,-0.64428531,1.0101525,0.70710678,-1.7070363,1006.0233)" style="fill:#73d216;fill-opacity:1;stroke:#172a04;stroke-width:2.51176929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+            <g id="g4033-8-3" transform="matrix(0.70857077,0.64561924,-0.7760537,0.70710678,30.848953,1.7173836)" style="fill:#73d216;fill-opacity:1;stroke:#172a04;stroke-width:2.50917339;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+              <rect style="fill:#73d216;fill-opacity:1;stroke:#172a04;stroke-width:2.50917339;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3261-1-56" width="23" height="6" x="-25" y="-38" transform="scale(-1)" />
             </g>
           </g>
-          <g
-             id="g4036-9"
-             transform="matrix(-0.64428531,-0.92040759,0.70710678,-1.0101525,13.661154,1054.0993)"
-             style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2.51176929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-            <g
-               id="g4033-8"
-               transform="matrix(0.70857077,0.64561924,-0.7760537,0.70710678,30.848953,1.7173836)"
-               style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2.50917339;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-              <rect
-                 style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2.50917339;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 id="rect3261-1"
-                 width="23"
-                 height="6"
-                 x="-25"
-                 y="-38"
-                 transform="scale(-1)" />
+          <g id="g4036-9" transform="matrix(-0.64428531,-0.92040759,0.70710678,-1.0101525,13.661154,1054.0993)" style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2.51176929;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+            <g id="g4033-8" transform="matrix(0.70857077,0.64561924,-0.7760537,0.70710678,30.848953,1.7173836)" style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2.50917339;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+              <rect style="fill:#3465a4;fill-opacity:1;stroke:#0b1521;stroke-width:2.50917339;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3261-1" width="23" height="6" x="-25" y="-38" transform="scale(-1)" />
             </g>
           </g>
-          <path
-             style="fill:none;stroke:#729fcf;stroke-width:2.86567783;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 28.999999,1020.9348 V 992.93494"
-             id="path4083-0" />
-          <path
-             style="fill:none;fill-opacity:1;stroke:#8ae234;stroke-width:2.86567783;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="m 31.45655,1021.3621 h 28"
-             id="path4083-0-29" />
-          <g
-             id="g4036-9-3"
-             transform="matrix(0.89924477,-0.64428531,0.98692623,0.70710678,-5.6754163,1016.4337)"
-             style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2.54115367;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-            <g
-               id="g4033-8-5"
-               transform="matrix(0.70857077,0.64561924,-0.7760537,0.70710678,30.848953,1.7173836)"
-               style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2.53852701;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-              <rect
-                 style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2.57573986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-                 id="rect3261-1-6"
-                 width="26.344721"
-                 height="5.3929434"
-                 x="12.011514"
-                 y="-22.444706"
-                 transform="matrix(-0.61733264,0.78670224,-0.61733264,-0.78670224,0,0)" />
+          <path style="fill:none;stroke:#729fcf;stroke-width:2.86567783;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 28.999999,1020.9348 V 992.93494" id="path4083-0" />
+          <path style="fill:none;fill-opacity:1;stroke:#8ae234;stroke-width:2.86567783;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 31.45655,1021.3621 h 28" id="path4083-0-29" />
+          <g id="g4036-9-3" transform="matrix(0.89924477,-0.64428531,0.98692623,0.70710678,-5.6754163,1016.4337)" style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2.54115367;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+            <g id="g4033-8-5" transform="matrix(0.70857077,0.64561924,-0.7760537,0.70710678,30.848953,1.7173836)" style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2.53852701;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
+              <rect style="fill:#cc0000;fill-opacity:1;stroke:#280000;stroke-width:2.57573986;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect3261-1-6" width="26.344721" height="5.3929434" x="12.011514" y="-22.444706" transform="matrix(-0.61733264,0.78670224,-0.61733264,-0.78670224,0,0)" />
             </g>
           </g>
-          <path
-             style="fill:none;stroke:#ef2929;stroke-width:2.86567783;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-             d="M 9.4171738,1041.7815 28.718979,1022.4907"
-             id="path4083-0-2" />
-          <circle
-             style="fill:url(#radialGradient4081-3);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.86567926"
-             id="path11841-1"
-             cx="19"
-             cy="26"
-             r="5"
-             transform="translate(11.000001,996.36217)" />
+          <path style="fill:none;stroke:#ef2929;stroke-width:2.86567783;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 9.4171738,1041.7815 28.718979,1022.4907" id="path4083-0-2" />
+          <circle style="fill:url(#radialGradient4081-3);fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.86567926" id="path11841-1" cx="19" cy="26" r="5" transform="translate(11.000001,996.36217)" />
         </g>
-        <rect
-           y="1035.2717"
-           x="374.72995"
-           height="95.203201"
-           width="117.49278"
-           id="rect1969"
-           style="opacity:1;fill:#8f8b85;fill-opacity:1;fill-rule:nonzero;stroke:#202020;stroke-width:11.82459736;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-        <path
-           id="rect1969-0"
-           d="m 104.49656,1166.1761 93.99415,-95.2032 7e-5,119.004 -93.99422,95.2032 z"
-           style="opacity:1;fill:#8f8b85;fill-opacity:1;fill-rule:nonzero;stroke:#202020;stroke-width:11.82459736;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-        <path
-           id="rect1969-0-2"
-           d="m 233.73861,1404.1841 93.99414,-95.2032 h 117.49286 l -93.99422,95.2032 z"
-           style="opacity:1;fill:#8f8b85;fill-opacity:1;fill-rule:nonzero;stroke:#202020;stroke-width:11.82459736;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <rect y="1035.2717" x="374.72995" height="95.203201" width="117.49278" id="rect1969" style="opacity:1;fill:#8f8b85;fill-opacity:1;fill-rule:nonzero;stroke:#202020;stroke-width:11.82459736;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path id="rect1969-0" d="m 104.49656,1166.1761 93.99415,-95.2032 7e-5,119.004 -93.99422,95.2032 z" style="opacity:1;fill:#8f8b85;fill-opacity:1;fill-rule:nonzero;stroke:#202020;stroke-width:11.82459736;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+        <path id="rect1969-0-2" d="m 233.73861,1404.1841 93.99414,-95.2032 h 117.49286 l -93.99422,95.2032 z" style="opacity:1;fill:#8f8b85;fill-opacity:1;fill-rule:nonzero;stroke:#202020;stroke-width:11.82459736;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
       </g>
     </g>
   </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_SwitchVirtualSpace.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_SwitchVirtualSpace.svg
index 2f2da302c7..81ab00fa45 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_SwitchVirtualSpace.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_SwitchVirtualSpace.svg
@@ -1,194 +1,45 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.2 (unknown)"
-   sodipodi:docname="Sketcher_SwitchVirtualSpace.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
-  <defs
-     id="defs5823">
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Mend"
-       style="overflow:visible;">
-      <path
-         id="path4003"
-         style="fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) rotate(180) translate(0,0)" />
+<svg width="64px" height="64px" id="svg5821" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs5823">
+    <marker orient="auto" refY="0.0" refX="0.0" id="Arrow2Mend" style="overflow:visible">
+      <path id="path4003" style="fill-rule:evenodd;stroke-width:0.625;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 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:1pt" transform="scale(0.4) rotate(180) translate(10,0)" />
     </marker>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6349">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6351" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop6353" />
+    <linearGradient id="linearGradient6349">
+      <stop style="stop-color:#000000;stop-opacity:1" offset="0" id="stop6351" />
+      <stop style="stop-color:#000000;stop-opacity:0" offset="1" id="stop6353" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
-         offset="0"
-         id="stop3379" />
-      <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
-         offset="1"
-         id="stop3381" />
+    <linearGradient id="linearGradient3377">
+      <stop style="stop-color:#0019a3;stop-opacity:1" offset="0" id="stop3379" />
+      <stop style="stop-color:#0069ff;stop-opacity:1" offset="1" id="stop3381" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3768"
-       id="linearGradient3774"
-       x1="1178.153"
-       y1="1453.8708"
-       x2="1105.0463"
-       y2="1059.0945"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3768">
-      <stop
-         style="stop-color:#cc0000;stop-opacity:1"
-         offset="0"
-         id="stop3770" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3772" />
+    <linearGradient xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <radialGradient xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" r="194.40614" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 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 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 id="linearGradient3768-5">
+      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770-6" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772-2" />
     </linearGradient>
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.9141802"
-     inkscape:cx="16.81765"
-     inkscape:cy="27.339256"
-     inkscape:current-layer="g3047"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="993"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="true"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3045"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5826">
+  <metadata id="metadata5826">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_MergeSketch</dc:title>
         <dc:date>2014-11-26</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -211,124 +62,26 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g3360"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-       inkscape:export-xdpi="3.2478156"
-       inkscape:export-ydpi="3.2478156"
-       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <g
-         id="g3047"
-         transform="matrix(0.62222324,0,0,0.61432167,842.63789,423.10469)">
-        <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 0 1 30.181818,51.454546 18.181818,18.181818 0 0 1 12,33.272728 18.181818,18.181818 0 0 1 30.181818,15.09091 18.181818,18.181818 0 0 1 48.363636,33.272728 Z"
-           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 0 1 30.181818,51.454546 18.181818,18.181818 0 0 1 12,33.272728 18.181818,18.181818 0 0 1 30.181818,15.09091 18.181818,18.181818 0 0 1 48.363636,33.272728 Z"
-           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:#ffffff;stroke-width:4.53917074;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="1404.1841"
-           x="127.99512"
-           height="190.40639"
-           width="187.98842"
-           id="rect3860-3-8"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-        <ellipse
-           id="path3862-6-9"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           cx="315.72314"
-           cy="1416.0844"
-           rx="94.254654"
-           ry="95.203201" />
-        <rect
-           y="1404.1841"
-           x="127.99512"
-           height="190.40639"
-           width="187.9884"
-           id="rect3860-3-9-7"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:23.64919472;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-        <ellipse
-           id="path3862-6-1-3"
-           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ef2929;stroke-width:23.64919662;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-           cx="315.72314"
-           cy="1416.0844"
-           rx="94.254654"
-           ry="95.203201" />
-        <g
-           id="g4560"
-           transform="matrix(0,1.0128623,-0.98730107,0,1620.0911,929.43105)">
-          <path
-             transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)"
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path3202"
-             d="m 6.9999999,35.000001 c 0,6 0.9999999,8 7.0000001,8"
-             style="fill:none;stroke:#2e3436;stroke-width:6;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 198.49078,1475.5865 v -95.2032 l 70.49567,47.6016 z"
-             id="path3012-6-3"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="cc"
-             transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)"
-             inkscape:connector-curvature="0"
-             id="path4804"
-             d="m 6.9999999,35.000001 c 0,6 0.9999999,8 7.0000001,8"
-             style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+  <g id="layer1">
+    <g id="g3360" transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+      <g id="g3047" transform="matrix(0.62222324,0,0,0.61432167,842.63789,423.10469)">
+        <rect y="1059.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 0 1 30.181818,51.454546 18.181818,18.181818 0 0 1 12,33.272728 18.181818,18.181818 0 0 1 30.181818,15.09091 18.181818,18.181818 0 0 1 48.363636,33.272728 Z" id="path3862-6-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" />
+        <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.64919472;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 0 1 30.181818,51.454546 18.181818,18.181818 0 0 1 12,33.272728 18.181818,18.181818 0 0 1 30.181818,15.09091 18.181818,18.181818 0 0 1 48.363636,33.272728 Z" id="path3862-6-1-8" style="color:#000000;fill:none;stroke:#ffffff;stroke-width:4.53917074;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+        <rect y="1404.1841" x="127.99512" height="190.40639" width="187.98842" id="rect3860-3-8" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+        <ellipse id="path3862-6-9" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a40000;stroke-width:70.94758606;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" cx="315.72314" cy="1416.0844" rx="94.254654" ry="95.203201" />
+        <rect y="1404.1841" x="127.99512" height="190.40639" width="187.9884" id="rect3860-3-9-7" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:23.64919472;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+        <ellipse id="path3862-6-1-3" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ef2929;stroke-width:23.64919662;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" cx="315.72314" cy="1416.0844" rx="94.254654" ry="95.203201" />
+        <g id="g4560" transform="matrix(0,1.0128623,-0.98730107,0,1620.0911,929.43105)">
+          <path transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)" id="path3202" d="m 6.9999999,35.000001 c 0,6 0.9999999,8 7.0000001,8" style="fill:none;stroke:#2e3436;stroke-width:6;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 198.49078,1475.5865 v -95.2032 l 70.49567,47.6016 z" id="path3012-6-3" />
+          <path transform="matrix(11.749278,0,0,11.9004,45.750169,916.26767)" id="path4804" d="m 6.9999999,35.000001 c 0,6 0.9999999,8 7.0000001,8" style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
-        <g
-           id="g4830"
-           transform="matrix(-1,0,0,1,1360.4223,71.402379)">
-          <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 v -95.2032 l 70.49566,47.6016 z"
-             id="path3012-6-3-9"
-             inkscape:connector-curvature="0" />
-          <path
-             sodipodi:nodetypes="cc"
-             inkscape:connector-curvature="0"
-             id="path4804-4"
-             d="m 715.459,1344.6821 c 0,71.4024 11.74928,95.2032 82.24495,95.2032"
-             style="fill:none;stroke:#d3d7cf;stroke-width:23.64919472;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+        <g id="g4830" transform="matrix(-1,0,0,1,1360.4223,71.402379)">
+          <path 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 v -95.2032 l 70.49566,47.6016 z" id="path3012-6-3-9" />
+          <path id="path4804-4" d="m 715.459,1344.6821 c 0,71.4024 11.74928,95.2032 82.24495,95.2032" style="fill:none;stroke:#d3d7cf;stroke-width:23.64919472;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
         </g>
       </g>
     </g>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ValidateSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ValidateSketch.svg
index 8ab8ef821a..f1fed1712c 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ValidateSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ValidateSketch.svg
@@ -1,257 +1,58 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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"
-   width="64px"
-   height="64px"
-   id="svg5821"
-   version="1.1">
-  <title
-     id="title1015">Sketcher_ValidateSketch</title>
-  <defs
-     id="defs5823">
-    <linearGradient
-       id="linearGradient3776">
-      <stop
-         style="stop-color:#cc0000;stop-opacity:1"
-         offset="0"
-         id="stop3778" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3780" />
+<svg width="64px" height="64px" id="svg5821" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <title id="title1015">Sketcher_ValidateSketch</title>
+  <defs id="defs5823">
+    <linearGradient id="linearGradient3776">
+      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3778" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3780" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3768">
-      <stop
-         style="stop-color:#cc0000;stop-opacity:1"
-         offset="0"
-         id="stop3770" />
-      <stop
-         style="stop-color:#ef2929;stop-opacity:1"
-         offset="1"
-         id="stop3772" />
+    <linearGradient id="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
-       id="linearGradient6349">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6351" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop6353" />
+    <linearGradient id="linearGradient6349">
+      <stop style="stop-color:#000000;stop-opacity:1" offset="0" id="stop6351" />
+      <stop style="stop-color:#000000;stop-opacity:0" offset="1" id="stop6353" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
-         offset="0"
-         id="stop3379" />
-      <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
-         offset="1"
-         id="stop3381" />
+    <linearGradient id="linearGradient3377">
+      <stop style="stop-color:#0019a3;stop-opacity:1" offset="0" id="stop3379" />
+      <stop style="stop-color:#0069ff;stop-opacity:1" offset="1" id="stop3381" />
     </linearGradient>
-    <linearGradient
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <radialGradient
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       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
-       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)"
-       xlink:href="#linearGradient3874"
-       id="linearGradient3880"
-       x1="56"
-       y1="47"
-       x2="53"
-       y2="39"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       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 xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <radialGradient xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" r="194.40614" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 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)" xlink:href="#linearGradient3874" id="linearGradient3880" x1="56" y1="47" x2="53" y2="39" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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
-       xlink:href="#linearGradient3866"
-       id="linearGradient3872"
-       x1="35"
-       y1="53"
-       x2="24"
-       y2="9"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       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 xlink:href="#linearGradient3866" id="linearGradient3872" x1="35" y1="53" x2="24" y2="9" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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" />
-    <linearGradient
-       id="linearGradient3774-3">
-      <stop
-         id="stop3776"
-         offset="0"
-         style="stop-color:#4e9a06;stop-opacity:1" />
-      <stop
-         id="stop3778-6"
-         offset="1"
-         style="stop-color:#8ae234;stop-opacity:1" />
+    <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" />
+    <linearGradient id="linearGradient3774-3">
+      <stop id="stop3776" offset="0" style="stop-color:#4e9a06;stop-opacity:1" />
+      <stop id="stop3778-6" offset="1" style="stop-color:#8ae234;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       y2="483.99524"
-       x2="56.319412"
-       y1="453.77875"
-       x1="10.387"
-       gradientTransform="matrix(-0.56091264,-0.498646,0.48035179,-0.58227539,-177.89813,269.15635)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3922-0"
-       xlink:href="#linearGradient3774-3" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="-26"
-       x2="26"
-       y1="-2"
-       x1="30"
-       id="linearGradient3780"
-       xlink:href="#linearGradient3774-3" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       r="194.40614"
-       fy="1424.4465"
-       fx="1103.6399"
-       cy="1424.4465"
-       cx="1103.6399"
-       id="radialGradient6355-0"
-       xlink:href="#linearGradient6349" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       r="194.40614"
-       fy="1424.4465"
-       fx="1103.6399"
-       cy="1424.4465"
-       cx="1103.6399"
-       id="radialGradient6355-7"
-       xlink:href="#linearGradient6349" />
-    <radialGradient
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355-2"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       y2="20.000008"
-       x2="6.000001"
-       y1="38.000008"
-       x1="58"
-       gradientTransform="matrix(0,7.3106737,7.3106737,0,900.34735,985.98777)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1535"
-       xlink:href="#linearGradient3866" />
-    <linearGradient
-       y2="39"
-       x2="53"
-       y1="47"
-       x1="56"
-       gradientTransform="matrix(7.3106737,0,0,7.3106737,841.86203,1044.4732)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1537"
-       xlink:href="#linearGradient3874" />
-    <linearGradient
-       y2="1059.0945"
-       x2="1105.0463"
-       y1="1453.8708"
-       x1="1178.153"
-       gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1539"
-       xlink:href="#linearGradient3768" />
-    <linearGradient
-       y2="19.131313"
-       x2="23.483253"
-       y1="73.676765"
-       x1="33.052631"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1541"
-       xlink:href="#linearGradient3776" />
-    <linearGradient
-       y2="-26"
-       x2="26"
-       y1="-2"
-       x1="30"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1603"
-       xlink:href="#linearGradient3774-3" />
+    <linearGradient y2="483.99524" x2="56.319412" y1="453.77875" x1="10.387" gradientTransform="matrix(-0.56091264,-0.498646,0.48035179,-0.58227539,-177.89813,269.15635)" gradientUnits="userSpaceOnUse" id="linearGradient3922-0" xlink:href="#linearGradient3774-3" />
+    <linearGradient gradientUnits="userSpaceOnUse" y2="-26" x2="26" y1="-2" x1="30" id="linearGradient3780" xlink:href="#linearGradient3774-3" />
+    <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" r="194.40614" fy="1424.4465" fx="1103.6399" cy="1424.4465" cx="1103.6399" id="radialGradient6355-0" xlink:href="#linearGradient6349" />
+    <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" r="194.40614" fy="1424.4465" fx="1103.6399" cy="1424.4465" cx="1103.6399" id="radialGradient6355-7" xlink:href="#linearGradient6349" />
+    <radialGradient xlink:href="#linearGradient6349" id="radialGradient6355-2" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" r="194.40614" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" gradientUnits="userSpaceOnUse" />
+    <linearGradient y2="20.000008" x2="6.000001" y1="38.000008" x1="58" gradientTransform="matrix(0,7.3106737,7.3106737,0,900.34735,985.98777)" gradientUnits="userSpaceOnUse" id="linearGradient1535" xlink:href="#linearGradient3866" />
+    <linearGradient y2="39" x2="53" y1="47" x1="56" gradientTransform="matrix(7.3106737,0,0,7.3106737,841.86203,1044.4732)" gradientUnits="userSpaceOnUse" id="linearGradient1537" xlink:href="#linearGradient3874" />
+    <linearGradient y2="1059.0945" x2="1105.0463" y1="1453.8708" x1="1178.153" gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)" gradientUnits="userSpaceOnUse" id="linearGradient1539" xlink:href="#linearGradient3768" />
+    <linearGradient y2="19.131313" x2="23.483253" y1="73.676765" x1="33.052631" gradientUnits="userSpaceOnUse" id="linearGradient1541" xlink:href="#linearGradient3776" />
+    <linearGradient y2="-26" x2="26" y1="-2" x1="30" gradientUnits="userSpaceOnUse" id="linearGradient1603" xlink:href="#linearGradient3774-3" />
   </defs>
-  <metadata
-     id="metadata5826">
+  <metadata id="metadata5826">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:title>Sketcher_ValidateSketch</dc:title>
         <dc:creator>
           <cc:Agent>
@@ -272,8 +73,7 @@
             <dc:title>FreeCAD CC-BY-SA 4.0</dc:title>
           </cc:Agent>
         </dc:rights>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/">https://www.gnu.org/copyleft/lesser.html</cc:license>
+        <cc:license rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/">https://www.gnu.org/copyleft/lesser.html</cc:license>
         <dc:contributor>
           <cc:Agent>
             <dc:title>[agryson] Alexander Gryson</dc:title>
@@ -281,83 +81,31 @@
         </dc:contributor>
         <dc:description>A white page, with a red sketch (square and circle), and a green circle with a white arrow inside of it. It is composed from the 'NewSketch' icon, and the 'button_valid' icon.</dc:description>
       </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      <cc:License rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires rdf:resource="http://creativecommons.org/ns#ShareAlike" />
       </cc:License>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1-0">
-    <g
-       id="g3360-6"
-       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <path
-         d="M 922.27941,1007.9198 H 1287.813 v 350.9123 l -73.1067,73.1069 H 922.27941 Z"
-         id="rect3005-2"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1535);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <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 H 936.90078 v 394.7763 h 271.22592 l 65.065,-66.5271 z"
-         id="path3096-6" />
-      <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-1"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1537);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:14.26466179;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <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-8" />
-      <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-7"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#3f3f3f;stroke-width:14.26466179;stroke-linecap:butt;stroke-linejoin:round;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:none;stroke:url(#linearGradient1539);stroke-width:29.24269676;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="rect3860-3-9"
-         width="190.077"
-         height="190.07753"
-         x="958.83331"
-         y="1190.6866" />
-      <circle
-         r="18.181818"
-         cy="33.272728"
-         cx="30.181818"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient1541);stroke-width:5.53487444;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-         id="path3862-6-2"
-         transform="matrix(5.4281292,0,0,5.1424383,996.04635,999.19155)" />
+  <g id="layer1-0">
+    <g id="g3360-6" transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
+      <path d="M 922.27941,1007.9198 H 1287.813 v 350.9123 l -73.1067,73.1069 H 922.27941 Z" id="rect3005-2" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1535);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <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 H 936.90078 v 394.7763 h 271.22592 l 65.065,-66.5271 z" id="path3096-6" />
+      <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-1" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient1537);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:14.26466179;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <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-8" />
+      <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-7" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#3f3f3f;stroke-width:14.26466179;stroke-linecap:butt;stroke-linejoin:round;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:none;stroke:url(#linearGradient1539);stroke-width:29.24269676;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="rect3860-3-9" width="190.077" height="190.07753" x="958.83331" y="1190.6866" />
+      <circle r="18.181818" cy="33.272728" cx="30.181818" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient1541);stroke-width:5.53487444;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path3862-6-2" transform="matrix(5.4281292,0,0,5.1424383,996.04635,999.19155)" />
     </g>
   </g>
-  <g
-     style="stroke-width:1.81182051"
-     id="layer1-7"
-     transform="matrix(0.55193112,0,0,0.551931,27.350046,51.820865)">
-    <path
-       style="fill:#3465a4;fill-opacity:1;stroke:#172a04;stroke-width:3.62364101;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4250-0"
-       d="M 9.9782835,-34.857935 A 28.992303,28.993136 89.972578 1 1 54.021443,2.8584493 28.992303,28.993136 89.972578 1 1 9.9782835,-34.857935 Z" />
-    <path
-       style="fill:url(#linearGradient3922-0);fill-opacity:1;stroke:#8ae234;stroke-width:3.62364078;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4250-7-6"
-       d="M 11.490345,-33.556021 A 26.997584,26.999999 89.926009 1 1 52.50579,1.5653637 26.997584,26.999999 89.926009 0 1 11.490345,-33.556021 Z" />
-    <path
-       style="fill:url(#linearGradient1603);fill-opacity:1;stroke:#2e3436;stroke-width:3.62364078;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 15.48076,-21.246576 10.519239,10.519232 21.038474,-21.038464 7.889428,7.889424 L 25.999999,5.0515065 7.5913312,-13.357152 Z"
-       id="path4088-5" />
-    <path
-       style="fill:none;stroke:#ffffff;stroke-width:3.62364101;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 10.410686,-13.350403 15.477822,-18.43004 26,-7.904436 47.031855,-28.952218 52.111492,-23.872581 26,2.238911 Z"
-       id="path3004-9" />
+  <g style="stroke-width:1.81182051" id="layer1-7" transform="matrix(0.55193112,0,0,0.551931,27.350046,51.820865)">
+    <path style="fill:#3465a4;fill-opacity:1;stroke:#172a04;stroke-width:3.62364101;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4250-0" d="M 9.9782835,-34.857935 A 28.992303,28.993136 89.972578 1 1 54.021443,2.8584493 28.992303,28.993136 89.972578 1 1 9.9782835,-34.857935 Z" />
+    <path style="fill:url(#linearGradient3922-0);fill-opacity:1;stroke:#8ae234;stroke-width:3.62364078;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="path4250-7-6" d="M 11.490345,-33.556021 A 26.997584,26.999999 89.926009 1 1 52.50579,1.5653637 26.997584,26.999999 89.926009 0 1 11.490345,-33.556021 Z" />
+    <path style="fill:url(#linearGradient1603);fill-opacity:1;stroke:#2e3436;stroke-width:3.62364078;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 15.48076,-21.246576 10.519239,10.519232 21.038474,-21.038464 7.889428,7.889424 L 25.999999,5.0515065 7.5913312,-13.357152 Z" id="path4088-5" />
+    <path style="fill:none;stroke:#ffffff;stroke-width:3.62364101;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 10.410686,-13.350403 15.477822,-18.43004 26,-7.904436 47.031855,-28.952218 52.111492,-23.872581 26,2.238911 Z" id="path3004-9" />
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ViewSection.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ViewSection.svg
index 9219bba151..a260338703 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ViewSection.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ViewSection.svg
@@ -1,283 +1,56 @@
 <?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="svg3364"
-   sodipodi:version="0.32"
-   inkscape:version="0.92.3 (unknown)"
-   sodipodi:docname="Sketcher_ViewSection.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1">
-  <defs
-     id="defs3366">
-    <linearGradient
-       id="linearGradient3864">
-      <stop
-         id="stop3866"
-         offset="0"
-         style="stop-color:#71b2f8;stop-opacity:1;" />
-      <stop
-         id="stop3868"
-         offset="1"
-         style="stop-color:#002795;stop-opacity:1;" />
+<svg width="64px" height="64px" id="svg3364" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs3366">
+    <linearGradient id="linearGradient3864">
+      <stop id="stop3866" offset="0" style="stop-color:#71b2f8;stop-opacity:1" />
+      <stop id="stop3868" offset="1" style="stop-color:#002795;stop-opacity:1" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="radialGradient2571"
-       gradientUnits="userSpaceOnUse"
-       cx="342.58258"
-       cy="27.256668"
-       fx="342.58258"
-       fy="27.256668"
-       r="19.571428"
-       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-215.02413,-170.90186)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3593"
-       id="radialGradient3352"
-       gradientUnits="userSpaceOnUse"
-       cx="345.28433"
-       cy="15.560534"
-       fx="345.28433"
-       fy="15.560534"
-       r="19.571428"
-       gradientTransform="translate(-0.1767767,-2.6516504)" />
-    <linearGradient
-       id="linearGradient3593">
-      <stop
-         style="stop-color:#c8e0f9;stop-opacity:1;"
-         offset="0"
-         id="stop3595" />
-      <stop
-         style="stop-color:#637dca;stop-opacity:1;"
-         offset="1"
-         id="stop3597" />
+    <radialGradient xlink:href="#linearGradient3864" id="radialGradient2571" gradientUnits="userSpaceOnUse" cx="342.58258" cy="27.256668" fx="342.58258" fy="27.256668" r="19.571428" gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-215.02413,-170.90186)" />
+    <radialGradient xlink:href="#linearGradient3593" id="radialGradient3352" gradientUnits="userSpaceOnUse" cx="345.28433" cy="15.560534" fx="345.28433" fy="15.560534" r="19.571428" gradientTransform="translate(-0.1767767,-2.6516504)" />
+    <linearGradient id="linearGradient3593">
+      <stop style="stop-color:#c8e0f9;stop-opacity:1" offset="0" id="stop3595" />
+      <stop style="stop-color:#637dca;stop-opacity:1" offset="1" id="stop3597" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3593"
-       id="radialGradient3354"
-       gradientUnits="userSpaceOnUse"
-       cx="330.63791"
-       cy="39.962704"
-       fx="330.63791"
-       fy="39.962704"
-       r="19.571428"
-       gradientTransform="translate(-0.1767767,-2.6516504)" />
-    <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="perspective3372" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="radialGradient3369"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-461.81066,-173.06271)"
-       cx="342.58258"
-       cy="27.256668"
-       fx="342.58258"
-       fy="27.256668"
-       r="19.571428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3593"
-       id="radialGradient3372"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)"
-       cx="345.28433"
-       cy="15.560534"
-       fx="345.28433"
-       fy="15.560534"
-       r="19.571428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3593"
-       id="radialGradient3375"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)"
-       cx="330.63791"
-       cy="39.962704"
-       fx="330.63791"
-       fy="39.962704"
-       r="19.571428" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="radialGradient3380"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)"
-       cx="320.44025"
-       cy="113.23357"
-       fx="320.44025"
-       fy="113.23357"
-       r="19.571428" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3864"
-       id="linearGradient3914"
-       x1="6.94525"
-       y1="36.838673"
-       x2="48.691113"
-       y2="36.838673"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0012324,0,0,0.9421773,-4.8699606,-2.3863162)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3794"
-       id="radialGradient3800"
-       cx="1"
-       cy="45"
-       fx="1"
-       fy="45"
-       r="41"
-       gradientTransform="matrix(0.93348213,-2.2905276e-8,0,0.28687573,0.06651751,32.090592)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3794">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3796" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3798" />
+    <radialGradient xlink:href="#linearGradient3593" id="radialGradient3354" gradientUnits="userSpaceOnUse" cx="330.63791" cy="39.962704" fx="330.63791" fy="39.962704" r="19.571428" gradientTransform="translate(-0.1767767,-2.6516504)" />
+    <radialGradient xlink:href="#linearGradient3864" id="radialGradient3369" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.6258409,0.5434973,-8.8819886e-2,0.2656996,-461.81066,-173.06271)" cx="342.58258" cy="27.256668" fx="342.58258" fy="27.256668" r="19.571428" />
+    <radialGradient xlink:href="#linearGradient3593" id="radialGradient3372" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0012324,0,0,0.9421773,-327.50313,-4.3316646)" cx="345.28433" cy="15.560534" fx="345.28433" fy="15.560534" r="19.571428" />
+    <radialGradient xlink:href="#linearGradient3593" id="radialGradient3375" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0012324,0,0,0.9421773,-287.81791,-28.143054)" cx="330.63791" cy="39.962704" fx="330.63791" fy="39.962704" r="19.571428" />
+    <radialGradient xlink:href="#linearGradient3864" id="radialGradient3380" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)" cx="320.44025" cy="113.23357" fx="320.44025" fy="113.23357" r="19.571428" />
+    <linearGradient xlink:href="#linearGradient3864" id="linearGradient3914" x1="6.94525" y1="36.838673" x2="48.691113" y2="36.838673" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0012324,0,0,0.9421773,-4.8699606,-2.3863162)" />
+    <radialGradient xlink:href="#linearGradient3794" id="radialGradient3800" cx="1" cy="45" fx="1" fy="45" r="41" gradientTransform="matrix(0.93348213,-2.2905276e-8,0,0.28687573,0.06651751,32.090592)" gradientUnits="userSpaceOnUse" />
+    <linearGradient id="linearGradient3794">
+      <stop style="stop-color:#000000;stop-opacity:1" offset="0" id="stop3796" />
+      <stop style="stop-color:#000000;stop-opacity:0" offset="1" id="stop3798" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0,-9)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777"
-       id="linearGradient3783"
-       x1="53.896763"
-       y1="51.179787"
-       x2="48"
-       y2="32"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3777">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3779" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop3781" />
+    <linearGradient gradientTransform="translate(0,-9)" xlink:href="#linearGradient3777" id="linearGradient3783" x1="53.896763" y1="51.179787" x2="48" y2="32" gradientUnits="userSpaceOnUse" />
+    <linearGradient id="linearGradient3777">
+      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3779" />
+      <stop style="stop-color:#3465a4;stop-opacity:1" offset="1" id="stop3781" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="translate(22,-17)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3767"
-       id="linearGradient3773"
-       x1="22.116516"
-       y1="55.717518"
-       x2="19"
-       y2="33"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3767">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="0"
-         id="stop3769" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop3771" />
+    <linearGradient gradientTransform="translate(22,-17)" xlink:href="#linearGradient3767" id="linearGradient3773" x1="22.116516" y1="55.717518" x2="19" y2="33" gradientUnits="userSpaceOnUse" />
+    <linearGradient id="linearGradient3767">
+      <stop style="stop-color:#3465a4;stop-opacity:1" offset="0" id="stop3769" />
+      <stop style="stop-color:#729fcf;stop-opacity:1" offset="1" id="stop3771" />
     </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-2,-11)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3777-6"
-       id="linearGradient3783-3"
-       x1="53.896763"
-       y1="51.179787"
-       x2="48"
-       y2="32"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3777-6">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1"
-         offset="0"
-         id="stop3779-7" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop3781-5" />
+    <linearGradient gradientTransform="translate(-2,-11)" xlink:href="#linearGradient3777-6" id="linearGradient3783-3" x1="53.896763" y1="51.179787" x2="48" y2="32" gradientUnits="userSpaceOnUse" />
+    <linearGradient id="linearGradient3777-6">
+      <stop style="stop-color:#204a87;stop-opacity:1" offset="0" id="stop3779-7" />
+      <stop style="stop-color:#3465a4;stop-opacity:1" offset="1" id="stop3781-5" />
     </linearGradient>
-    <linearGradient
-       y2="32"
-       x2="48"
-       y1="51.179787"
-       x1="53.896763"
-       gradientTransform="translate(-24,-13)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3066"
-       xlink:href="#linearGradient3777-6"
-       inkscape:collect="always" />
+    <linearGradient y2="32" x2="48" y1="51.179787" x1="53.896763" gradientTransform="translate(-24,-13)" gradientUnits="userSpaceOnUse" id="linearGradient3066" xlink:href="#linearGradient3777-6" />
   </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="8.5535834"
-     inkscape:cx="42.101568"
-     inkscape:cy="27.197532"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="993"
-     inkscape:window-x="0"
-     inkscape:window-y="28"
-     inkscape:snap-global="true"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3005"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata3369">
+  <metadata id="metadata3369">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Part_Section</dc:title>
         <dc:date>2011-10-10</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -300,114 +73,26 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 7.0000001,5 0,48.691179 44.0000009,6.955882 0,-48.691178 z"
-       id="path3105-9-2"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc"
-       id="path3825"
-       d="m 35,12 22,4 0,26 -22,-4 z"
-       style="fill:url(#linearGradient3773);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 37,14.42772 0.0087,21.919116 18.008671,3.268799 -0.0087,-21.933614 z"
-       id="path3765"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="M 17,46 41,50 57,42 35,38 z"
-       id="path2993-6"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:url(#linearGradient3066);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 35,12 0,26 -18,8 0,-28 z"
-       id="path2995-3"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#3465a4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 19.01243,19.433833 -0.01226,23.535301 14.001105,-6.300993 3.6e-4,-21.867363 z"
-       id="path3775-5"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="M 17,18 41,22 57,16 35,12 z"
-       id="path2993"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:url(#linearGradient3783);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
-       d="m 57,16 0,26 -16,8 0,-28 z"
-       id="path2995"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#3465a4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 43.01243,23.433833 -0.01226,23.535301 12.001105,-6.300993 3.6e-4,-21.867363 z"
-       id="path3775"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <g
-       id="g4582"
-       transform="translate(45.714286,17)">
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3105"
-         d="m -29,10.285714 v 19 L -12.714286,32 V 13 Z"
-         style="fill:none;stroke:#a40000;stroke-width:4.07142878;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3105-2"
-         d="m -29,10.285714 v 19 L -12.714286,32 V 13 Z"
-         style="fill:none;stroke:#ef2929;stroke-width:1.35714281;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+  <g id="layer1">
+    <path style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 7.0000001,5 0,48.691179 44.0000009,6.955882 0,-48.691178 z" id="path3105-9-2" />
+    <path id="path3825" d="m 35,12 22,4 0,26 -22,-4 z" style="fill:url(#linearGradient3773);fill-opacity:1;fill-rule:evenodd;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 37,14.42772 0.0087,21.919116 18.008671,3.268799 -0.0087,-21.933614 z" id="path3765" />
+    <path style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="M 17,46 41,50 57,42 35,38 z" id="path2993-6" />
+    <path style="fill:url(#linearGradient3066);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 35,12 0,26 -18,8 0,-28 z" id="path2995-3" />
+    <path style="fill:none;stroke:#3465a4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 19.01243,19.433833 -0.01226,23.535301 14.001105,-6.300993 3.6e-4,-21.867363 z" id="path3775-5" />
+    <path style="fill:#729fcf;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="M 17,18 41,22 57,16 35,12 z" id="path2993" />
+    <path style="fill:url(#linearGradient3783);fill-opacity:1;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 57,16 0,26 -16,8 0,-28 z" id="path2995" />
+    <path style="fill:none;stroke:#3465a4;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 43.01243,23.433833 -0.01226,23.535301 12.001105,-6.300993 3.6e-4,-21.867363 z" id="path3775" />
+    <g id="g4582" transform="translate(45.714286,17)">
+      <path id="path3105" d="m -29,10.285714 v 19 L -12.714286,32 V 13 Z" style="fill:none;stroke:#a40000;stroke-width:4.07142878;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+      <path id="path3105-2" d="m -29,10.285714 v 19 L -12.714286,32 V 13 Z" style="fill:none;stroke:#ef2929;stroke-width:1.35714281;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
     </g>
-    <path
-       style="opacity:0.4;fill:#729fcf;stroke:none"
-       d="m 8,6 0,47 42,6 0,-46 z m 6,8.3 28,4.7 c 0,0 1.215502,0.908743 1.579227,1.470117 C 43.942951,21.031491 44,22 44,22 l 0,32 -31,-6 z"
-       id="path3105-9"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccczcccc" />
-    <path
-       style="opacity:0.4;fill:none;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 9,7.3005 0,44.725 40,6.375 0,-44.725 z"
-       id="path3105-9-1"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:none;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 51,14 0,32"
-       id="path3966"
-       inkscape:connector-curvature="0" />
-    <g
-       id="g4586"
-       transform="matrix(0.49292731,0.23598882,-0.23598882,0.49292731,1.8366426,-9.9451492)">
-      <ellipse
-         ry="16"
-         rx="19"
-         cy="40"
-         cx="84"
-         id="path3862-7"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a40000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-      <ellipse
-         ry="16"
-         rx="19"
-         cy="40"
-         cx="84"
-         id="path3862-6"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+    <path style="opacity:0.4;fill:#729fcf;stroke:none" d="m 8,6 0,47 42,6 0,-46 z m 6,8.3 28,4.7 c 0,0 1.215502,0.908743 1.579227,1.470117 C 43.942951,21.031491 44,22 44,22 l 0,32 -31,-6 z" id="path3105-9" />
+    <path style="opacity:0.4;fill:none;stroke:#729fcf;stroke-width:1.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 9,7.3005 0,44.725 40,6.375 0,-44.725 z" id="path3105-9-1" />
+    <path style="fill:none;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 51,14 0,32" id="path3966" />
+    <g id="g4586" transform="matrix(0.49292731,0.23598882,-0.23598882,0.49292731,1.8366426,-9.9451492)">
+      <ellipse ry="16" rx="19" cy="40" cx="84" id="path3862-7" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#a40000;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+      <ellipse ry="16" rx="19" cy="40" cx="84" id="path3862-6" style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ef2929;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
     </g>
   </g>
 </svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ViewSketch.svg b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ViewSketch.svg
index bf13e80779..dc451ff250 100644
--- a/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ViewSketch.svg
+++ b/src/Mod/Sketcher/Gui/Resources/icons/general/Sketcher_ViewSketch.svg
@@ -1,243 +1,55 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg5821"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Sketcher_ViewSketch.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
-   inkscape:export-xdpi="45"
-   inkscape:export-ydpi="45">
-  <defs
-     id="defs5823">
-    <linearGradient
-       inkscape:collect="always"
-       id="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" />
+<svg width="64px" height="64px" id="svg5821" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs id="defs5823">
+    <linearGradient 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 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 id="linearGradient3768">
+      <stop style="stop-color:#cc0000;stop-opacity:1" offset="0" id="stop3770" />
+      <stop style="stop-color:#ef2929;stop-opacity:1" offset="1" id="stop3772" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6349">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop6351" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop6353" />
+    <linearGradient id="linearGradient6349">
+      <stop style="stop-color:#000000;stop-opacity:1" offset="0" id="stop6351" />
+      <stop style="stop-color:#000000;stop-opacity:0" offset="1" id="stop6353" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient3377">
-      <stop
-         style="stop-color:#0019a3;stop-opacity:1;"
-         offset="0"
-         id="stop3379" />
-      <stop
-         style="stop-color:#0069ff;stop-opacity:1;"
-         offset="1"
-         id="stop3381" />
+    <linearGradient id="linearGradient3377">
+      <stop style="stop-color:#0019a3;stop-opacity:1" offset="0" id="stop3379" />
+      <stop style="stop-color:#0069ff;stop-opacity:1" offset="1" id="stop3381" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3377"
-       id="linearGradient3383"
-       x1="901.1875"
-       y1="1190.875"
-       x2="1267.9062"
-       y2="1190.875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
-       inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective5829" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6349"
-       id="radialGradient6355"
-       cx="1103.6399"
-       cy="1424.4465"
-       fx="1103.6399"
-       fy="1424.4465"
-       r="194.40614"
-       gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3768"
-       id="linearGradient3774"
-       x1="1178.153"
-       y1="1453.8708"
-       x2="1105.0463"
-       y2="1059.0945"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.70270076,0,0,0.78787889,315.88365,269.84952)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3776"
-       id="linearGradient3782"
-       x1="33.052631"
-       y1="73.676765"
-       x2="23.483253"
-       y2="19.131313"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       gradientTransform="matrix(7.3106737,0,0,7.3106737,841.86203,1044.4732)"
-       inkscape:collect="always"
-       xlink:href="#linearGradient3874"
-       id="linearGradient3880"
-       x1="56"
-       y1="47"
-       x2="53"
-       y2="39"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3874">
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="0"
-         id="stop3876" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="1"
-         id="stop3878" />
+    <linearGradient xlink:href="#linearGradient3377" id="linearGradient3383" x1="901.1875" y1="1190.875" x2="1267.9062" y2="1190.875" gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
+    <radialGradient xlink:href="#linearGradient6349" id="radialGradient6355" cx="1103.6399" cy="1424.4465" fx="1103.6399" fy="1424.4465" r="194.40614" gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 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)" xlink:href="#linearGradient3874" id="linearGradient3880" x1="56" y1="47" x2="53" y2="39" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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 xlink:href="#linearGradient3866" id="linearGradient3872" x1="35" y1="53" x2="24" y2="9" gradientUnits="userSpaceOnUse" />
+    <linearGradient 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" />
-    <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)" />
+    <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" />
+    <radialGradient 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"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.0380072"
-     inkscape:cx="34.349829"
-     inkscape:cy="15.715745"
-     inkscape:current-layer="g3360"
-     showgrid="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="873"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:snap-bbox="false"
-     inkscape:snap-nodes="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2997"
-       empspacing="2"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata5826">
+  <metadata id="metadata5826">
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about="">
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <dc:creator>
           <cc:Agent>
             <dc:title>[wmayer]</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:title>Sketcher_ViewSketch</dc:title>
         <dc:date>2012-12-03</dc:date>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:publisher>
@@ -260,94 +72,19 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g3360"
-       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
-       inkscape:export-xdpi="3.2478156"
-       inkscape:export-ydpi="3.2478156"
-       transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
-      <path
-         d="m 922.27941,1007.9198 365.53359,0 0,350.9123 -73.1067,73.1069 -292.42689,0 z"
-         id="rect3005"
-         style="color:#000000;fill:url(#linearGradient3127);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         style="fill:none;stroke:#ffffff;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1273.1917,1022.5412 -336.29092,0 0,394.7763 271.22592,0 65.065,-66.5271 z"
-         id="path3096"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         d="m 1287.8132,1358.8322 c 0,-7.3107 -29.2428,-29.2427 -58.4855,-29.2427 0,0 14.6213,73.1067 -14.6214,102.3494 z"
-         id="path3778"
-         style="color:#000000;fill:url(#linearGradient3880);fill-opacity:1;fill-rule:evenodd;stroke:#3f3f3f;stroke-width:14.26466179;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <path
-         style="fill:none;stroke:#babdb6;stroke-width:14.62134743;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 1229.9528,1396.295 48.6777,-47.1803"
-         id="path3125"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cc" />
-      <path
-         d="m 1287.8132,1358.8322 c 0,-7.3107 -29.2428,-29.2427 -58.4855,-29.2427 0,0 14.6213,73.1067 -14.6214,102.3494 z"
-         id="path3778-3"
-         style="color:#000000;fill:none;stroke:#3f3f3f;stroke-width:14.26466179;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <rect
-         style="color:#000000;fill:none;stroke:url(#linearGradient3774);stroke-width:29.24269676;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect3860-3"
-         width="190.077"
-         height="190.07753"
-         x="958.83331"
-         y="1190.6866" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;stroke:url(#linearGradient3782);stroke-width:5.53487444;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path3862-6"
-         sodipodi:cx="30.181818"
-         sodipodi:cy="33.272728"
-         sodipodi:rx="18.181818"
-         sodipodi:ry="18.181818"
-         d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
-         transform="matrix(5.4281292,0,0,5.1424383,996.04635,999.19155)" />
-      <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="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 C 59,50.851275 53.851275,56 47.5,56 41.148725,56 36,50.851275 36,44.5 36,38.148725 41.148725,33 47.5,33 53.851275,33 59,38.148725 59,44.5 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 C 59,50.851275 53.851275,56 47.5,56 41.148725,56 36,50.851275 36,44.5 36,38.148725 41.148725,33 47.5,33 53.851275,33 59,38.148725 59,44.5 z"
-         transform="matrix(6.3571078,0,0,6.3571075,868.87971,988.21276)" />
+  <g id="layer1">
+    <g id="g3360" 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" />
+      <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" />
+      <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" />
+      <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" />
+      <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" />
+      <rect style="color:#000000;fill:none;stroke:url(#linearGradient3774);stroke-width:29.24269676;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect3860-3" width="190.077" height="190.07753" x="958.83331" y="1190.6866" />
+      <path 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" d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z" transform="matrix(5.4281292,0,0,5.1424383,996.04635,999.19155)" />
+      <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" />
+      <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" />
+      <path style="fill:url(#radialGradient3863);stroke:#042a2a;stroke-width:1.91666663;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04;fill-opacity:1" id="path3055" d="M 59,44.5 C 59,50.851275 53.851275,56 47.5,56 41.148725,56 36,50.851275 36,44.5 36,38.148725 41.148725,33 47.5,33 53.851275,33 59,38.148725 59,44.5 z" transform="matrix(7.6285292,0,0,7.6285292,808.48719,931.6345)" />
+      <path style="fill:none;stroke:#34e0e2;stroke-width:2.29999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:2.04" id="path3055-1" d="M 59,44.5 C 59,50.851275 53.851275,56 47.5,56 41.148725,56 36,50.851275 36,44.5 36,38.148725 41.148725,33 47.5,33 53.851275,33 59,38.148725 59,44.5 z" transform="matrix(6.3571078,0,0,6.3571075,868.87971,988.21276)" />
     </g>
   </g>
 </svg>