diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
index 1dce561897..5c6e9e6495 100644
--- a/src/Mod/Part/Gui/AppPartGui.cpp
+++ b/src/Mod/Part/Gui/AppPartGui.cpp
@@ -126,6 +126,7 @@ PyMOD_INIT_FUNC(PartGui)
     Base::Console().Log("Loading GUI of Part module... done\n");
 
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/create"));
+    Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/tools"));
 
 #if PY_MAJOR_VERSION >= 3
     static struct PyModuleDef pAttachEngineTextsModuleDef = {
diff --git a/src/Mod/Part/Gui/Resources/Part.qrc b/src/Mod/Part/Gui/Resources/Part.qrc
index 06a284800f..64a837a6e4 100644
--- a/src/Mod/Part/Gui/Resources/Part.qrc
+++ b/src/Mod/Part/Gui/Resources/Part.qrc
@@ -9,12 +9,25 @@
         <file>icons/create/Part_Torus.svg</file>
         <file>icons/create/Part_Tube.svg</file>
     </qresource>
+    <qresource>
+        <file>icons/tools/Part_Chamfer.svg</file>
+        <file>icons/tools/Part_Extrude.svg</file>
+        <file>icons/tools/Part_Fillet.svg</file>
+        <file>icons/tools/Part_Loft.svg</file>
+        <file>icons/tools/Part_Mirror.svg</file>
+        <file>icons/tools/Part_Offset.svg</file>
+        <file>icons/tools/Part_Offset2D.svg</file>
+        <file>icons/tools/Part_ProjectionOnSurface.svg</file>
+        <file>icons/tools/Part_Revolve.svg</file>
+        <file>icons/tools/Part_RuledSurface.svg</file>
+        <file>icons/tools/Part_Sweep.svg</file>
+        <file>icons/tools/Part_Thickness.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_BoxSelection.svg</file>
-        <file>icons/Part_Chamfer.svg</file>
         <file>icons/Part_CheckGeometry.svg</file>
         <file>icons/Part_Circle_Parametric.svg</file>
         <file>icons/Part_Common.svg</file>
@@ -27,10 +40,8 @@
         <file>icons/Part_Ellipse_Parametric.svg</file>
         <file>icons/Part_ExplodeCompound.svg</file>
         <file>icons/Part_Export.svg</file>
-        <file>icons/Part_Extrude.svg</file>
         <file>icons/Part_Feature.svg</file>
         <file>icons/Part_FeatureImport.svg</file>
-        <file>icons/Part_Fillet.svg</file>
         <file>icons/Part_Fuse.svg</file>
         <file>icons/Part_Helix_Parametric.svg</file>
         <file>icons/Part_Import.svg</file>
@@ -39,7 +50,6 @@
         <file>icons/Part_JoinCutout.svg</file>
         <file>icons/Part_JoinEmbed.svg</file>
         <file>icons/Part_Line_Parametric.svg</file>
-        <file>icons/Part_Loft.svg</file>
         <file>icons/Part_Measure_Angular.svg</file>
         <file>icons/Part_Measure_Linear.svg</file>
         <file>icons/Part_Measure_Refresh.svg</file>
@@ -47,17 +57,11 @@
         <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_Mirror.svg</file>
-        <file>icons/Part_Offset.svg</file>
-        <file>icons/Part_Offset2D.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_ProjectionOnSurface.svg</file>
         <file>icons/Part_Refine_Shape.svg</file>
         <file>icons/Part_Reverse_Shape.svg</file>
-        <file>icons/Part_Revolve.svg</file>
-        <file>icons/Part_RuledSurface.svg</file>
         <file>icons/Part_Section.svg</file>
         <file>icons/Part_Shape_from_Mesh.svg</file>
         <file>icons/Part_ShapeInfo.svg</file>
@@ -65,8 +69,6 @@
         <file>icons/Part_SliceApart.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_Transformed_Copy.svg</file>
         <file>icons/PartWorkbench.svg</file>
         <file>icons/Part_XOR.svg</file>
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Chamfer.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Chamfer.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Chamfer.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Chamfer.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Extrude.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Extrude.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Extrude.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Extrude.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Fillet.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Fillet.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Fillet.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Fillet.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Loft.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Loft.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Loft.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Loft.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Mirror.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Mirror.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Mirror.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Mirror.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Offset.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Offset.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Offset.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Offset.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Offset2D.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Offset2D.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Offset2D.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Offset2D.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_ProjectionOnSurface.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_ProjectionOnSurface.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_ProjectionOnSurface.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_ProjectionOnSurface.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Revolve.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Revolve.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Revolve.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Revolve.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_RuledSurface.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_RuledSurface.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_RuledSurface.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_RuledSurface.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Sweep.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Sweep.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Sweep.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Sweep.svg
diff --git a/src/Mod/Part/Gui/Resources/icons/Part_Thickness.svg b/src/Mod/Part/Gui/Resources/icons/tools/Part_Thickness.svg
similarity index 100%
rename from src/Mod/Part/Gui/Resources/icons/Part_Thickness.svg
rename to src/Mod/Part/Gui/Resources/icons/tools/Part_Thickness.svg