diff --git a/src/Mod/Fem/Gui/Command.cpp b/src/Mod/Fem/Gui/Command.cpp
index 4ca785c732..b5480e208c 100644
--- a/src/Mod/Fem/Gui/Command.cpp
+++ b/src/Mod/Fem/Gui/Command.cpp
@@ -975,7 +975,7 @@ CmdFemDefineNodesSet::CmdFemDefineNodesSet()
     sToolTipText  = QT_TR_NOOP("Create node set by Poly");
     sWhatsThis    = "Create node set by Poly";
     sStatusTip    = QT_TR_NOOP("Create node set by Poly");
-    sPixmap       = "fem-fem-mesh-create-node-by-poly";
+    sPixmap       = "fem-femmesh-create-node-by-poly";
 }
 
 void CmdFemDefineNodesSet::activated(int)
@@ -1032,7 +1032,7 @@ CmdFemCreateNodesSet::CmdFemCreateNodesSet()
     sToolTipText    = QT_TR_NOOP("Creates a FEM mesh nodes set");
     sWhatsThis      = "Fem_CreateNodesSet";
     sStatusTip      = sToolTipText;
-    sPixmap         = "fem-fem-mesh-create-node-by-poly";
+    sPixmap         = "fem-femmesh-create-node-by-poly";
 }
 
 void CmdFemCreateNodesSet::activated(int)
diff --git a/src/Mod/Fem/Gui/Resources/Fem.qrc b/src/Mod/Fem/Gui/Resources/Fem.qrc
index 1f914c0890..79eec3a0b7 100755
--- a/src/Mod/Fem/Gui/Resources/Fem.qrc
+++ b/src/Mod/Fem/Gui/Resources/Fem.qrc
@@ -25,10 +25,10 @@
         <file>icons/fem-control-solver.svg</file>
         <file>icons/fem-cylinder.svg</file>
         <file>icons/fem-data.png</file>
-        <file>icons/fem-fem-mesh-create-node-by-poly.svg</file>
-        <file>icons/fem-fem-mesh-from-shape.svg</file>
-        <file>icons/fem-fem-mesh-gmsh-from-shape.svg</file>
-        <file>icons/fem-fem-mesh-netgen-from-shape.svg</file>
+        <file>icons/fem-femmesh-create-node-by-poly.svg</file>
+        <file>icons/fem-femmesh-from-shape.svg</file>
+        <file>icons/fem-femmesh-gmsh-from-shape.svg</file>
+        <file>icons/fem-femmesh-netgen-from-shape.svg</file>
         <file>icons/fem-femmesh-to-mesh.svg</file>
         <file>icons/fem-frequency-analysis.svg</file>
         <file>icons/fem-inp-editor.svg</file>
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-create-node-by-poly.svg b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-create-node-by-poly.svg
similarity index 99%
rename from src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-create-node-by-poly.svg
rename to src/Mod/Fem/Gui/Resources/icons/fem-femmesh-create-node-by-poly.svg
index 044191fe41..1d56b643cb 100644
--- a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-create-node-by-poly.svg
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-create-node-by-poly.svg
@@ -15,7 +15,7 @@
    id="svg2860"
    sodipodi:version="0.32"
    inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="fem-fem-mesh-create-node-by-poly.svg"
+   sodipodi:docname="fem-femmesh-create-node-by-poly.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-from-shape.svg b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-from-shape.svg
similarity index 99%
rename from src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-from-shape.svg
rename to src/Mod/Fem/Gui/Resources/icons/fem-femmesh-from-shape.svg
index a5c8a7345b..527b65c92c 100644
--- a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-from-shape.svg
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-from-shape.svg
@@ -14,7 +14,7 @@
    id="svg2860"
    sodipodi:version="0.32"
    inkscape:version="0.46"
