diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc
index d9ad908cbc..3d2b3165f0 100755
--- a/src/Mod/Fem/Gui/Resources/Fem.qrc
+++ b/src/Mod/Fem/Gui/Resources/Fem.qrc
@@ -27,7 +27,7 @@
         <file>icons/fem-constraint-transform.svg</file>
         <file>icons/fem-control-solver.svg</file>
         <file>icons/fem-cylinder.svg</file>
-        <file>icons/fem-data.png</file>
+        <file>icons/fem-data.svg</file>
         <file>icons/fem-femmesh-clear-mesh.svg</file>
         <file>icons/fem-femmesh-create-node-by-poly.svg</file>
         <file>icons/fem-femmesh-from-shape.svg</file>
@@ -53,12 +53,12 @@
         <file>icons/fem-static-analysis.svg</file>
         <file>icons/fem-thermomechanical-analysis.svg</file>
 
-        <file>icons/fem-clip.png</file>
-        <file>icons/fem-DataAlongLine.png</file>
-        <file>icons/fem-clip-scalar.png</file>
-        <file>icons/fem-cut.png</file>
-        <file>icons/fem-isosurface.png</file>
-        <file>icons/fem-warp.png</file>
+        <file>icons/fem-clip.svg</file>
+        <file>icons/fem-DataAlongLine.svg</file>
+        <file>icons/fem-clip-scalar.svg</file>
+        <file>icons/fem-cut.svg</file>
+        <file>icons/fem-isosurface.svg</file>
+        <file>icons/fem-warp.svg</file>
 
         <file>translations/Fem_af.qm</file>
         <file>translations/Fem_de.qm</file>
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-DataAlongLine.png b/src/Mod/Fem/Gui/Resources/icons/fem-DataAlongLine.png
deleted file mode 100644
index e9b4551b76..0000000000
Binary files a/src/Mod/Fem/Gui/Resources/icons/fem-DataAlongLine.png and /dev/null differ
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-DataAlongLine.svg b/src/Mod/Fem/Gui/Resources/icons/fem-DataAlongLine.svg
new file mode 100644
index 0000000000..8bc58d7285
--- /dev/null
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-DataAlongLine.svg
@@ -0,0 +1,144 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="32.478812"
+     inkscape:cy="29.015136"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <path
+       style="fill:#8ae234;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+       d="M 49,61 60,23 9,9 5,58 z"
+       id="path2987"
+       inkscape:connector-curvature="0"
+       transform="translate(0,988.36218)"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 9,54.99996 55,22.99998"
+       id="path3757"
+       inkscape:connector-curvature="0"
+       transform="translate(0,988.36218)"
+       sodipodi:nodetypes="cc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#729fcf;fill-opacity:1;stroke:#0b1521;stroke-width:1.83333349;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.6"
+       id="path4221-6"
+       sodipodi:cx="6.5"
+       sodipodi:cy="57.5"
+       sodipodi:rx="5.5"
+       sodipodi:ry="5.5"
+       d="m 12,57.5 a 5.5,5.5 0 1 1 -11,0 5.5,5.5 0 1 1 11,0 z"
+       transform="matrix(1.0909091,0,0,1.0909088,47.909091,948.63493)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#729fcf;fill-opacity:1;stroke:#0b1521;stroke-width:1.83333349;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.6"
+       id="path4221-6-7"
+       sodipodi:cx="6.5"
+       sodipodi:cy="57.5"
+       sodipodi:rx="5.5"
+       sodipodi:ry="5.5"
+       d="m 12,57.5 a 5.5,5.5 0 1 1 -11,0 5.5,5.5 0 1 1 11,0 z"
+       transform="matrix(1.0909091,0,0,1.0909088,1.9090908,980.63493)" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 9,1043.3622 46,-32"
+       id="path3757-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#0b1521;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 8,44 2,-7 6,3 -2,-11 11,9 -6,-15 12,11 -6,-13 10,8 -3,-10 8,5 -1,-5 4,0"
+       id="path4300"
+       inkscape:connector-curvature="0"
+       transform="translate(0,988.36218)"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;stroke:#729fcf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="m 8,1032.3622 2,-7 6,3 -2,-11 11,9 -6,-15 12,11 -6,-13 10,8 -3,-10 8,5 -1,-5 4,0"
+       id="path4300-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccc" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 13,52 5,40"
+       id="path4259"
+       inkscape:connector-curvature="0"
+       transform="translate(0,988.36218)"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,1040.3622 -8,-12"
+       id="path4259-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 50,1014.3622 -8,-12"
+       id="path4259-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 50,1014.3622 -8,-12"
+       id="path4259-5-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-clip-scalar.png b/src/Mod/Fem/Gui/Resources/icons/fem-clip-scalar.png
deleted file mode 100644
index d12421a007..0000000000
Binary files a/src/Mod/Fem/Gui/Resources/icons/fem-clip-scalar.png and /dev/null differ
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-clip-scalar.svg b/src/Mod/Fem/Gui/Resources/icons/fem-clip-scalar.svg
new file mode 100644
index 0000000000..2823aa0b37
--- /dev/null
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-clip-scalar.svg
@@ -0,0 +1,198 @@
+<?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"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="64"
+   height="64"
+   sodipodi:docname="fem-clip-scalar.png">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3826">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop3828" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3830" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3816">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3818" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3820" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="linearGradient3841"
+       gradientUnits="userSpaceOnUse"
+       x1="95"
+       y1="47"
+       x2="91"
+       y2="15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3843"
+       gradientUnits="userSpaceOnUse"
+       x1="120"
+       y1="46"
+       x2="109"
+       y2="15" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="9.8333332"
+     inkscape:cx="37.836305"
+     inkscape:cy="19.281449"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2987"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px" />
+  </sodipodi:namedview>
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 51,45 8,2"
+     id="path3845"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 50.81276,44.789004 8,2"
+     id="path3845-5"
+     inkscape:connector-curvature="0" />
+  <g
+     id="g3834"
+     transform="translate(-80,0)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3808"
+       d="M 104,58 90,13 83,11 83,49 z"
+       style="fill:url(#linearGradient3841);fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3810"
+       d="m 83,11 26,-8 8,1 -27,9 z"
+       style="fill:#8ae234;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3812"
+       d="M 117,4 131,45 104,56 90,13 z"
+       style="fill:url(#linearGradient3843);fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3814"
+       d="M 85,13.712363 85,47.74159 101.46741,54.557296 88.19775,14.53259 z"
+       style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3824"
+       d="m 92.26271,14.491525 13.38136,38.70339 23.14407,-9.483051 -13.43221,-37.194915 z"
+       style="fill:none;stroke:#73d216;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 12,14 31,19 59,11 37,6"
+     id="path2989"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 24,56 7,3 0,-40"
+     id="path2991"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="M 31,19 31,59 59,47 59,11 z"
+     id="path2993"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 12,14 31,19 59,11 37,6"
+     id="path2989-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 24,56 7,3 0,-40"
+     id="path2991-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="M 31,19 31,59 59,47 59,11 z"
+     id="path2993-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <g
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#d3d7cf;fill-opacity:1;stroke:#2e3436;stroke-width:2.11711788;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;font-family:Sans"
+     id="text3004"
+     transform="matrix(1.4127499,0,0,1.4213041,-27.322273,-27.004583)">
+    <path
+       d="m 60.40625,32.796875 0,3.847656 c -1.497416,-0.716121 -2.910175,-1.249974 -4.238281,-1.601562 -1.328141,-0.351536 -2.610692,-0.527318 -3.847657,-0.527344 -2.148448,2.6e-5 -3.808603,0.416693 -4.980468,1.25 -1.158862,0.833358 -1.738288,2.018252 -1.738282,3.554687 -6e-6,1.289083 0.384108,2.265645 1.152344,2.929688 0.781242,0.65106 2.252594,1.178403 4.414063,1.582031 l 2.382812,0.488281 c 2.942691,0.559912 5.110658,1.549495 6.503906,2.96875 1.406228,1.406263 2.109352,3.294282 2.109375,5.664063 -2.3e-5,2.825526 -0.950543,4.967451 -2.851562,6.425781 -1.888039,1.458334 -4.661474,2.1875 -8.320313,2.1875 -1.380218,0 -2.851571,-0.15625 -4.414062,-0.46875 -1.549485,-0.3125 -3.157557,-0.774739 -4.824219,-1.386719 l 0,-4.0625 c 1.601558,0.898442 3.170567,1.575525 4.707031,2.03125 1.53645,0.455733 3.046865,0.683597 4.53125,0.683594 2.25259,3e-6 3.99087,-0.442705 5.214844,-1.328125 1.22394,-0.885412 1.835919,-2.148431 1.835938,-3.789062 -1.9e-5,-1.432283 -0.442727,-2.552073 -1.328125,-3.359375 -0.872413,-0.80728 -2.311214,-1.412748 -4.316407,-1.816407 l -2.402343,-0.46875 c -2.942717,-0.585923 -5.071621,-1.503891 -6.386719,-2.753906 -1.315107,-1.249982 -1.972659,-2.988262 -1.972656,-5.214844 -3e-6,-2.578101 0.904944,-4.609349 2.714843,-6.09375 1.82291,-1.484346 4.329418,-2.226532 7.519532,-2.226562 1.367173,3e-5 2.760401,0.123727 4.179687,0.371094 1.419253,0.247425 2.871074,0.618518 4.355469,1.113281"
+       style="font-variant:normal;font-stretch:normal;fill:#d3d7cf;stroke:#2e3436;stroke-width:2.11711788;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;font-family:OpenSymbol;-inkscape-font-specification:OpenSymbol"
+       id="path3009"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-clip.png b/src/Mod/Fem/Gui/Resources/icons/fem-clip.png
deleted file mode 100644
index a902df9d7d..0000000000
Binary files a/src/Mod/Fem/Gui/Resources/icons/fem-clip.png and /dev/null differ
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-clip.svg b/src/Mod/Fem/Gui/Resources/icons/fem-clip.svg
new file mode 100644
index 0000000000..0b79182260
--- /dev/null
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-clip.svg
@@ -0,0 +1,186 @@
+<?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"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="64"
+   height="64"
+   sodipodi:docname="fem-clip.png">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3826">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop3828" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3830" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3816">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3818" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3820" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="linearGradient3841"
+       gradientUnits="userSpaceOnUse"
+       x1="95"
+       y1="47"
+       x2="91"
+       y2="15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3843"
+       gradientUnits="userSpaceOnUse"
+       x1="120"
+       y1="46"
+       x2="109"
+       y2="15" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="2.4583333"
+     inkscape:cx="-57.782418"
+     inkscape:cy="54.041588"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2987"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px" />
+  </sodipodi:namedview>
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 51,45 8,2"
+     id="path3845"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 50.81276,44.789004 8,2"
+     id="path3845-5"
+     inkscape:connector-curvature="0" />
+  <g
+     id="g3834"
+     transform="translate(-80,0)">
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3808"
+       d="M 104,58 90,13 83,11 83,49 z"
+       style="fill:url(#linearGradient3841);fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3810"
+       d="m 83,11 26,-8 8,1 -27,9 z"
+       style="fill:#8ae234;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3812"
+       d="M 117,4 131,45 104,56 90,13 z"
+       style="fill:url(#linearGradient3843);fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3814"
+       d="M 85,13.712363 85,47.74159 101.46741,54.557296 88.19775,14.53259 z"
+       style="fill:none;stroke:#8ae234;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3824"
+       d="m 92.26271,14.491525 13.38136,38.70339 23.14407,-9.483051 -13.43221,-37.194915 z"
+       style="fill:none;stroke:#73d216;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 12,14 31,19 59,11 37,6"
+     id="path2989"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 24,56 7,3 0,-40"
+     id="path2991"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="M 31,19 31,59 59,47 59,11 z"
+     id="path2993"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 12,14 31,19 59,11 37,6"
+     id="path2989-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 24,56 7,3 0,-40"
+     id="path2991-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="M 31,19 31,59 59,47 59,11 z"
+     id="path2993-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+</svg>
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-cut.png b/src/Mod/Fem/Gui/Resources/icons/fem-cut.png
deleted file mode 100644
index 070ce3bda4..0000000000
Binary files a/src/Mod/Fem/Gui/Resources/icons/fem-cut.png and /dev/null differ
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-cut.svg b/src/Mod/Fem/Gui/Resources/icons/fem-cut.svg
new file mode 100644
index 0000000000..6eb5f3dc79
--- /dev/null
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-cut.svg
@@ -0,0 +1,185 @@
+<?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"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   width="64"
+   height="64"
+   sodipodi:docname="fem-cut.svg">
+  <metadata
+     id="metadata8">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3826">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1;"
+         offset="0"
+         id="stop3828" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3830" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3816">
+      <stop
+         style="stop-color:#73d216;stop-opacity:1;"
+         offset="0"
+         id="stop3818" />
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="1"
+         id="stop3820" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3816"
+       id="linearGradient3841"
+       gradientUnits="userSpaceOnUse"
+       x1="95"
+       y1="47"
+       x2="91"
+       y2="15" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3826"
+       id="linearGradient3843"
+       gradientUnits="userSpaceOnUse"
+       x1="120"
+       y1="46"
+       x2="109"
+       y2="15" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     id="namedview4"
+     showgrid="true"
+     inkscape:zoom="9.8333332"
+     inkscape:cx="33.171143"
+     inkscape:cy="32.391322"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2987"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px" />
+  </sodipodi:namedview>
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="M 5,13 5,53 33,41 33,5 z"
+     id="path2993-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 5,53 26,6 0,-40"
+     id="path2991"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 51,45 8,2"
+     id="path3845"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 50.81276,44.789004 8,2"
+     id="path3845-5"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="M 5,13 5,53 33,41 33,5 z"
+     id="path2993-7-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <g
+     id="g3834"
+     transform="translate(-80,0)">
+    <path
+       inkscape:connector-curvature="0"
+       id="path3812"
+       d="M 119,5 131,45 104,56 90,14 z"
+       style="fill:url(#linearGradient3843);fill-opacity:1;stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="path3824"
+       d="m 92.26271,15.491525 13.38136,37.70339 23.14407,-9.483051 -11.43221,-36.194915 z"
+       style="fill:none;stroke:#73d216;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 5,13 31,19 59,11 33,5"
+     id="path2989"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#2e3436;stroke-width:6;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="M 31,19 31,59 59,47 59,11 z"
+     id="path2993"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 5,13 31,19 59,11 33,5"
+     id="path2989-3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="cccc" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="m 5,53 26,6 0,-40"
+     id="path2991-6"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1"
+     d="M 31,19 31,59 59,47 59,11 z"
+     id="path2993-7"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     style="fill:none;stroke:#d3d7cf;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+     d="M 5,17 5,13 33,5 59,11"
+     id="path3044"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-data.png b/src/Mod/Fem/Gui/Resources/icons/fem-data.png
deleted file mode 100644
index 655bf83742..0000000000
Binary files a/src/Mod/Fem/Gui/Resources/icons/fem-data.png and /dev/null differ
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-data.svg b/src/Mod/Fem/Gui/Resources/icons/fem-data.svg
new file mode 100644
index 0000000000..521f4a7d4a
--- /dev/null
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-data.svg
@@ -0,0 +1,185 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11.2"
+     inkscape:cx="37.69975"
+     inkscape:cy="32.557457"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       color="#ff0000"
+       opacity="0.1254902"
+       empcolor="#ff0000"
+       empopacity="0.25098039"
+       spacingx="8px"
+       spacingy="8px" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid2987"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <rect
+       style="fill:#8ae234;fill-opacity:1;stroke:none;stroke-width:1.99999988000000006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.59999999999999964"
+       id="rect3953"
+       width="48"
+       height="46.999996"
+       x="8"
+       y="997.36218" />
+    <g
+       id="g3784"
+       transform="matrix(0.96424011,0,0,0.96551654,0.21711293,35.185622)"
+       style="stroke-width:4">
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2989"
+         d="m 8.0715239,991.36216 0,58.00004"
+         style="fill:none;stroke:#172a04;stroke-width:4.14560127;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2989-3"
+         d="m 32.96159,991.36216 0,58.00004"
+         style="fill:none;stroke:#172a04;stroke-width:4.14560127;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path2989-6"
+         d="m 58,991.36216 -0.148344,58.00004"
+         style="fill:none;stroke:#172a04;stroke-width:4.14560127;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <path
+       style="fill:none;stroke:#172a04;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4,1044.3622 56,0"
+       id="path2989-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#172a04;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4,1020.3622 56,0"
+       id="path2989-3-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;stroke:#172a04;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 4,996.36218 56,0"
+       id="path2989-6-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <rect
+       style="fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.59999999999999964"
+       id="rect3880"
+       width="18"
+       height="18"
+       x="11"
+       y="11"
+       transform="translate(0,988.36218)" />
+    <rect
+       style="fill:#73d216;fill-opacity:1;stroke:#4e9a06;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.59999999999999964"
+       id="rect3893"
+       width="2"
+       height="2"
+       x="13"
+       y="25"
+       transform="translate(0,988.36218)" />
+    <rect
+       style="fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.6"
+       id="rect3880-1"
+       width="18"
+       height="18"
+       x="35"
+       y="999.36218" />
+    <rect
+       style="fill:#73d216;fill-opacity:1;stroke:#4e9a06;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.6"
+       id="rect3893-2"
+       width="2"
+       height="2"
+       x="37"
+       y="1013.3622" />
+    <rect
+       style="fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.6"
+       id="rect3880-7"
+       width="18"
+       height="18"
+       x="35"
+       y="1023.3622" />
+    <rect
+       style="fill:#73d216;fill-opacity:1;stroke:#4e9a06;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.6"
+       id="rect3893-0"
+       width="2"
+       height="2"
+       x="37"
+       y="1037.3622" />
+    <rect
+       style="fill:#73d216;fill-opacity:1;stroke:#8ae234;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.6"
+       id="rect3880-9"
+       width="18"
+       height="18"
+       x="11"
+       y="1023.3622" />
+    <rect
+       style="fill:#73d216;fill-opacity:1;stroke:#4e9a06;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.6"
+       id="rect3893-3"
+       width="2"
+       height="2"
+       x="13"
+       y="1037.3622" />
+  </g>
+</svg>
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-isosurface.png b/src/Mod/Fem/Gui/Resources/icons/fem-isosurface.png
deleted file mode 100644
index 825222cf6a..0000000000
Binary files a/src/Mod/Fem/Gui/Resources/icons/fem-isosurface.png and /dev/null differ
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-isosurface.svg b/src/Mod/Fem/Gui/Resources/icons/fem-isosurface.svg
new file mode 100644
index 0000000000..8f82a61b5d
--- /dev/null
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-isosurface.svg
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3858"
+       inkscape:collect="always">
+      <stop
+         id="stop3860"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1" />
+      <stop
+         id="stop3862"
+         offset="1"
+         style="stop-color:#204a87;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3852"
+       inkscape:collect="always">
+      <stop
+         id="stop3854"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1" />
+      <stop
+         id="stop3856"
+         offset="1"
+         style="stop-color:#204a87;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3787">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0"
+         id="stop3789" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1"
+         id="stop3791" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3777">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0"
+         id="stop3779" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1"
+         id="stop3781" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3777"
+       id="radialGradient3785"
+       cx="34.167259"
+       cy="39.332615"
+       fx="34.167259"
+       fy="39.332615"
+       r="27.799935"
+       gradientTransform="matrix(0.77177963,-0.06681083,0.06037751,0.77356601,7.8286243,8.2003145)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3787"
+       id="radialGradient3793"
+       cx="29"
+       cy="7.0657806"
+       fx="29"
+       fy="7.0657806"
+       r="28.427937"
+       gradientTransform="matrix(1.6533033,0.42211997,-0.23719203,0.92900212,-17.269848,-10.805604)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3787-6"
+       id="radialGradient3793-5"
+       cx="29"
+       cy="7.0657806"
+       fx="29"
+       fy="7.0657806"
+       r="28.427937"
+       gradientTransform="matrix(1.6533033,0.42211997,-0.23719203,0.92900212,-17.269848,-10.805604)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3787-6">
+      <stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0"
+         id="stop3789-2" />
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1"
+         id="stop3791-9" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3858"
+       id="radialGradient3848"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.6533033,0.42211997,-0.23719203,0.92900212,-113.26985,965.55658)"
+       cx="29"
+       cy="7.0657806"
+       fx="29"
+       fy="7.0657806"
+       r="28.427937" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3852"
+       id="radialGradient3850"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.77177963,-0.06681083,0.06037751,0.77356601,7.8286243,8.2003145)"
+       cx="34.167259"
+       cy="39.332615"
+       fx="34.167259"
+       fy="39.332615"
+       r="27.799934" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3852-0"
+       id="radialGradient3850-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.77177963,-0.06681083,0.06037751,0.77356601,7.8286243,8.2003145)"
+       cx="34.167259"
+       cy="39.332615"
+       fx="34.167259"
+       fy="39.332615"
+       r="27.799934" />
+    <linearGradient
+       id="linearGradient3852-0"
+       inkscape:collect="always">
+      <stop
+         id="stop3854-9"
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1" />
+      <stop
+         id="stop3856-3"
+         offset="1"
+         style="stop-color:#204a87;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       r="27.799934"
+       fy="39.332615"
+       fx="34.167259"
+       cy="39.332615"
+       cx="34.167259"
+       gradientTransform="matrix(0.77177963,-0.06681083,0.06037751,0.77356601,7.8286243,8.2003145)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3879"
+       xlink:href="#linearGradient3852-0"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="-36.729831"
+     inkscape:cy="35.000674"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:snap-bbox="false"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-global="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <path
+       style="fill:url(#radialGradient3793);stroke:#172a04;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 6,11.291997 C 38,-11.708003 74.047351,20 56.047351,56"
+       id="path2989"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       transform="translate(0,988.36218)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:url(#radialGradient3785);fill-opacity:1;stroke:#172a04;stroke-width:1.59986948999999967;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.59999999999999964"
+       id="path2987"
+       sodipodi:cx="37"
+       sodipodi:cy="29"
+       sodipodi:rx="27"
+       sodipodi:ry="13"
+       d="m 64,29 a 27,13 0 1 1 -54,0 27,13 0 1 1 54,0 z"
+       transform="matrix(0.90079433,0.86743157,-0.90079433,0.86743157,22.793645,966.1117)" />
+    <g
+       id="g3844"
+       transform="matrix(0.66387713,0,0,0.66387713,74.52365,351.00053)"
+       style="stroke:#0b1521;stroke-width:1">
+      <path
+         sodipodi:nodetypes="cssc"
+         inkscape:connector-curvature="0"
+         id="path2989-1"
+         d="m -90,987.65418 c 6.386431,-4.59025 15.711388,-9.10456 21.427597,-6.50628 16.569331,7.53151 22.594543,15.06303 33.138662,31.6324 3.041522,4.7795 -1.380909,13.3059 -4.518908,19.5819"
+         style="fill:url(#radialGradient3848);fill-opacity:1;stroke:#0b1521;stroke-width:3.01260567;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         transform="matrix(0.90079433,0.86743157,-0.90079433,0.86743157,-73.206355,954.11171)"
+         d="M 64,29 C 64,36.179702 51.911688,42 37,42 22.088312,42 10,36.179702 10,29 10,21.820298 22.088312,16 37,16 c 14.911688,0 27,5.820298 27,13 z"
+         sodipodi:ry="13"
+         sodipodi:rx="27"
+         sodipodi:cy="29"
+         sodipodi:cx="37"
+         id="path2987-2"
+         style="fill:url(#radialGradient3850);fill-opacity:1;stroke:#0b1521;stroke-width:2.40988803;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.6"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="fill:#204a87;stroke:#0b1521;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 26.842164,25.284105 C 28.309637,24.523832 29.536357,23.436363 34,23 c 3.392916,2.410627 6.607285,5.089072 9,9 0.0041,3.435248 -1.146353,5.492454 -2.315673,7"
+       id="path3898"
+       inkscape:connector-curvature="0"
+       transform="translate(0,988.36218)"
+       sodipodi:nodetypes="cccc" />
+    <path
+       transform="matrix(0.26100056,0.25133387,-0.26100056,0.25133387,31.518988,1004.0415)"
+       d="m 64,29 a 27,13 0 1 1 -54,0 27,13 0 1 1 54,0 z"
+       sodipodi:ry="13"
+       sodipodi:rx="27"
+       sodipodi:cy="29"
+       sodipodi:cx="37"
+       id="path2987-2-6"
+       style="fill:url(#radialGradient3879);fill-opacity:1;stroke:#0b1521;stroke-width:5.52164888;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.6"
+       sodipodi:type="arc" />
+  </g>
+</svg>
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-warp.png b/src/Mod/Fem/Gui/Resources/icons/fem-warp.png
deleted file mode 100644
index b7227d48c8..0000000000
Binary files a/src/Mod/Fem/Gui/Resources/icons/fem-warp.png and /dev/null differ
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-warp.svg b/src/Mod/Fem/Gui/Resources/icons/fem-warp.svg
new file mode 100644
index 0000000000..0a7a836bf3
--- /dev/null
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-warp.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   height="64"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="New document 1">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3802">
+      <stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="0"
+         id="stop3804" />
+      <stop
+         style="stop-color:#73d216;stop-opacity:1"
+         offset="1"
+         id="stop3806" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3802"
+       id="linearGradient3808"
+       x1="49"
+       y1="58"
+       x2="47"
+       y2="42"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7.9195959"
+     inkscape:cx="33.389281"
+     inkscape:cy="36.816418"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="837"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-988.36218)">
+    <rect
+       style="fill:url(#linearGradient3808);stroke:#172a04;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.59999999999999964;fill-opacity:1"
+       id="rect2987"
+       width="58"
+       height="22"
+       x="3"
+       y="39"
+       transform="translate(0,988.36218)" />
+    <rect
+       style="fill:none;stroke:#73d216;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:9.59999999999999964"
+       id="rect2987-6"
+       width="54"
+       height="18"
+       x="5"
+       y="1029.3622" />
+    <path
+       style="fill:#8ae234;stroke:#172a04;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:9.6"
+       d="m 3,1027.3622 c 17,0 46,-23 48,-32 l 0,26 c -4,14 -31,28 -48,28 z"
+       id="rect2987-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+  </g>
+</svg>