diff --git a/src/Mod/Inspection/Gui/Command.cpp b/src/Mod/Inspection/Gui/Command.cpp
index 75915160f..dc6c09e30 100644
--- a/src/Mod/Inspection/Gui/Command.cpp
+++ b/src/Mod/Inspection/Gui/Command.cpp
@@ -77,7 +77,7 @@ CmdInspectElement::CmdInspectElement()
     sToolTipText  = "Get distance information";
     sWhatsThis    = "Inspection_InspectElement";
     sStatusTip    = sToolTipText;
-    sPixmap       = "mesh_pipette";
+    sPixmap       = "inspect_pipette";
 }
 
 void CmdInspectElement::activated(int iMsg)
@@ -89,7 +89,7 @@ void CmdInspectElement::activated(int iMsg)
         viewer->setEditing(true);
         viewer->setRedirectToSceneGraphEnabled(true);
         viewer->setRedirectToSceneGraph(true);
-        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmap("mesh_pipette"),4,29));
+        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmapFromSvg("inspect_pipette",QSize(32,32)),4,29));
         viewer->addEventCallback(SoButtonEvent::getClassTypeId(),
             InspectionGui::ViewProviderInspection::inspectCallback);
      }
diff --git a/src/Mod/Inspection/Gui/Resources/Inspection.qrc b/src/Mod/Inspection/Gui/Resources/Inspection.qrc
index 6b5b3cd48..0a98c5322 100644
--- a/src/Mod/Inspection/Gui/Resources/Inspection.qrc
+++ b/src/Mod/Inspection/Gui/Resources/Inspection.qrc
@@ -1,4 +1,5 @@
-<!DOCTYPE RCC><RCC version="1.0">
+<RCC>
     <qresource> 
+        <file>icons/inspect_pipette.svg</file>
     </qresource>
 </RCC> 
diff --git a/src/Mod/Inspection/Gui/Resources/icons/inspect_pipette.svg b/src/Mod/Inspection/Gui/Resources/icons/inspect_pipette.svg
new file mode 100644
index 000000000..d8e4524ee
--- /dev/null
+++ b/src/Mod/Inspection/Gui/Resources/icons/inspect_pipette.svg
@@ -0,0 +1,113 @@
+<?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.3.1 r9886"
+   sodipodi:docname="pipette.svg"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/main_icons/pipette_32px.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="28.796343"
+       y1="39.303909"
+       x2="22.936319"
+       y2="33.977303"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3769"
+       gradientUnits="userSpaceOnUse"
+       x1="28.796343"
+       y1="39.303909"
+       x2="23.453451"
+       y2="34.596916" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.1953125"
+     inkscape:cx="6.6860156"
+     inkscape:cy="29.015327"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:showpageshadow="false"
+     borderlayer="false"
+     inkscape:snap-global="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="964"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1" />
+  <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)">
+    <g
+       id="g3765"
+       transform="matrix(0.99864903,0.05196261,-0.05196261,0.99864903,48.174955,7.8870736)">
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         transform="translate(0,988.36218)"
+         inkscape:connector-curvature="0"
+         id="path3753"
+         d="m 9.7409699,49.372599 2.8491941,-3.93502 c -1.772756,-1.98964 -1.637691,-3.216153 -1.291299,-4.358134 l 19.208071,-21.54855 c 5.989818,1.898292 9.182121,5.311906 10.007566,10.007567 L 20.822194,50.27995 c -2.710668,1.819219 -3.579088,0.09127 -4.7674,-0.498084 l -3.787455,2.999975 z"
+         style="fill:url(#linearGradient3769);fill-opacity:1;stroke:#000000;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         transform="translate(0,988.36218)"
+         inkscape:connector-curvature="0"
+         id="path3755"
+         d="m 29.054225,19.127365 c 9.162698,3.938983 8.239348,5.048599 12.02522,12.428751 3.235523,3.832459 8.524177,-2.535238 5.437607,-6.045801 C 49.363581,14.305558 56.519343,23.389424 60.440651,18.977722 74.468092,4.0560931 49.580343,-15.271369 37.986546,-1.3051721 33.830088,3.6454628 45.521604,10.422305 33.727728,13.346818 c -4.8537,-3.223384 -8.219062,1.686494 -4.673503,5.780547 z"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp
index 498ac2a41..37a0ec490 100644
--- a/src/Mod/Mesh/Gui/AppMeshGui.cpp
+++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp
@@ -89,7 +89,6 @@ void MeshGuiExport initMeshGui()
 
     // Register icons
     Gui::BitmapFactory().addXPM("mesh_fillhole", mesh_fillhole);
-    Gui::BitmapFactory().addXPM("mesh_pipette", mesh_pipette);
 
     // instantiating the commands
     CreateMeshCommands();
diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp
index 2222f41c0..0deaf01ab 100644
--- a/src/Mod/Mesh/Gui/Command.cpp
+++ b/src/Mod/Mesh/Gui/Command.cpp
@@ -1179,7 +1179,7 @@ void CmdMeshEvaluateFacet::activated(int iMsg)
     if (view) {
         Gui::View3DInventorViewer* viewer = view->getViewer();
         viewer->setEditing(true);
-        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmap("mesh_pipette"),4,29));
+        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmapFromSvg("mesh_pipette",QSize(32,32)),4,29));
         viewer->addEventCallback(SoMouseButtonEvent::getClassTypeId(), MeshGui::ViewProviderMeshFaceSet::faceInfoCallback);
      }
 }
