diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp
index cbeb0596cb..625cb58201 100644
--- a/src/Mod/Mesh/Gui/Command.cpp
+++ b/src/Mod/Mesh/Gui/Command.cpp
@@ -706,7 +706,7 @@ void CmdMeshVertexCurvatureInfo::activated(int)
         viewer->setEditing(true);
         viewer->setRedirectToSceneGraph(true);
         viewer->setSelectionEnabled(false);
-        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmapFromSvg("mesh_pipette",QSize(32,32)),4,29));
+        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmapFromSvg("Mesh_Pipette",QSize(32,32)),4,29));
         viewer->addEventCallback(SoEvent::getClassTypeId(),
             MeshGui::ViewProviderMeshCurvature::curvatureInfoCallback);
      }
@@ -896,7 +896,7 @@ CmdMeshPolyCut::CmdMeshPolyCut()
     sToolTipText  = QT_TR_NOOP("Cuts a mesh with a picked polygon");
     sWhatsThis    = "Mesh_PolyCut";
     sStatusTip    = QT_TR_NOOP("Cuts a mesh with a picked polygon");
-    sPixmap       = "mesh_cut";
+    sPixmap       = "Mesh_Cut";
 }
 
 void CmdMeshPolyCut::activated(int)
@@ -1199,7 +1199,7 @@ CmdMeshEvaluateFacet::CmdMeshEvaluateFacet()
     sToolTipText  = QT_TR_NOOP("Information about face");
     sWhatsThis    = "Mesh_EvaluateFacet";
     sStatusTip    = QT_TR_NOOP("Information about face");
-    sPixmap       = "mesh_pipette";
+    sPixmap       = "Mesh_Pipette";
 }
 
 void CmdMeshEvaluateFacet::activated(int)
@@ -1209,7 +1209,7 @@ void CmdMeshEvaluateFacet::activated(int)
     if (view) {
         Gui::View3DInventorViewer* viewer = view->getViewer();
         viewer->setEditing(true);
-        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmapFromSvg("mesh_pipette",QSize(32,32)),4,29));
+        viewer->setEditingCursor(QCursor(Gui::BitmapFactory().pixmapFromSvg("Mesh_Pipette",QSize(32,32)),4,29));
         viewer->addEventCallback(SoMouseButtonEvent::getClassTypeId(), MeshGui::ViewProviderMeshFaceSet::faceInfoCallback);
      }
 }
@@ -1675,7 +1675,7 @@ CmdMeshFillInteractiveHole::CmdMeshFillInteractiveHole()
     sToolTipText  = QT_TR_NOOP("Close holes interactively");
     sWhatsThis    = "Mesh_FillInteractiveHole";
     sStatusTip    = QT_TR_NOOP("Close holes interactively");
-    sPixmap       = "mesh_boundary";
+    sPixmap       = "Mesh_Boundary";
 }
 
 void CmdMeshFillInteractiveHole::activated(int)
diff --git a/src/Mod/Mesh/Gui/Resources/Mesh.qrc b/src/Mod/Mesh/Gui/Resources/Mesh.qrc
index 0168137170..e607d71a58 100644
--- a/src/Mod/Mesh/Gui/Resources/Mesh.qrc
+++ b/src/Mod/Mesh/Gui/Resources/Mesh.qrc
@@ -1,40 +1,40 @@
 <RCC>
-    <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>
+    <qresource>
+        <file>icons/Mesh_Add_Facet.svg</file>
+        <file>icons/Mesh_Boundary.svg</file>
+        <file>icons/Mesh_Bounding_Box.svg</file>
+        <file>icons/Mesh_Cross_Sections.svg</file>
+        <file>icons/Mesh_Curvature_Info.svg</file>
         <file>icons/Mesh_Curvature_Plot.svg</file>
+        <file>icons/Mesh_Cut.svg</file>
+        <file>icons/Mesh_Decimating.svg</file>
+        <file>icons/Mesh_Difference.svg</file>
+        <file>icons/Mesh_Evaluate_Solid.svg</file>
+        <file>icons/Mesh_Evaluation.svg</file>
         <file>icons/Mesh_Export_Mesh.svg</file>
-        <file>icons/Mesh_Import_Mesh.svg</file>
-        <file>icons/Mesh_Mesh_from_Shape.svg</file>
         <file>icons/Mesh_Flip_Normals.svg</file>
         <file>icons/Mesh_Harmonize_Normals.svg</file>
