diff --git a/src/Mod/Part/BasicShapes/Shapes.py b/src/Mod/Part/BasicShapes/Shapes.py
index 4af89d40fd..0607ead9ae 100644
--- a/src/Mod/Part/BasicShapes/Shapes.py
+++ b/src/Mod/Part/BasicShapes/Shapes.py
@@ -70,7 +70,7 @@ if FreeCAD.GuiUp:
             return
 
         def getIcon(self):
-            return ":/icons/Tree_Part_Tube_Parametric.svg"
+            return ":/icons/parametric/Part_Tube_Parametric.svg"
 
         def __getstate__(self):
             return None
diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
index e5e08fd3a5..60886c58c7 100644
--- a/src/Mod/Part/Gui/AppPartGui.cpp
+++ b/src/Mod/Part/Gui/AppPartGui.cpp
@@ -127,6 +127,7 @@ PyMOD_INIT_FUNC(PartGui)
 
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/booleans"));
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/create"));
+    Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/parametric"));
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/tools"));
 
 #if PY_MAJOR_VERSION >= 3
diff --git a/src/Mod/Part/Gui/DlgPrimitives.ui b/src/Mod/Part/Gui/DlgPrimitives.ui
index 2365214303..6014ad7290 100644
--- a/src/Mod/Part/Gui/DlgPrimitives.ui
+++ b/src/Mod/Part/Gui/DlgPrimitives.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>317</width>
-    <height>370</height>
+    <width>360</width>
+    <height>380</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -34,7 +34,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Tree_Part_Plane_Parametric.svg</normaloff>:/icons/Tree_Part_Plane_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Plane_Parametric.svg</normaloff>:/icons/parametric/Part_Plane_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -43,7 +43,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Tree_Part_Box_Parametric.svg</normaloff>:/icons/Tree_Part_Box_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Box_Parametric.svg</normaloff>:/icons/parametric/Part_Box_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -52,7 +52,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Tree_Part_Cylinder_Parametric.svg</normaloff>:/icons/Tree_Part_Cylinder_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Cylinder_Parametric.svg</normaloff>:/icons/parametric/Part_Cylinder_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -61,7 +61,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Tree_Part_Cone_Parametric.svg</normaloff>:/icons/Tree_Part_Cone_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Cone_Parametric.svg</normaloff>:/icons/parametric/Part_Cone_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -70,7 +70,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Tree_Part_Sphere_Parametric.svg</normaloff>:/icons/Tree_Part_Sphere_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Sphere_Parametric.svg</normaloff>:/icons/parametric/Part_Sphere_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -79,7 +79,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Tree_Part_Ellipsoid_Parametric.svg</normaloff>:/icons/Tree_Part_Ellipsoid_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Ellipsoid_Parametric.svg</normaloff>:/icons/parametric/Part_Ellipsoid_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -88,7 +88,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Tree_Part_Torus_Parametric.svg</normaloff>:/icons/Tree_Part_Torus_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Torus_Parametric.svg</normaloff>:/icons/parametric/Part_Torus_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -97,7 +97,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Tree_Part_Prism.svg</normaloff>:/icons/Tree_Part_Prism.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Prism_Parametric.svg</normaloff>:/icons/parametric/Part_Prism_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -106,7 +106,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Tree_Part_Wedge.svg</normaloff>:/icons/Tree_Part_Wedge.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Wedge_Parametric.svg</normaloff>:/icons/parametric/Part_Wedge_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -115,7 +115,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Part_Helix_Parametric.svg</normaloff>:/icons/Part_Helix_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Helix_Parametric.svg</normaloff>:/icons/parametric/Part_Helix_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -124,7 +124,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Part_Spiral_Parametric.svg</normaloff>:/icons/Part_Spiral_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Spiral_Parametric.svg</normaloff>:/icons/parametric/Part_Spiral_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -133,7 +133,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Part_Circle_Parametric.svg</normaloff>:/icons/Part_Circle_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Circle_Parametric.svg</normaloff>:/icons/parametric/Part_Circle_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -142,7 +142,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Part_Ellipse_Parametric.svg</normaloff>:/icons/Part_Ellipse_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Ellipse_Parametric.svg</normaloff>:/icons/parametric/Part_Ellipse_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -151,7 +151,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Part_Point_Parametric.svg</normaloff>:/icons/Part_Point_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Point_Parametric.svg</normaloff>:/icons/parametric/Part_Point_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -160,7 +160,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Part_Line_Parametric.svg</normaloff>:/icons/Part_Line_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Line_Parametric.svg</normaloff>:/icons/parametric/Part_Line_Parametric.svg</iconset>
       </property>
      </item>
      <item>
