diff --git a/src/Mod/Part/BasicShapes/Shapes.py b/src/Mod/Part/BasicShapes/Shapes.py
index 0c1aed5b8a..4af89d40fd 100644
--- a/src/Mod/Part/BasicShapes/Shapes.py
+++ b/src/Mod/Part/BasicShapes/Shapes.py
@@ -85,7 +85,7 @@ if FreeCAD.GuiUp:
             return {'MenuText': Qt.QT_TRANSLATE_NOOP("Part_Tube","Create tube"),
                     'Accel': "",
                     'CmdType': "AlterDoc:Alter3DView:AlterSelection",
-                    'Pixmap': ":/icons/Part_Tube.svg",
+                    'Pixmap': "Part_Tube",
                     'ToolTip': Qt.QT_TRANSLATE_NOOP("Part_Tube","Creates a tube")}
         
         def Activated(self):
@@ -101,3 +101,4 @@ if FreeCAD.GuiUp:
 
 
     FreeCADGui.addCommand('Part_Tube', CommandTube())
+
diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
index 8210da42b9..1dce561897 100644
--- a/src/Mod/Part/Gui/AppPartGui.cpp
+++ b/src/Mod/Part/Gui/AppPartGui.cpp
@@ -125,6 +125,8 @@ PyMOD_INIT_FUNC(PartGui)
 
     Base::Console().Log("Loading GUI of Part module... done\n");
 
+    Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/create"));
+
 #if PY_MAJOR_VERSION >= 3
     static struct PyModuleDef pAttachEngineTextsModuleDef = {
         PyModuleDef_HEAD_INIT,
diff --git a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
index dec5cec6e3..a180b7e4f6 100644
--- a/src/Mod/Part/Gui/Command.cpp
+++ b/src/Mod/Part/Gui/Command.cpp
@@ -220,7 +220,7 @@ CmdPartPrimitives::CmdPartPrimitives()
     sToolTipText  = QT_TR_NOOP("Creation of parametrized geometric primitives");
     sWhatsThis    = "Part_Primitives";
     sStatusTip    = sToolTipText;
-    sPixmap       = "Part_CreatePrimitives";
+    sPixmap       = "Part_Primitives";
 }
 
 void CmdPartPrimitives::activated(int iMsg)
diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc
index a79abe5a14..06a284800f 100644
--- a/src/Mod/Part/Gui/Resources/Part.qrc
+++ b/src/Mod/Part/Gui/Resources/Part.qrc
@@ -1,9 +1,18 @@
 <RCC>
+    <qresource>
+        <file>icons/create/Part_Box.svg</file>
+        <file>icons/create/Part_Cone.svg</file>
+        <file>icons/create/Part_Cylinder.svg</file>
+        <file>icons/create/Part_Primitives.svg</file>
+        <file>icons/create/Part_Shapebuilder.svg</file>
+        <file>icons/create/Part_Sphere.svg</file>
+        <file>icons/create/Part_Torus.svg</file>
+        <file>icons/create/Part_Tube.svg</file>
+    </qresource>
     <qresource>
         <file>icons/Part_Attachment.svg</file>
         <file>icons/Part_BooleanFragments.svg</file>
         <file>icons/Part_Booleans.svg</file>
-        <file>icons/Part_Box.svg</file>
         <file>icons/Part_BoxSelection.svg</file>
         <file>icons/Part_Chamfer.svg</file>
         <file>icons/Part_CheckGeometry.svg</file>
@@ -11,11 +20,8 @@
         <file>icons/Part_Common.svg</file>
         <file>icons/Part_Compound.svg</file>
         <file>icons/Part_CompoundFilter.svg</file>
-        <file>icons/Part_Cone.svg</file>
-        <file>icons/Part_CreatePrimitives.svg</file>
         <file>icons/Part_CrossSections.svg</file>
         <file>icons/Part_Cut.svg</file>
-        <file>icons/Part_Cylinder.svg</file>
         <file>icons/Part_Defeaturing.svg</file>
         <file>icons/Part_Element_Copy.svg</file>
         <file>icons/Part_Ellipse_Parametric.svg</file>
@@ -53,19 +59,15 @@
         <file>icons/Part_Revolve.svg</file>
         <file>icons/Part_RuledSurface.svg</file>
         <file>icons/Part_Section.svg</file>
-        <file>icons/Part_Shapebuilder.svg</file>
         <file>icons/Part_Shape_from_Mesh.svg</file>
         <file>icons/Part_ShapeInfo.svg</file>
         <file>icons/Part_Slice.svg</file>
         <file>icons/Part_SliceApart.svg</file>
-        <file>icons/Part_Sphere.svg</file>
         <file>icons/Part_Spiral_Parametric.svg</file>
         <file>icons/Part_Spline_Parametric.svg</file>
         <file>icons/Part_Sweep.svg</file>
         <file>icons/Part_Thickness.svg</file>
-        <file>icons/Part_Torus.svg</file>
         <file>icons/Part_Transformed_Copy.svg</file>
-        <file>icons/Part_Tube.svg</file>
         <file>icons/PartWorkbench.svg</file>
         <file>icons/Part_XOR.svg</file>
         <file>icons/preferences-part_design.svg</file>
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Box.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Box.svg
rename to src/Mod/Part/Gui/Resources/icons/create/Part_Box.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Cone.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Cone.svg
rename to src/Mod/Part/Gui/Resources/icons/create/Part_Cone.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Cylinder.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Cylinder.svg
rename to src/Mod/Part/Gui/Resources/icons/create/Part_Cylinder.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_CreatePrimitives.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Primitives.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_CreatePrimitives.svg
rename to src/Mod/Part/Gui/Resources/icons/create/Part_Primitives.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Shapebuilder.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Shapebuilder.svg
rename to src/Mod/Part/Gui/Resources/icons/create/Part_Shapebuilder.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Sphere.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Sphere.svg
rename to src/Mod/Part/Gui/Resources/icons/create/Part_Sphere.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Torus.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Torus.svg
rename to src/Mod/Part/Gui/Resources/icons/create/Part_Torus.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Tube.svg b/src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Tube.svg
rename to src/Mod/Part/Gui/Resources/icons/create/Part_Tube.svg