+        <file>icons/Mesh_Import_Mesh.svg</file>
+        <file>icons/Mesh_Intersection.svg</file>
+        <file>icons/Mesh_Merge.svg</file>
+        <file>icons/Mesh_Mesh_from_Shape.svg</file>
+        <file>icons/Mesh_Pipette.svg</file>
+        <file>icons/Mesh_Poly_Trim.svg</file>
         <file>icons/Mesh_Regular_Solid.svg</file>
+        <file>icons/Mesh_Remesh_Gmsh.svg</file>
+        <file>icons/Mesh_Remove_Comp_by_Hand.svg</file>
         <file>icons/Mesh_Remove_Components.svg</file>
-        <file>icons/Mesh_Tree_Curvature_Plot.svg</file>
-        <file>icons/MeshWorkbench.svg</file>
+        <file>icons/Mesh_Scale.svg</file>
+        <file>icons/Mesh_Section_by_Plane.svg</file>
         <file>icons/Mesh_Fill_up_Holes.svg</file>
-        <file>icons/Mesh_Union.svg</file>
-        <file>icons/Mesh_Smoothing.svg</file>
         <file>icons/Mesh_Segmentation_Best_Fit.svg</file>
         <file>icons/Mesh_Segmentation.svg</file>
-        <file>icons/Mesh_Section_by_Plane.svg</file>
-        <file>icons/Mesh_Scale.svg</file>
-        <file>icons/Mesh_Remove_Comp_by_Hand.svg</file>
-        <file>icons/Mesh_Remesh_Gmsh.svg</file>
-        <file>icons/Mesh_Poly_Trim.svg</file>
-        <file>icons/Mesh_Merge.svg</file>
-        <file>icons/Mesh_Intersection.svg</file>
-        <file>icons/Mesh_Evaluation.svg</file>
-        <file>icons/Mesh_Evaluate_Solid.svg</file>
-        <file>icons/Mesh_Difference.svg</file>
-        <file>icons/Mesh_Decimating.svg</file>
-        <file>icons/Mesh_Curvature_Info.svg</file>
-        <file>icons/Mesh_Cross_Sections.svg</file>
-        <file>icons/Mesh_Bounding_Box.svg</file>
-        <file>icons/Mesh_Add_Facet.svg</file>
+        <file>icons/Mesh_Smoothing.svg</file>
+        <file>icons/Mesh_Tree.svg</file>
+        <file>icons/Mesh_Tree_Curvature_Plot.svg</file>
         <file>icons/Mesh_Trim_by_Plane.svg</file>
+        <file>icons/Mesh_Union.svg</file>
+        <file>icons/MeshWorkbench.svg</file>
         <file>icons/RegularSolids/Mesh_Cone.svg</file>
         <file>icons/RegularSolids/Mesh_Cube.svg</file>
         <file>icons/RegularSolids/Mesh_Cylinder.svg</file>
diff --git a/src/Mod/Mesh/Gui/Resources/icons/mesh_boundary.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Boundary.svg
similarity index 97%
rename from src/Mod/Mesh/Gui/Resources/icons/mesh_boundary.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_Boundary.svg
index 872a9ef689..8ae2312e6a 100644
--- a/src/Mod/Mesh/Gui/Resources/icons/mesh_boundary.svg
+++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Boundary.svg
@@ -15,11 +15,11 @@
    id="svg9484"
    sodipodi:version="0.32"
    inkscape:version="0.48.5 r10040"
-   sodipodi:docname="mesh_boundary.svg"
+   sodipodi:docname="Mesh_Boundary.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <title
-     id="title3749">mesh_boundary</title>
+     id="title3749">Mesh_Boundary</title>
   <defs
      id="defs9486">
     <linearGradient
@@ -108,7 +108,7 @@
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
-        <dc:title>mesh_boundary</dc:title>
+        <dc:title>Mesh_Boundary</dc:title>
         <dc:description>A single triangular mesh face with a hole in it</dc:description>
         <dc:contributor>
           <cc:Agent>
@@ -124,7 +124,7 @@
           </rdf:Bag>
         </dc:subject>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
-        <dc:identifier>FreeCAD/src/Mod/Mesh/Gui/Resources/icons/mesh_boundary.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Mesh/Gui/Resources/icons/Mesh_Boundary.svg</dc:identifier>
         <dc:publisher>
           <cc:Agent>
             <dc:title>FreeCAD</dc:title>
diff --git a/src/Mod/Mesh/Gui/Resources/icons/mesh_cut.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Cut.svg
similarity index 99%
rename from src/Mod/Mesh/Gui/Resources/icons/mesh_cut.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_Cut.svg
index d59704ed0c..30452a847f 100644
--- a/src/Mod/Mesh/Gui/Resources/icons/mesh_cut.svg
+++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Cut.svg
@@ -15,9 +15,9 @@
    id="svg3167"
    version="1.1"
    inkscape:version="0.48.5 r10040"
