diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp
index ebb6ee49d6..94c332895f 100644
--- a/src/Mod/Mesh/Gui/Command.cpp
+++ b/src/Mod/Mesh/Gui/Command.cpp
@@ -442,7 +442,7 @@ CmdMeshImport::CmdMeshImport()
     sToolTipText  = QT_TR_NOOP("Imports a mesh from file");
     sWhatsThis    = "Mesh_Import";
     sStatusTip    = QT_TR_NOOP("Imports a mesh from file");
-    sPixmap       = "Mesh_Import_Mesh";
+    sPixmap       = "Mesh_Import";
 }
 
 void CmdMeshImport::activated(int)
@@ -493,7 +493,7 @@ CmdMeshExport::CmdMeshExport()
     sToolTipText  = QT_TR_NOOP("Exports a mesh to file");
     sWhatsThis    = "Mesh_Export";
     sStatusTip    = QT_TR_NOOP("Exports a mesh to file");
-    sPixmap       = "Mesh_Export_Mesh";
+    sPixmap       = "Mesh_Export";
 }
 
 void CmdMeshExport::activated(int)
@@ -651,7 +651,7 @@ CmdMeshVertexCurvature::CmdMeshVertexCurvature()
     sToolTipText  = QT_TR_NOOP("Calculates the curvature of the vertices of a mesh");
     sWhatsThis    = "Mesh_VertexCurvature";
     sStatusTip    = QT_TR_NOOP("Calculates the curvature of the vertices of a mesh");
-    sPixmap       = "Mesh_Curvature_Plot";
+    sPixmap       = "Mesh_VertexCurvature";
 }
 
 void CmdMeshVertexCurvature::activated(int)
@@ -694,7 +694,7 @@ CmdMeshVertexCurvatureInfo::CmdMeshVertexCurvatureInfo()
     sToolTipText  = QT_TR_NOOP("Information about curvature");
     sWhatsThis    = "Mesh_CurvatureInfo";
     sStatusTip    = QT_TR_NOOP("Information about curvature");
-    sPixmap       = "Mesh_Curvature_Info";
+    sPixmap       = "Mesh_CurvatureInfo";
 }
 
 void CmdMeshVertexCurvatureInfo::activated(int)
@@ -849,7 +849,7 @@ CmdMeshAddFacet::CmdMeshAddFacet()
     sToolTipText  = QT_TR_NOOP("Add triangle manually to a mesh");
     sWhatsThis    = "Mesh_AddFacet";
     sStatusTip    = QT_TR_NOOP("Add triangle manually to a mesh");
-    sPixmap       = "Mesh_Add_Facet";
+    sPixmap       = "Mesh_AddFacet";
 }
 
 void CmdMeshAddFacet::activated(int)
@@ -1075,7 +1075,7 @@ CmdMeshCrossSections::CmdMeshCrossSections()
     sMenuText     = QT_TR_NOOP("Cross-sections...");
     sToolTipText  = QT_TR_NOOP("Cross-sections");
     sStatusTip    = QT_TR_NOOP("Cross-sections");
-    sPixmap       = "Mesh_Cross_Sections";
+    sPixmap       = "Mesh_CrossSections";
 }
 
 void CmdMeshCrossSections::activated(int)
@@ -1364,7 +1364,7 @@ CmdMeshEvaluateSolid::CmdMeshEvaluateSolid()
     sToolTipText  = QT_TR_NOOP("Checks whether the mesh is a solid");
     sWhatsThis    = "Mesh_EvaluateSolid";
     sStatusTip    = QT_TR_NOOP("Checks whether the mesh is a solid");
-    sPixmap       = "Mesh_Evaluate_Solid";
+    sPixmap       = "Mesh_EvaluateSolid";
 }
 
 void CmdMeshEvaluateSolid::activated(int)
@@ -1496,7 +1496,7 @@ CmdMeshHarmonizeNormals::CmdMeshHarmonizeNormals()
     sToolTipText  = QT_TR_NOOP("Harmonizes the normals of the mesh");
     sWhatsThis    = "Mesh_HarmonizeNormals";
     sStatusTip    = QT_TR_NOOP("Harmonizes the normals of the mesh");
-    sPixmap       = "Mesh_Harmonize_Normals";
+    sPixmap       = "Mesh_HarmonizeNormals";
 }
 
 void CmdMeshHarmonizeNormals::activated(int)
@@ -1530,7 +1530,7 @@ CmdMeshFlipNormals::CmdMeshFlipNormals()
     sToolTipText  = QT_TR_NOOP("Flips the normals of the mesh");
     sWhatsThis    = "Mesh_FlipNormals";
     sStatusTip    = QT_TR_NOOP("Flips the normals of the mesh");
-    sPixmap       = "Mesh_Flip_Normals";
+    sPixmap       = "Mesh_FlipNormals";
 }
 
 void CmdMeshFlipNormals::activated(int)
@@ -1564,7 +1564,7 @@ CmdMeshBoundingBox::CmdMeshBoundingBox()
     sToolTipText  = QT_TR_NOOP("Shows the boundings of the selected mesh");
     sWhatsThis    = "Mesh_BoundingBox";
     sStatusTip    = QT_TR_NOOP("Shows the boundings of the selected mesh");
-    sPixmap       = "Mesh_Bounding_Box";
+    sPixmap       = "Mesh_BoundingBox";
 }
 
 void CmdMeshBoundingBox::activated(int)
@@ -1637,7 +1637,7 @@ CmdMeshFillupHoles::CmdMeshFillupHoles()
     sToolTipText  = QT_TR_NOOP("Fill holes of the mesh");
     sWhatsThis    = "Mesh_FillupHoles";
     sStatusTip    = QT_TR_NOOP("Fill holes of the mesh");
-    sPixmap       = "Mesh_Fill_up_Holes";
+    sPixmap       = "Mesh_FillupHoles";
 }
 
 void CmdMeshFillupHoles::activated(int)
diff --git a/src/Mod/Mesh/Gui/Resources/Mesh.qrc b/src/Mod/Mesh/Gui/Resources/Mesh.qrc
index f8f90bd23e..5eb0c99162 100644
--- a/src/Mod/Mesh/Gui/Resources/Mesh.qrc
+++ b/src/Mod/Mesh/Gui/Resources/Mesh.qrc
@@ -1,20 +1,20 @@
 <RCC>
     <qresource>
-        <file>icons/Mesh_Add_Facet.svg</file>
+        <file>icons/Mesh_AddFacet.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_BoundingBox.svg</file>
+        <file>icons/Mesh_CrossSections.svg</file>
+        <file>icons/Mesh_CurvatureInfo.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_EvaluateSolid.svg</file>
         <file>icons/Mesh_Evaluation.svg</file>
-        <file>icons/Mesh_Export_Mesh.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_Export.svg</file>
+        <file>icons/Mesh_FillupHoles.svg</file>
+        <file>icons/Mesh_FlipNormals.svg</file>
+        <file>icons/Mesh_HarmonizeNormals.svg</file>
+        <file>icons/Mesh_Import.svg</file>
         <file>icons/Mesh_Intersection.svg</file>
         <file>icons/Mesh_Merge.svg</file>
         <file>icons/Mesh_Mesh_from_Shape.svg</file>
@@ -26,7 +26,6 @@
         <file>icons/Mesh_Remove_Components.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_Segmentation_Best_Fit.svg</file>
         <file>icons/Mesh_Segmentation.svg</file>
         <file>icons/Mesh_Smoothing.svg</file>
@@ -35,6 +34,7 @@
         <file>icons/Mesh_Tree_Curvature_Plot.svg</file>
         <file>icons/Mesh_Trim_by_Plane.svg</file>
         <file>icons/Mesh_Union.svg</file>
+        <file>icons/Mesh_VertexCurvature.svg</file>
         <file>icons/MeshWorkbench.svg</file>
         <file>icons/RegularSolids/Mesh_Cone.svg</file>
         <file>icons/RegularSolids/Mesh_Cube.svg</file>
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Add_Facet.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_AddFacet.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Add_Facet.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_AddFacet.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Bounding_Box.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_BoundingBox.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Bounding_Box.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_BoundingBox.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Cross_Sections.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_CrossSections.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Cross_Sections.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_CrossSections.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Curvature_Info.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_CurvatureInfo.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Curvature_Info.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_CurvatureInfo.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Evaluate_Solid.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_EvaluateSolid.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Evaluate_Solid.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_EvaluateSolid.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Export_Mesh.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Export.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Export_Mesh.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_Export.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Fill_up_Holes.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_FillupHoles.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Fill_up_Holes.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_FillupHoles.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Flip_Normals.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_FlipNormals.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Flip_Normals.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_FlipNormals.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Harmonize_Normals.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_HarmonizeNormals.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Harmonize_Normals.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_HarmonizeNormals.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Import_Mesh.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_Import.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Import_Mesh.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_Import.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Curvature_Plot.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_VertexCurvature.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Curvature_Plot.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_VertexCurvature.svg