diff --git a/src/Mod/Mesh/Gui/Resources/Mesh.qrc b/src/Mod/Mesh/Gui/Resources/Mesh.qrc
index 60bc2d52c..1e05e521f 100644
--- a/src/Mod/Mesh/Gui/Resources/Mesh.qrc
+++ b/src/Mod/Mesh/Gui/Resources/Mesh.qrc
@@ -2,6 +2,7 @@
     <qresource> 
         <file>icons/mesh_boundary.svg</file>
         <file>icons/mesh_cut.svg</file>
+        <file>icons/mesh_pipette.svg</file>
         <file>icons/Tree_Mesh.svg</file>
         <file>icons/Mesh_Curvature_Plot.svg</file>
         <file>icons/Mesh_Export_Mesh.svg</file>
diff --git a/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg b/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg
new file mode 100644
index 000000000..d8e4524ee
--- /dev/null
+++ b/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg
@@ -0,0 +1,113 @@
+<?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.3.1 r9886"
+   sodipodi:docname="pipette.svg"
+   inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/main_icons/pipette_32px.png"
+   inkscape:export-xdpi="45"
+   inkscape:export-ydpi="45">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3757">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop3759" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop3761" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3763"
+       x1="28.796343"
+       y1="39.303909"
+       x2="22.936319"
+       y2="33.977303"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3757"
+       id="linearGradient3769"
+       gradientUnits="userSpaceOnUse"
+       x1="28.796343"
+       y1="39.303909"
+       x2="23.453451"
+       y2="34.596916" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="6.1953125"
+     inkscape:cx="6.6860156"
+     inkscape:cy="29.015327"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     showborder="true"
+     inkscape:showpageshadow="false"
+     borderlayer="false"
+     inkscape:snap-global="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="964"
+     inkscape:window-x="-2"
+     inkscape:window-y="-3"
+     inkscape:window-maximized="1" />
+  <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)">
+    <g
+       id="g3765"
+       transform="matrix(0.99864903,0.05196261,-0.05196261,0.99864903,48.174955,7.8870736)">
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         transform="translate(0,988.36218)"
+         inkscape:connector-curvature="0"
+         id="path3753"
+         d="m 9.7409699,49.372599 2.8491941,-3.93502 c -1.772756,-1.98964 -1.637691,-3.216153 -1.291299,-4.358134 l 19.208071,-21.54855 c 5.989818,1.898292 9.182121,5.311906 10.007566,10.007567 L 20.822194,50.27995 c -2.710668,1.819219 -3.579088,0.09127 -4.7674,-0.498084 l -3.787455,2.999975 z"
+         style="fill:url(#linearGradient3769);fill-opacity:1;stroke:#000000;stroke-width:1.50000000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         transform="translate(0,988.36218)"
+         inkscape:connector-curvature="0"
+         id="path3755"
+         d="m 29.054225,19.127365 c 9.162698,3.938983 8.239348,5.048599 12.02522,12.428751 3.235523,3.832459 8.524177,-2.535238 5.437607,-6.045801 C 49.363581,14.305558 56.519343,23.389424 60.440651,18.977722 74.468092,4.0560931 49.580343,-15.271369 37.986546,-1.3051721 33.830088,3.6454628 45.521604,10.422305 33.727728,13.346818 c -4.8537,-3.223384 -8.219062,1.686494 -4.673503,5.780547 z"
+         style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/src/Mod/Mesh/Gui/images.h b/src/Mod/Mesh/Gui/images.h
index a231ce1fc..3a6ddaad1 100644
--- a/src/Mod/Mesh/Gui/images.h
+++ b/src/Mod/Mesh/Gui/images.h
@@ -37,56 +37,3 @@ static const char *mesh_fillhole[]={
 "................................",
 "................................"};
 
-/* XPM */
-static const char *mesh_pipette[]={
-"32 32 17 1",
-"# c #000000",
-"j c #080808",
-"b c #101010",
-"f c #1c1c1c",
-"g c #4c4c4c",
-"c c #777777",
-"a c #848484",
-"i c #9c9c9c",
-"l c #b9b9b9",
-"e c #cacaca",
-"n c #d6d6d6",
-"k c #dedede",
-"d c #e7e7e7",
-"m c #efefef",
-"h c #f7f7f7",
-"w c #ffffff",
-". c None",
-"................................",
-".....................#####......",
-"...................#######......",
-"...................#########....",
-"..................##########....",
-"..................##########....",
-"..................##########....",
-".................###########....",
-"...............#############....",
-".............###############....",
-".............#############......",
-".............#############......",
-"...............ab######.........",
-"..............cdef#####.........",
-".............ghdacf####.........",
-"............#ehiacj####.........",
-"............awiaaf####..........",
-"...........iheacf##.............",
-"..........#kdaag##..............",
-".........gedaacb#...............",
-".........lwiac##................",
-".......#amlaaf##................",
-".......cheaag#..................",
-"......#ndaag##..................",
-".....#imaacb#...................",
-".....iwlacf#....................",
-"....#nlaag##....................",
-"....feaagj#.....................",
-"....caag##......................",
-"....ffbj##......................",
-"................................",
-"................................"};
-