-   sodipodi:docname="Fem_FemMesh.svg"
+   sodipodi:docname="fem-femmesh-from-shape.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs2862">
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-gmsh-from-shape.svg b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-gmsh-from-shape.svg
similarity index 99%
rename from src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-gmsh-from-shape.svg
rename to src/Mod/Fem/Gui/Resources/icons/fem-femmesh-gmsh-from-shape.svg
index d9fd5d8cf4..b869f01cad 100644
--- a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-gmsh-from-shape.svg
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-gmsh-from-shape.svg
@@ -15,7 +15,7 @@
    id="svg2860"
    sodipodi:version="0.32"
    inkscape:version="0.48.5 r10040"
-   sodipodi:docname="fem-fem-mesh-gmsh-from-shape.svg"
+   sodipodi:docname="fem-femmesh-gmsh-from-shape.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
diff --git a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-netgen-from-shape.svg b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-netgen-from-shape.svg
similarity index 99%
rename from src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-netgen-from-shape.svg
rename to src/Mod/Fem/Gui/Resources/icons/fem-femmesh-netgen-from-shape.svg
index 34c5bb60ef..1bfcae675a 100644
--- a/src/Mod/Fem/Gui/Resources/icons/fem-fem-mesh-netgen-from-shape.svg
+++ b/src/Mod/Fem/Gui/Resources/icons/fem-femmesh-netgen-from-shape.svg
@@ -15,7 +15,7 @@
    id="svg2860"
    sodipodi:version="0.32"
    inkscape:version="0.48.5 r10040"
-   sodipodi:docname="fem-fem-mesh-netgen-from-shape.svg"
+   sodipodi:docname="fem-femmesh-netgen-from-shape.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.1">
   <defs
diff --git a/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp b/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp
index db78ad8aa3..48dfff7343 100644
--- a/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp
+++ b/src/Mod/Fem/Gui/TaskAnalysisInfo.cpp
@@ -41,7 +41,7 @@ using namespace Gui;
 
 
 TaskAnalysisInfo::TaskAnalysisInfo(Fem::FemAnalysis *pcObject,QWidget *parent)