-   sodipodi:docname="mesh_cut.svg">
+   sodipodi:docname="Mesh_Cut.svg">
   <title
-     id="title3747">mesh_cut</title>
+     id="title3747">Mesh_Cut</title>
   <defs
      id="defs3169">
     <linearGradient
@@ -889,11 +889,11 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>mesh_cut</dc:title>
+        <dc:title>Mesh_Cut</dc:title>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
         <dc:source>https://commons.wikimedia.org/wiki/Tango_icons#/media/File:Edit-cut.svg</dc:source>
-        <dc:identifier>FreeCAD/src/Mod/Mesh/Gui/Resources/icons/mesh_cut.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Mesh/Gui/Resources/icons/Mesh_Cut.svg</dc:identifier>
         <dc:contributor>
           <cc:Agent>
             <dc:title>[agryson] Alexander Gryson</dc:title>
diff --git a/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Pipette.svg
similarity index 98%
rename from src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_Pipette.svg
index d83fa47056..e71c744f45 100644
--- a/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg
+++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Pipette.svg
@@ -15,12 +15,12 @@
    id="svg2"
    version="1.1"
    inkscape:version="0.48.5 r10040"
-   sodipodi:docname="mesh_pipette.svg"
+   sodipodi:docname="Mesh_Pipette.svg"
    inkscape:export-filename="/home/user/Downloads/cad/mystuff/icons/main_icons/pipette_32px.png"
    inkscape:export-xdpi="45"
    inkscape:export-ydpi="45">
   <title
-     id="title3733">mesh_pipette</title>
+     id="title3733">Mesh_Pipette</title>
   <defs
      id="defs4">
     <linearGradient
@@ -158,7 +158,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>mesh_pipette</dc:title>
+        <dc:title>Mesh_Pipette</dc:title>
         <cc:license
            rdf:resource="https://www.gnu.org/copyleft/lesser.html" />
         <dc:rights>
@@ -171,7 +171,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Mesh/Gui/Resources/icons/mesh_pipette.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Mesh/Gui/Resources/icons/Mesh_Pipette.svg</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:subject>
           <rdf:Bag>
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Tree_Mesh.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Tree.svg
similarity index 98%
rename from src/Mod/Mesh/Gui/Resources/icons/Tree_Mesh.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_Tree.svg
index 69a304dab2..1c6fae59d8 100644
--- a/src/Mod/Mesh/Gui/Resources/icons/Tree_Mesh.svg
+++ b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Tree.svg
@@ -15,11 +15,11 @@
    id="svg3052"
    sodipodi:version="0.32"
    inkscape:version="0.48.5 r10040"
-   sodipodi:docname="Tree_Mesh.svg"
+   sodipodi:docname="Mesh_Tree.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <title
-     id="title3725">Tree_Mesh</title>
+     id="title3725">Mesh_Tree</title>
   <defs
      id="defs3054">
     <inkscape:perspective
@@ -103,7 +103,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Tree_Mesh</dc:title>
+        <dc:title>Mesh_Tree</dc:title>
         <dc:contributor>
           <cc:Agent>
             <dc:title>[agryson] Alexander Gryson</dc:title>
@@ -127,7 +127,7 @@
             <dc:title>FreeCAD</dc:title>
           </cc:Agent>
         </dc:publisher>
-        <dc:identifier>FreeCAD/src/Mod/Mesh/Gui/Resources/icons/Tree_Mesh.svg</dc:identifier>
+        <dc:identifier>FreeCAD/src/Mod/Mesh/Gui/Resources/icons/Mesh._Tree.svg</dc:identifier>
         <dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation>
         <dc:subject>
           <rdf:Bag>
diff --git a/src/Mod/Mesh/Gui/ViewProvider.cpp b/src/Mod/Mesh/Gui/ViewProvider.cpp
index 08bbb26890..1cb57b763f 100644
--- a/src/Mod/Mesh/Gui/ViewProvider.cpp
+++ b/src/Mod/Mesh/Gui/ViewProvider.cpp
@@ -503,7 +503,7 @@ void ViewProviderMesh::updateData(const App::Property* prop)
 QIcon ViewProviderMesh::getIcon() const
 {
 #if 1
-    static QIcon icon = Gui::BitmapFactory().pixmap("Tree_Mesh");
+    static QIcon icon = Gui::BitmapFactory().pixmap("Mesh_Tree");
     return icon;
 #else
     static const char * const Mesh_Feature_xpm[] = {