@@ -169,7 +169,7 @@
       </property>
       <property name="icon">
        <iconset resource="Resources/Part.qrc">
-        <normaloff>:/icons/Part_Polygon_Parametric.svg</normaloff>:/icons/Part_Polygon_Parametric.svg</iconset>
+        <normaloff>:/icons/parametric/Part_Polygon_Parametric.svg</normaloff>:/icons/parametric/Part_Polygon_Parametric.svg</iconset>
       </property>
      </item>
     </widget>
diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc
index b6b13755b2..217f6728fe 100644
--- a/src/Mod/Part/Gui/Resources/Part.qrc
+++ b/src/Mod/Part/Gui/Resources/Part.qrc
@@ -30,6 +30,26 @@
         <file>icons/create/Part_Torus.svg</file>
         <file>icons/create/Part_Tube.svg</file>
     </qresource>
+    <qresource>
+        <file>icons/parametric/Part_Box_Parametric.svg</file>
+        <file>icons/parametric/Part_Circle_Parametric.svg</file>
+        <file>icons/parametric/Part_Cone_Parametric.svg</file>
+        <file>icons/parametric/Part_Cylinder_Parametric.svg</file>
+        <file>icons/parametric/Part_Ellipse_Parametric.svg</file>
+        <file>icons/parametric/Part_Ellipsoid_Parametric.svg</file>
+        <file>icons/parametric/Part_Helix_Parametric.svg</file>
+        <file>icons/parametric/Part_Line_Parametric.svg</file>
+        <file>icons/parametric/Part_Plane_Parametric.svg</file>
+        <file>icons/parametric/Part_Point_Parametric.svg</file>
+        <file>icons/parametric/Part_Polygon_Parametric.svg</file>
+        <file>icons/parametric/Part_Prism_Parametric.svg</file>
+        <file>icons/parametric/Part_Sphere_Parametric.svg</file>
+        <file>icons/parametric/Part_Spiral_Parametric.svg</file>
+        <file>icons/parametric/Part_Spline_Parametric.svg</file>
+        <file>icons/parametric/Part_Torus_Parametric.svg</file>
+        <file>icons/parametric/Part_Tube_Parametric.svg</file>
+        <file>icons/parametric/Part_Wedge_Parametric.svg</file>
+    </qresource>
     <qresource>
         <file>icons/tools/Part_Chamfer.svg</file>
         <file>icons/tools/Part_Extrude.svg</file>
@@ -47,15 +67,11 @@
     <qresource>
         <file>icons/Part_Attachment.svg</file>
         <file>icons/Part_BoxSelection.svg</file>
-        <file>icons/Part_Circle_Parametric.svg</file>
         <file>icons/Part_Element_Copy.svg</file>
-        <file>icons/Part_Ellipse_Parametric.svg</file>
         <file>icons/Part_Export.svg</file>
         <file>icons/Part_Feature.svg</file>
         <file>icons/Part_FeatureImport.svg</file>
-        <file>icons/Part_Helix_Parametric.svg</file>
         <file>icons/Part_Import.svg</file>
-        <file>icons/Part_Line_Parametric.svg</file>
         <file>icons/Part_Measure_Angular.svg</file>
         <file>icons/Part_Measure_Linear.svg</file>
         <file>icons/Part_Measure_Refresh.svg</file>
@@ -63,30 +79,18 @@
         <file>icons/Part_Measure_Step_Done.svg</file>
         <file>icons/Part_Measure_Toggle_3d.svg</file>
         <file>icons/Part_Measure_Toggle_Delta.svg</file>