-    : TaskBox(Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"),
+    : TaskBox(Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"),
       tr("Nodes set"),
       true,
       parent),
diff --git a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
index 62bf4425c1..5b5515ab1f 100644
--- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
+++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
@@ -59,7 +59,7 @@ using namespace Gui;
 
 
 TaskCreateNodeSet::TaskCreateNodeSet(Fem::FemSetNodesObject *pcObject,QWidget *parent)
-    : TaskBox(Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"),
+    : TaskBox(Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"),
       tr("Nodes set"),
       true,
       parent),
diff --git a/src/Mod/Fem/Gui/TaskDriver.cpp b/src/Mod/Fem/Gui/TaskDriver.cpp
index 1934df7c3e..82a5436fbf 100644
--- a/src/Mod/Fem/Gui/TaskDriver.cpp
+++ b/src/Mod/Fem/Gui/TaskDriver.cpp
@@ -47,7 +47,7 @@ using namespace Gui;
 
 
 TaskDriver::TaskDriver(Fem::FemAnalysis *pcObject,QWidget *parent)
-    : TaskBox(Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"),
+    : TaskBox(Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"),
       tr("Nodes set"),
       true,
       parent),
diff --git a/src/Mod/Fem/Gui/TaskObjectName.cpp b/src/Mod/Fem/Gui/TaskObjectName.cpp
index 7e3dd3a2cb..cb8919db65 100644
--- a/src/Mod/Fem/Gui/TaskObjectName.cpp
+++ b/src/Mod/Fem/Gui/TaskObjectName.cpp
@@ -44,7 +44,7 @@ using namespace FemGui;
 using namespace Gui;
 
 TaskObjectName::TaskObjectName(App::DocumentObject *pcObject,QWidget *parent)
-    : TaskBox(Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"),
+    : TaskBox(Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"),
       tr("TaskObjectName"),
       true,
       parent),
diff --git a/src/Mod/Fem/Gui/TaskPostBoxes.cpp b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
index d276e2ff79..9d91cbc27d 100644
--- a/src/Mod/Fem/Gui/TaskPostBoxes.cpp
+++ b/src/Mod/Fem/Gui/TaskPostBoxes.cpp
@@ -171,7 +171,7 @@ void TaskPostBox::updateEnumerationList(App::PropertyEnumeration& prop, QComboBo
 //###########################################################################################################
 
 TaskPostDisplay::TaskPostDisplay(Gui::ViewProviderDocumentObject* view, QWidget *parent)
-    : TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), tr("Display options"), parent)
+    : TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Display options"), parent)
 {
     //we need a separate container widget to add all controls to
     proxy = new QWidget(this);
@@ -221,7 +221,7 @@ void TaskPostDisplay::applyPythonCode() {
 
 //############################################################################################
 
-TaskPostFunction::TaskPostFunction(ViewProviderDocumentObject* view, QWidget* parent): TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), tr("Implicit function"), parent) {
+TaskPostFunction::TaskPostFunction(ViewProviderDocumentObject* view, QWidget* parent): TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Implicit function"), parent) {
 
     assert(view->isDerivedFrom(ViewProviderFemPostFunction::getClassTypeId()));
 
@@ -244,7 +244,7 @@ void TaskPostFunction::applyPythonCode() {
 //############################################################################################
 
 TaskPostClip::TaskPostClip(ViewProviderDocumentObject* view, App::PropertyLink* function, QWidget* parent)
-    : TaskPostBox(view,Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), tr("Choose implicit function"), parent) {
+    : TaskPostBox(view,Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Choose implicit function"), parent) {
 
     assert(view->isDerivedFrom(ViewProviderFemPostClip::getClassTypeId()));
     assert(function);
@@ -363,7 +363,7 @@ void TaskPostClip::on_InsideOut_toggled(bool val) {
 //############################################################################################
 
 TaskPostScalarClip::TaskPostScalarClip(ViewProviderDocumentObject* view, QWidget* parent) :
-    TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), tr("Clip options"), parent) {
+    TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Clip options"), parent) {
 
     assert(view->isDerivedFrom(ViewProviderFemPostScalarClip::getClassTypeId()));
 
@@ -455,7 +455,7 @@ void TaskPostScalarClip::on_InsideOut_toggled(bool val) {
 //############################################################################################
 
 TaskPostWarpVector::TaskPostWarpVector(ViewProviderDocumentObject* view, QWidget* parent) :
-    TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), tr("Clip options"), parent) {
+    TaskPostBox(view, Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Clip options"), parent) {
 
     assert(view->isDerivedFrom(ViewProviderFemPostWarpVector::getClassTypeId()));
 
@@ -540,7 +540,7 @@ void TaskPostWarpVector::on_Min_valueChanged(double v) {
 //############################################################################################
 
 TaskPostCut::TaskPostCut(ViewProviderDocumentObject* view, App::PropertyLink* function, QWidget* parent)
-    : TaskPostBox(view,Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"), tr("Choose implicit function"), parent) {
+    : TaskPostBox(view,Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"), tr("Choose implicit function"), parent) {
 
     assert(view->isDerivedFrom(ViewProviderFemPostCut::getClassTypeId()));
     assert(function);
diff --git a/src/Mod/Fem/Gui/TaskTetParameter.cpp b/src/Mod/Fem/Gui/TaskTetParameter.cpp
index 2707b9e94b..2ac5298a8c 100644
--- a/src/Mod/Fem/Gui/TaskTetParameter.cpp
+++ b/src/Mod/Fem/Gui/TaskTetParameter.cpp
@@ -48,7 +48,7 @@ using namespace Gui;
 
 
 TaskTetParameter::TaskTetParameter(Fem::FemMeshShapeNetgenObject *pcObject,QWidget *parent)
-    : TaskBox(Gui::BitmapFactory().pixmap("fem-fem-mesh-create-node-by-poly"),
+    : TaskBox(Gui::BitmapFactory().pixmap("fem-femmesh-create-node-by-poly"),
       tr("Tet Parameter"),
       true,
       parent),
diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
index 689a96ecec..14b238ca55 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
@@ -183,7 +183,7 @@ App::PropertyFloatConstraint::Constraints ViewProviderFemMesh::floatRange = {1.0
 
 ViewProviderFemMesh::ViewProviderFemMesh()
 {
-    sPixmap = "fem-fem-mesh-from-shape";
+    sPixmap = "fem-femmesh-from-shape";
 
     ADD_PROPERTY(PointColor,(App::Color(0.7f,0.7f,0.7f)));
     ADD_PROPERTY(PointSize,(5.0f));
diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
index 9c73dacfc3..fa8fedf2bf 100644
--- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
+++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.cpp
@@ -66,7 +66,7 @@ ViewProviderFemPostObject::ViewProviderFemPostObject() : m_blockPropertyChanges(
     ADD_PROPERTY_TYPE(VectorMode,((long)0), "Coloring", App::Prop_None, "Select what to show for a vector field");
     ADD_PROPERTY(Transperency, (0));
 
-    sPixmap = "fem-fem-mesh-from-shape";
+    sPixmap = "fem-femmesh-from-shape";
 
     //create the subnodes which do the visualization work
     m_shapeHints = new SoShapeHints();
diff --git a/src/Mod/Fem/_CommandMeshGmshFromShape.py b/src/Mod/Fem/_CommandMeshGmshFromShape.py
index 5044fff6f5..a11ce896ae 100644
--- a/src/Mod/Fem/_CommandMeshGmshFromShape.py
+++ b/src/Mod/Fem/_CommandMeshGmshFromShape.py
@@ -38,7 +38,7 @@ class _CommandMeshGmshFromShape(FemCommands):
     # the Fem_MeshGmshFromShape command definition
     def __init__(self):
         super(_CommandMeshGmshFromShape, self).__init__()
-        self.resources = {'Pixmap': 'fem-fem-mesh-gmsh-from-shape',
+        self.resources = {'Pixmap': 'fem-femmesh-gmsh-from-shape',
                           'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_MeshGmshFromShape", "FEM mesh from shape by GMSH"),
                           'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_MeshGmshFromShape", "Create a FEM mesh from a shape by GMSH mesher")}
         self.is_active = 'with_part_feature'
diff --git a/src/Mod/Fem/_CommandMeshNetgenFromShape.py b/src/Mod/Fem/_CommandMeshNetgenFromShape.py
index 877687a5bb..f497fcb349 100644
--- a/src/Mod/Fem/_CommandMeshNetgenFromShape.py
+++ b/src/Mod/Fem/_CommandMeshNetgenFromShape.py
@@ -37,7 +37,7 @@ class _CommandMeshNetgenFromShape(FemCommands):
     # the Fem_MeshNetgenFromShape command definition
     def __init__(self):
         super(_CommandMeshNetgenFromShape, self).__init__()
-        self.resources = {'Pixmap': 'fem-fem-mesh-netgen-from-shape',
+        self.resources = {'Pixmap': 'fem-femmesh-netgen-from-shape',
                           'MenuText': QtCore.QT_TRANSLATE_NOOP("Fem_MeshFromShape", "FEM mesh from shape by Netgen"),
                           'ToolTip': QtCore.QT_TRANSLATE_NOOP("Fem_MeshFromShape", "Create a FEM volume mesh from a solid or face shape by Netgen internal mesher")}
         self.is_active = 'with_part_feature'
diff --git a/src/Mod/Fem/_ViewProviderFemMeshGmsh.py b/src/Mod/Fem/_ViewProviderFemMeshGmsh.py
index 981bfeed62..34d4239aa7 100644
--- a/src/Mod/Fem/_ViewProviderFemMeshGmsh.py
+++ b/src/Mod/Fem/_ViewProviderFemMeshGmsh.py
@@ -38,7 +38,7 @@ class _ViewProviderFemMeshGmsh:
         vobj.Proxy = self
 
     def getIcon(self):
-        return ":/icons/fem-fem-mesh-from-shape.svg"
+        return ":/icons/fem-femmesh-from-shape.svg"
 
     def attach(self, vobj):
         self.ViewObject = vobj