diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
index 814808e082..967f49f7ce 100644
--- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
+++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
@@ -109,40 +109,44 @@
         <file>icons/Sketcher_Crosshair.svg</file>
         <file>icons/Sketcher_DraftLine.svg</file>
         <file>icons/Sketcher_EditSketch.svg</file>
-        <file>icons/Sketcher_Element_Arc_Edge.svg</file>
-        <file>icons/Sketcher_Element_Arc_EndPoint.svg</file>
-        <file>icons/Sketcher_Element_Arc_MidPoint.svg</file>
-        <file>icons/Sketcher_Element_Arc_StartingPoint.svg</file>
-        <file>icons/Sketcher_Element_BSpline_Edge.svg</file>
-        <file>icons/Sketcher_Element_BSpline_EndPoint.svg</file>
-        <file>icons/Sketcher_Element_BSpline_StartPoint.svg</file>
-        <file>icons/Sketcher_Element_Circle_Edge.svg</file>
-        <file>icons/Sketcher_Element_Circle_MidPoint.svg</file>
-        <file>icons/Sketcher_Element_Ellipse_All.svg</file>
-        <file>icons/Sketcher_Element_Ellipse_CentrePoint.svg</file>
-        <file>icons/Sketcher_Element_Ellipse_Edge_1.svg</file>
-        <file>icons/Sketcher_Element_Ellipse_Edge_2.svg</file>
-        <file>icons/Sketcher_Element_Ellipse_Focus1.svg</file>
-        <file>icons/Sketcher_Element_Ellipse_Focus2.svg</file>
-        <file>icons/Sketcher_Element_Ellipse_MajorAxis.svg</file>
-        <file>icons/Sketcher_Element_Ellipse_MinorAxis.svg</file>
-        <file>icons/Sketcher_Element_Elliptical_Arc_Centre_Point.svg</file>
-        <file>icons/Sketcher_Element_Elliptical_Arc_Edge.svg</file>
-        <file>icons/Sketcher_Element_Elliptical_Arc_End_Point.svg</file>
-        <file>icons/Sketcher_Element_Elliptical_Arc_Start_Point.svg</file>
-        <file>icons/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg</file>
-        <file>icons/Sketcher_Element_Hyperbolic_Arc_Edge.svg</file>
-        <file>icons/Sketcher_Element_Hyperbolic_Arc_End_Point.svg</file>
-        <file>icons/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg</file>
-        <file>icons/Sketcher_Element_Line_Edge.svg</file>
-        <file>icons/Sketcher_Element_Line_EndPoint.svg</file>
-        <file>icons/Sketcher_Element_Line_StartingPoint.svg</file>
-        <file>icons/Sketcher_Element_Parabolic_Arc_Centre_Point.svg</file>
-        <file>icons/Sketcher_Element_Parabolic_Arc_Edge.svg</file>
-        <file>icons/Sketcher_Element_Parabolic_Arc_End_Point.svg</file>
-        <file>icons/Sketcher_Element_Parabolic_Arc_Start_Point.svg</file>
-        <file>icons/Sketcher_Element_Point_StartingPoint.svg</file>
-        <file>icons/Sketcher_Element_SelectionTypeInvalid.svg</file>
+    </qresource>
+    <qresource>
+        <file>icons/elements/Sketcher_Element_Arc_Edge.svg</file>
+        <file>icons/elements/Sketcher_Element_Arc_EndPoint.svg</file>
+        <file>icons/elements/Sketcher_Element_Arc_MidPoint.svg</file>
+        <file>icons/elements/Sketcher_Element_Arc_StartingPoint.svg</file>
+        <file>icons/elements/Sketcher_Element_BSpline_Edge.svg</file>
+        <file>icons/elements/Sketcher_Element_BSpline_EndPoint.svg</file>
+        <file>icons/elements/Sketcher_Element_BSpline_StartPoint.svg</file>
+        <file>icons/elements/Sketcher_Element_Circle_Edge.svg</file>
+        <file>icons/elements/Sketcher_Element_Circle_MidPoint.svg</file>
+        <file>icons/elements/Sketcher_Element_Ellipse_All.svg</file>
+        <file>icons/elements/Sketcher_Element_Ellipse_CentrePoint.svg</file>
+        <file>icons/elements/Sketcher_Element_Ellipse_Edge_1.svg</file>
+        <file>icons/elements/Sketcher_Element_Ellipse_Edge_2.svg</file>
+        <file>icons/elements/Sketcher_Element_Ellipse_Focus1.svg</file>
+        <file>icons/elements/Sketcher_Element_Ellipse_Focus2.svg</file>
+        <file>icons/elements/Sketcher_Element_Ellipse_MajorAxis.svg</file>
+        <file>icons/elements/Sketcher_Element_Ellipse_MinorAxis.svg</file>
+        <file>icons/elements/Sketcher_Element_Elliptical_Arc_Centre_Point.svg</file>
+        <file>icons/elements/Sketcher_Element_Elliptical_Arc_Edge.svg</file>
+        <file>icons/elements/Sketcher_Element_Elliptical_Arc_End_Point.svg</file>
+        <file>icons/elements/Sketcher_Element_Elliptical_Arc_Start_Point.svg</file>
+        <file>icons/elements/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg</file>
+        <file>icons/elements/Sketcher_Element_Hyperbolic_Arc_Edge.svg</file>
+        <file>icons/elements/Sketcher_Element_Hyperbolic_Arc_End_Point.svg</file>
+        <file>icons/elements/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg</file>
+        <file>icons/elements/Sketcher_Element_Line_Edge.svg</file>
+        <file>icons/elements/Sketcher_Element_Line_EndPoint.svg</file>
+        <file>icons/elements/Sketcher_Element_Line_StartingPoint.svg</file>
+        <file>icons/elements/Sketcher_Element_Parabolic_Arc_Centre_Point.svg</file>
+        <file>icons/elements/Sketcher_Element_Parabolic_Arc_Edge.svg</file>
+        <file>icons/elements/Sketcher_Element_Parabolic_Arc_End_Point.svg</file>
+        <file>icons/elements/Sketcher_Element_Parabolic_Arc_Start_Point.svg</file>
+        <file>icons/elements/Sketcher_Element_Point_StartingPoint.svg</file>
+        <file>icons/elements/Sketcher_Element_SelectionTypeInvalid.svg</file>
+    </qresource>
+    <qresource>
         <file>icons/Sketcher_Elliptical_Arc.svg</file>
         <file>icons/Sketcher_Elliptical_Arc_Constr.svg</file>
         <file>icons/Sketcher_Extend.svg</file>
