diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp
index 94c332895f..7acb54bb4a 100644
--- a/src/Mod/Mesh/Gui/Command.cpp
+++ b/src/Mod/Mesh/Gui/Command.cpp
@@ -625,7 +625,7 @@ CmdMeshFromPartShape::CmdMeshFromPartShape()
     sToolTipText  = QT_TR_NOOP("Tessellate shape");
     sWhatsThis    = "Mesh_FromPartShape";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Mesh_Mesh_from_Shape.svg";
+    sPixmap       = "Mesh_FromPartShape.svg";
 }
 
 void CmdMeshFromPartShape::activated(int)
@@ -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_PolyCut";
 }
 
 void CmdMeshPolyCut::activated(int)
@@ -957,7 +957,7 @@ CmdMeshPolyTrim::CmdMeshPolyTrim()
     sToolTipText  = QT_TR_NOOP("Trims a mesh with a picked polygon");
     sWhatsThis    = "Mesh_PolyTrim";
     sStatusTip    = QT_TR_NOOP("Trims a mesh with a picked polygon");
-    sPixmap       = "Mesh_Poly_Trim";
+    sPixmap       = "Mesh_PolyTrim";
 }
 
 void CmdMeshPolyTrim::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_EvaluateFacet";
 }
 
 void CmdMeshEvaluateFacet::activated(int)
@@ -1242,7 +1242,7 @@ CmdMeshRemoveComponents::CmdMeshRemoveComponents()
     sToolTipText  = QT_TR_NOOP("Remove topologic independent components from the mesh");
     sWhatsThis    = "Mesh_RemoveComponents";
     sStatusTip    = QT_TR_NOOP("Remove topologic independent components from the mesh");
-    sPixmap       = "Mesh_Remove_Components";
+    sPixmap       = "Mesh_RemoveComponents";
 }
 
 void CmdMeshRemoveComponents::activated(int)
@@ -1287,7 +1287,7 @@ CmdMeshRemeshGmsh::CmdMeshRemeshGmsh()
     sToolTipText  = QT_TR_NOOP("Refine existing mesh");
     sStatusTip    = QT_TR_NOOP("Refine existing mesh");
     sWhatsThis    = "Mesh_RemeshGmsh";
-    sPixmap       = "Mesh_Remesh_Gmsh";
+    sPixmap       = "Mesh_RemeshGmsh";
 }
 
 void CmdMeshRemeshGmsh::activated(int)
@@ -1320,7 +1320,7 @@ CmdMeshRemoveCompByHand::CmdMeshRemoveCompByHand()
     sToolTipText  = QT_TR_NOOP("Mark a component to remove it from the mesh");
     sWhatsThis    = "Mesh_RemoveCompByHand";
     sStatusTip    = QT_TR_NOOP("Mark a component to remove it from the mesh");
-    sPixmap       = "Mesh_Remove_Comp_by_Hand";
+    sPixmap       = "Mesh_RemoveCompByHand";
 }
 
 void CmdMeshRemoveCompByHand::activated(int)
@@ -1606,7 +1606,7 @@ CmdMeshBuildRegularSolid::CmdMeshBuildRegularSolid()
     sToolTipText  = QT_TR_NOOP("Builds a regular solid");
     sWhatsThis    = "Mesh_BuildRegularSolid";
     sStatusTip    = QT_TR_NOOP("Builds a regular solid");
-    sPixmap       = "Mesh_Regular_Solid";
+    sPixmap       = "Mesh_BuildRegularSolid";
 }
 
 void CmdMeshBuildRegularSolid::activated(int)
@@ -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_FillInteractiveHole";
 }
 
 void CmdMeshFillInteractiveHole::activated(int)
diff --git a/src/Mod/Mesh/Gui/Resources/Mesh.qrc b/src/Mod/Mesh/Gui/Resources/Mesh.qrc
index 5eb0c99162..45e28cfc6b 100644
--- a/src/Mod/Mesh/Gui/Resources/Mesh.qrc
+++ b/src/Mod/Mesh/Gui/Resources/Mesh.qrc
@@ -1,29 +1,29 @@
 <RCC>
     <qresource>
         <file>icons/Mesh_AddFacet.svg</file>
-        <file>icons/Mesh_Boundary.svg</file>
         <file>icons/Mesh_BoundingBox.svg</file>
+        <file>icons/Mesh_BuildRegularSolid.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_EvaluateFacet.svg</file>
         <file>icons/Mesh_EvaluateSolid.svg</file>
         <file>icons/Mesh_Evaluation.svg</file>
         <file>icons/Mesh_Export.svg</file>
+        <file>icons/Mesh_FillInteractiveHole.svg</file>
         <file>icons/Mesh_FillupHoles.svg</file>
         <file>icons/Mesh_FlipNormals.svg</file>
+        <file>icons/Mesh_FromPartShape.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>
-        <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_PolyCut.svg</file>
+        <file>icons/Mesh_PolyTrim.svg</file>
+        <file>icons/Mesh_RemeshGmsh.svg</file>
+        <file>icons/Mesh_RemoveCompByHand.svg</file>
+        <file>icons/Mesh_RemoveComponents.svg</file>
         <file>icons/Mesh_Scale.svg</file>
         <file>icons/Mesh_Section_by_Plane.svg</file>
         <file>icons/Mesh_Segmentation_Best_Fit.svg</file>
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Regular_Solid.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_BuildRegularSolid.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Regular_Solid.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_BuildRegularSolid.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Pipette.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_EvaluateFacet.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Pipette.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_EvaluateFacet.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Boundary.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_FillInteractiveHole.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Boundary.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_FillInteractiveHole.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Mesh_from_Shape.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_FromPartShape.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Mesh_from_Shape.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_FromPartShape.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Cut.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_PolyCut.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Cut.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_PolyCut.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Poly_Trim.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_PolyTrim.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Poly_Trim.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_PolyTrim.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Remesh_Gmsh.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_RemeshGmsh.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Remesh_Gmsh.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_RemeshGmsh.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Remove_Comp_by_Hand.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_RemoveCompByHand.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Remove_Comp_by_Hand.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_RemoveCompByHand.svg
diff --git a/src/Mod/Mesh/Gui/Resources/icons/Mesh_Remove_Components.svg b/src/Mod/Mesh/Gui/Resources/icons/Mesh_RemoveComponents.svg
similarity index 100%
rename from src/Mod/Mesh/Gui/Resources/icons/Mesh_Remove_Components.svg
rename to src/Mod/Mesh/Gui/Resources/icons/Mesh_RemoveComponents.svg