-        <file>icons/Part_Point_Parametric.svg</file>
         <file>icons/Part_Points_from_Mesh.svg</file>
-        <file>icons/Part_Polygon_Parametric.svg</file>
         <file>icons/Part_Refine_Shape.svg</file>
         <file>icons/Part_Reverse_Shape.svg</file>
         <file>icons/Part_Shape_from_Mesh.svg</file>
         <file>icons/Part_ShapeInfo.svg</file>
-        <file>icons/Part_Spiral_Parametric.svg</file>
-        <file>icons/Part_Spline_Parametric.svg</file>
         <file>icons/Part_Transformed_Copy.svg</file>
         <file>icons/PartWorkbench.svg</file>
         <file>icons/preferences-part_design.svg</file>
         <file>icons/Tree_Part.svg</file>
         <file>icons/Tree_Part2D.svg</file>
-        <file>icons/Tree_Part_Box_Parametric.svg</file>
-        <file>icons/Tree_Part_Cone_Parametric.svg</file>
-        <file>icons/Tree_Part_Cylinder_Parametric.svg</file>
-        <file>icons/Tree_Part_Ellipsoid_Parametric.svg</file>
-        <file>icons/Tree_Part_Plane_Parametric.svg</file>
-        <file>icons/Tree_Part_Prism.svg</file>
-        <file>icons/Tree_Part_Sphere_Parametric.svg</file>
-        <file>icons/Tree_Part_Torus_Parametric.svg</file>
-        <file>icons/Tree_Part_Tube_Parametric.svg</file>
-        <file>icons/Tree_Part_Wedge.svg</file>
+    </qresource>
+    <qresource>
         <file>translations/Part_af.qm</file>
         <file>translations/Part_ar.qm</file>
         <file>translations/Part_ca.qm</file>
diff --git a/src/Mod/Part/Gui/Resources/icons/Tree_Part_Box_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Box_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Tree_Part_Box_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Box_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Circle_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Circle_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Circle_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Circle_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Tree_Part_Cone_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Cone_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Tree_Part_Cone_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Cone_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Tree_Part_Cylinder_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Cylinder_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Tree_Part_Cylinder_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Cylinder_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Ellipse_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Ellipse_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Ellipse_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Ellipse_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Tree_Part_Ellipsoid_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Ellipsoid_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Tree_Part_Ellipsoid_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Ellipsoid_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Helix_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Helix_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Helix_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Helix_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Line_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Line_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Line_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Line_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Tree_Part_Plane_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Plane_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Tree_Part_Plane_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Plane_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Point_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Point_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Point_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Point_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Polygon_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Polygon_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Polygon_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Polygon_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Tree_Part_Prism.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Prism_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Tree_Part_Prism.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Prism_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Tree_Part_Sphere_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Sphere_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Tree_Part_Sphere_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Sphere_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Spiral_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Spiral_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Spiral_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Spiral_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Spline_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Spline_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Spline_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Spline_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Tree_Part_Torus_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Torus_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Tree_Part_Torus_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Torus_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Tree_Part_Tube_Parametric.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Tube_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Tree_Part_Tube_Parametric.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Tube_Parametric.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Tree_Part_Wedge.svg b/src/Mod/Part/Gui/Resources/icons/parametric/Part_Wedge_Parametric.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Tree_Part_Wedge.svg
rename to src/Mod/Part/Gui/Resources/icons/parametric/Part_Wedge_Parametric.svg
diff --git a/src/Mod/Part/Gui/ViewProviderBox.cpp b/src/Mod/Part/Gui/ViewProviderBox.cpp
index 9e828a9a30..29a3253510 100644
--- a/src/Mod/Part/Gui/ViewProviderBox.cpp
+++ b/src/Mod/Part/Gui/ViewProviderBox.cpp
@@ -41,7 +41,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderBox, PartGui::ViewProviderPart)
 
 ViewProviderBox::ViewProviderBox()
 {
-  sPixmap = "Tree_Part_Box_Parametric.svg";
+  sPixmap = "Part_Box_Parametric";
 }
 
 ViewProviderBox::~ViewProviderBox()
diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp
index 605d04c667..4829bddf13 100644
--- a/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.cpp
@@ -41,7 +41,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderCircleParametric, PartGui::ViewProviderPart
 
 ViewProviderCircleParametric::ViewProviderCircleParametric()
 {
-  sPixmap = "Part_Circle_Parametric.svg";
+  sPixmap = "Part_Circle_Parametric";
 }
 
 ViewProviderCircleParametric::~ViewProviderCircleParametric()
diff --git a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp
index cb078a496d..66a29d0232 100644
--- a/src/Mod/Part/Gui/ViewProviderConeParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderConeParametric.cpp
@@ -41,7 +41,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderConeParametric, PartGui::ViewProviderPart)
        
 ViewProviderConeParametric::ViewProviderConeParametric()
 {
-  sPixmap = "Tree_Part_Cone_Parametric.svg";
+  sPixmap = "Part_Cone_Parametric";
 }
 
 ViewProviderConeParametric::~ViewProviderConeParametric()
diff --git a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp
index cdcc244f6a..24b9542cc7 100644
--- a/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderCylinderParametric.cpp
@@ -41,7 +41,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderCylinderParametric, PartGui::ViewProviderPa
 
 ViewProviderCylinderParametric::ViewProviderCylinderParametric()
 {
-  sPixmap = "Tree_Part_Cylinder_Parametric.svg";
+  sPixmap = "Part_Cylinder_Parametric";
 }
 
 ViewProviderCylinderParametric::~ViewProviderCylinderParametric()
diff --git a/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp b/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp
index af1937d15a..b3d7bda1b6 100644
--- a/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderEllipseParametric.cpp
@@ -41,7 +41,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderEllipseParametric, PartGui::ViewProviderPar
 
 ViewProviderEllipseParametric::ViewProviderEllipseParametric()
 {
-  sPixmap = "Part_Ellipse_Parametric.svg";
+  sPixmap = "Part_Ellipse_Parametric";
 }
 
 ViewProviderEllipseParametric::~ViewProviderEllipseParametric()
diff --git a/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp b/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp
index 9c453e67c5..ff39b7e10e 100644
--- a/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp
@@ -37,7 +37,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderHelixParametric, PartGui::ViewProviderSplin
 
 ViewProviderHelixParametric::ViewProviderHelixParametric()
 {
-    sPixmap = "Part_Helix_Parametric.svg";
+    sPixmap = "Part_Helix_Parametric";
 }
 
 ViewProviderHelixParametric::~ViewProviderHelixParametric()
@@ -62,7 +62,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderSpiralParametric, PartGui::ViewProviderSpli
 
 ViewProviderSpiralParametric::ViewProviderSpiralParametric()
 {
-    sPixmap = "Part_Spiral_Parametric.svg";
+    sPixmap = "Part_Spiral_Parametric";
 }
 
 ViewProviderSpiralParametric::~ViewProviderSpiralParametric()
diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp
index 65d688e0d4..44b04042fc 100644
--- a/src/Mod/Part/Gui/ViewProviderLineParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderLineParametric.cpp
@@ -41,7 +41,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderLineParametric, PartGui::ViewProviderPart)
 
 ViewProviderLineParametric::ViewProviderLineParametric()
 {
-  sPixmap = "Part_Line_Parametric.svg";
+  sPixmap = "Part_Line_Parametric";
 }
 
 ViewProviderLineParametric::~ViewProviderLineParametric()
diff --git a/src/Mod/Part/Gui/ViewProviderMirror.cpp b/src/Mod/Part/Gui/ViewProviderMirror.cpp
index 92ce5e1f73..45c1bfee9c 100644
--- a/src/Mod/Part/Gui/ViewProviderMirror.cpp
+++ b/src/Mod/Part/Gui/ViewProviderMirror.cpp
@@ -63,7 +63,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderMirror, PartGui::ViewProviderPart)
 
 ViewProviderMirror::ViewProviderMirror()
 {
-    sPixmap = "Part_Mirror.svg";
+    sPixmap = "Part_Mirror";
     pcEditNode = new SoSeparator();
     pcEditNode->ref();
 }
diff --git a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp
index 148769504c..b579b64c92 100644
--- a/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderPlaneParametric.cpp
@@ -41,7 +41,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderPlaneParametric, PartGui::ViewProviderPart)
 
 ViewProviderPlaneParametric::ViewProviderPlaneParametric()
 {
-    sPixmap = "Tree_Part_Plane_Parametric.svg";
+    sPixmap = "Part_Plane_Parametric";
 }
 
 ViewProviderPlaneParametric::~ViewProviderPlaneParametric()
diff --git a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp
index e553c5ba88..3719954993 100644
--- a/src/Mod/Part/Gui/ViewProviderPointParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderPointParametric.cpp
@@ -41,7 +41,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderPointParametric, PartGui::ViewProviderPart)
 
 ViewProviderPointParametric::ViewProviderPointParametric()
 {
-  sPixmap = "Part_Point_Parametric.svg";
+  sPixmap = "Part_Point_Parametric";
 }
 
 ViewProviderPointParametric::~ViewProviderPointParametric()
diff --git a/src/Mod/Part/Gui/ViewProviderPrism.cpp b/src/Mod/Part/Gui/ViewProviderPrism.cpp
index 30eb9473e1..ed03821b65 100644
--- a/src/Mod/Part/Gui/ViewProviderPrism.cpp
+++ b/src/Mod/Part/Gui/ViewProviderPrism.cpp
@@ -40,7 +40,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderPrism, PartGui::ViewProviderPart)
 
 ViewProviderPrism::ViewProviderPrism()
 {
-    sPixmap = "Tree_Part_Prism.svg";
+    sPixmap = "Part_Prism_Parametric";
 }
 
 ViewProviderPrism::~ViewProviderPrism()
@@ -72,7 +72,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderWedge, PartGui::ViewProviderPart)
 
 ViewProviderWedge::ViewProviderWedge()
 {
-    sPixmap = "Tree_Part_Wedge.svg";
+    sPixmap = "Part_Wedge_Parametric";
 }
 
 ViewProviderWedge::~ViewProviderWedge()
diff --git a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp
index 4257b4789b..00e0ba43a5 100644
--- a/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp
+++ b/src/Mod/Part/Gui/ViewProviderRegularPolygon.cpp
@@ -40,7 +40,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderRegularPolygon, PartGui::ViewProviderPart)
        
 ViewProviderRegularPolygon::ViewProviderRegularPolygon()
 {
-  sPixmap = "Part_Polygon_Parametric.svg";
+  sPixmap = "Part_Polygon_Parametric";
 }
 
 ViewProviderRegularPolygon::~ViewProviderRegularPolygon()
diff --git a/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp b/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp
index 1441e8fa18..b048625bde 100644
--- a/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderSphereParametric.cpp
@@ -38,7 +38,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderSphereParametric, PartGui::ViewProviderPart
 
 ViewProviderSphereParametric::ViewProviderSphereParametric()
 {
-  sPixmap = "Tree_Part_Sphere_Parametric.svg";
+  sPixmap = "Part_Sphere_Parametric";
 }
 
 ViewProviderSphereParametric::~ViewProviderSphereParametric()
@@ -65,7 +65,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderEllipsoid, PartGui::ViewProviderPart)
 
 ViewProviderEllipsoid::ViewProviderEllipsoid()
 {
-    sPixmap = "Tree_Part_Ellipsoid_Parametric.svg";
+    sPixmap = "Part_Ellipsoid_Parametric";
 }
 
 ViewProviderEllipsoid::~ViewProviderEllipsoid()
diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp
index e5e5ad5d01..8a67c6a56c 100644
--- a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp
+++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp
@@ -41,7 +41,7 @@ PROPERTY_SOURCE(PartGui::ViewProviderTorusParametric, PartGui::ViewProviderPart)
 
 ViewProviderTorusParametric::ViewProviderTorusParametric()
 {
-  sPixmap = "Tree_Part_Torus_Parametric.svg";
+  sPixmap = "Part_Torus_Parametric";
 }
 
 ViewProviderTorusParametric::~ViewProviderTorusParametric()