@@ -158,26 +162,30 @@
         <file alias="icons/preferences-sketcher.svg">icons/Sketcher_NewSketch.svg</file>
         <file>icons/Sketcher_Parabolic_Arc.svg</file>
         <file>icons/Sketcher_Parabolic_Arc_Constr.svg</file>
-        <file>icons/Sketcher_Pointer_CarbonCopy.svg</file>
-        <file>icons/Sketcher_Pointer_Create_3PointArc.svg</file>
-        <file>icons/Sketcher_Pointer_Create_3PointCircle.svg</file>
-        <file>icons/Sketcher_Pointer_Create_Arc.svg</file>
-        <file>icons/Sketcher_Pointer_Create_ArcOfEllipse.svg</file>
-        <file>icons/Sketcher_Pointer_Create_ArcOfHyperbola.svg</file>
-        <file>icons/Sketcher_Pointer_Create_ArcOfParabola.svg</file>
-        <file>icons/Sketcher_Pointer_Create_Box.svg</file>
-        <file>icons/Sketcher_Pointer_Create_BSpline.svg</file>
-        <file>icons/Sketcher_Pointer_Create_Circle.svg</file>
-        <file>icons/Sketcher_Pointer_Create_Ellipse.svg</file>
-        <file>icons/Sketcher_Pointer_Create_Fillet.svg</file>
-        <file>icons/Sketcher_Pointer_Create_Line.svg</file>
-        <file>icons/Sketcher_Pointer_Create_Lineset.svg</file>
-        <file>icons/Sketcher_Pointer_Create_Point.svg</file>
-        <file>icons/Sketcher_Pointer_Extension.svg</file>
-        <file>icons/Sketcher_Pointer_External.svg</file>
-        <file>icons/Sketcher_Pointer_Regular_Polygon.svg</file>
-        <file>icons/Sketcher_Pointer_Slot.svg</file>
-        <file>icons/Sketcher_Pointer_Trimming.svg</file>
+    </qresource>
+    <qresource>
+        <file>icons/pointers/Sketcher_Pointer_CarbonCopy.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_3PointArc.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_3PointCircle.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_Arc.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_ArcOfEllipse.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_ArcOfHyperbola.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_ArcOfParabola.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_Box.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_BSpline.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_Circle.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_Ellipse.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_Fillet.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_Line.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_Lineset.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Create_Point.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Extension.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_External.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Regular_Polygon.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Slot.svg</file>
+        <file>icons/pointers/Sketcher_Pointer_Trimming.svg</file>
+    </qresource>
+    <qresource>
         <file>icons/Sketcher_ProfilesHexagon1.svg</file>
         <file>icons/Sketcher_RectangularArray.svg</file>
         <file>icons/Sketcher_SelectConflictingConstraints.svg</file>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_Edge.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_Edge.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_Edge.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_EndPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_EndPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_EndPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_EndPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_MidPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_MidPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_MidPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_MidPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_StartingPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_StartingPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Arc_StartingPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Arc_StartingPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_Edge.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_Edge.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_Edge.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_EndPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_EndPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_EndPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_EndPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_StartPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_StartPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_BSpline_StartPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_BSpline_StartPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_Edge.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_Edge.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_Edge.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_MidPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_MidPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Circle_MidPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Circle_MidPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_All.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_All.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_All.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_All.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_CentrePoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_CentrePoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_CentrePoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_CentrePoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_1.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_1.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_1.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_1.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_2.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_2.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Edge_2.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Edge_2.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus1.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus1.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus1.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus1.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus2.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus2.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_Focus2.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_Focus2.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MajorAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MajorAxis.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MajorAxis.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MajorAxis.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MinorAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MinorAxis.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Ellipse_MinorAxis.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Ellipse_MinorAxis.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Centre_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Centre_Point.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Centre_Point.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Centre_Point.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Edge.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Edge.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Edge.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_End_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_End_Point.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_End_Point.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_End_Point.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Start_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Start_Point.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Elliptical_Arc_Start_Point.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Elliptical_Arc_Start_Point.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Centre_Point.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Edge.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Edge.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Edge.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_End_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_End_Point.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_End_Point.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_End_Point.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Hyperbolic_Arc_Start_Point.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_Edge.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_Edge.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_Edge.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_EndPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_EndPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_EndPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_EndPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_StartingPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_StartingPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Line_StartingPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Line_StartingPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Centre_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Centre_Point.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Centre_Point.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Centre_Point.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Edge.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Edge.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Edge.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Edge.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_End_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_End_Point.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_End_Point.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_End_Point.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Start_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Start_Point.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Parabolic_Arc_Start_Point.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Parabolic_Arc_Start_Point.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Point_StartingPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Point_StartingPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_Point_StartingPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_Point_StartingPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_SelectionTypeInvalid.svg b/src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_SelectionTypeInvalid.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Element_SelectionTypeInvalid.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/elements/Sketcher_Element_SelectionTypeInvalid.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_CarbonCopy.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_CarbonCopy.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_CarbonCopy.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_CarbonCopy.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_3PointArc.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointArc.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_3PointArc.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointArc.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_3PointCircle.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointCircle.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_3PointCircle.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_3PointCircle.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Arc.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Arc.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Arc.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Arc.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_ArcOfEllipse.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfEllipse.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_ArcOfEllipse.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfEllipse.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_ArcOfHyperbola.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfHyperbola.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_ArcOfHyperbola.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfHyperbola.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_ArcOfParabola.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfParabola.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_ArcOfParabola.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_ArcOfParabola.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_BSpline.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_BSpline.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_BSpline.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_BSpline.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Box.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Box.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Box.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Circle.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Circle.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Circle.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Circle.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Ellipse.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Ellipse.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Ellipse.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Ellipse.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Fillet.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Fillet.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Fillet.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Fillet.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Line.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Line.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Line.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Line.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Lineset.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Lineset.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Lineset.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Lineset.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Point.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Point.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Create_Point.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Create_Point.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Extension.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Extension.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Extension.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Extension.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_External.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_External.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_External.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_External.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Regular_Polygon.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Regular_Polygon.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Regular_Polygon.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Regular_Polygon.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Slot.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Slot.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Slot.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Slot.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Trimming.svg b/src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Trimming.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Pointer_Trimming.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/pointers/Sketcher_Pointer_Trimming.svg
diff --git a/src/Mod/Sketcher/InitGui.py b/src/Mod/Sketcher/InitGui.py
index b34178b6f3..e4bfba14c8 100644
--- a/src/Mod/Sketcher/InitGui.py
+++ b/src/Mod/Sketcher/InitGui.py
@@ -43,7 +43,9 @@ class SketcherWorkbench ( Workbench ):
         import SketcherGui
         import Sketcher
         Gui.addIconPath(":/icons/constraints")
+        Gui.addIconPath(":/icons/elements")
         # Gui.addIconPath(":/icons/obsolete")
+        Gui.addIconPath(":/icons/pointers")
         try:
             import Profiles
         except ImportError: