diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
index 6656df0063..814808e082 100644
--- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
+++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
@@ -1,48 +1,48 @@
 <RCC>
     <qresource>
-        <file>icons/Constraint_Block.svg</file>
-        <file>icons/Constraint_Concentric.svg</file>
-        <file>icons/Constraint_Diameter.svg</file>
-        <file>icons/Constraint_Diameter_Driven.svg</file>
-        <file>icons/Constraint_Ellipse_Axis_Angle.svg</file>
-        <file>icons/Constraint_Ellipse_Major_Radius.svg</file>
-        <file>icons/Constraint_Ellipse_Minor_Radius.svg</file>
-        <file>icons/Constraint_Ellipse_Radii.svg</file>
-        <file>icons/Constraint_EqualLength.svg</file>
-        <file>icons/Constraint_ExternalAngle.svg</file>
-        <file>icons/Constraint_Horizontal.svg</file>
-        <file>icons/Constraint_HorizontalDistance.svg</file>
-        <file>icons/Constraint_HorizontalDistance_Driven.svg</file>
-        <file>icons/Constraint_InternalAlignment.svg</file>
-        <file>icons/Constraint_InternalAlignment_Ellipse_Focus1.svg</file>
-        <file>icons/Constraint_InternalAlignment_Ellipse_Focus2.svg</file>
-        <file>icons/Constraint_InternalAlignment_Ellipse_MajorAxis.svg</file>
-        <file>icons/Constraint_InternalAlignment_Ellipse_MinorAxis.svg</file>
-        <file>icons/Constraint_InternalAngle.svg</file>
-        <file>icons/Constraint_InternalAngle_Driven.svg</file>
-        <file>icons/Constraint_Length.svg</file>
-        <file>icons/Constraint_Length_Driven.svg</file>
-        <file>icons/Constraint_Lock.svg</file>
-        <file>icons/Constraint_Lock_Driven.svg</file>
-        <file>icons/Constraint_Parallel.svg</file>
-        <file>icons/Constraint_Perpendicular.svg</file>
-        <file>icons/Constraint_PointOnEnd.svg</file>
-        <file>icons/Constraint_PointOnMidPoint.svg</file>
-        <file>icons/Constraint_PointOnObject.svg</file>
-        <file>icons/Constraint_PointOnPoint.svg</file>
-        <file>icons/Constraint_PointOnStart.svg</file>
-        <file>icons/Constraint_PointToObject.svg</file>
-        <file>icons/Constraint_Radius.svg</file>
-        <file>icons/Constraint_Radius_Driven.svg</file>
-        <file>icons/Constraint_SnellsLaw.svg</file>
-        <file>icons/Constraint_SnellsLaw_Driven.svg</file>
-        <file>icons/Constraint_Symmetric.svg</file>
-        <file>icons/Constraint_Tangent.svg</file>
-        <file>icons/Constraint_TangentToEnd.svg</file>
-        <file>icons/Constraint_TangentToStart.svg</file>
-        <file>icons/Constraint_Vertical.svg</file>
-        <file>icons/Constraint_VerticalDistance.svg</file>
-        <file>icons/Constraint_VerticalDistance_Driven.svg</file>
+        <file>icons/constraints/Constraint_Block.svg</file>
+        <file>icons/constraints/Constraint_Concentric.svg</file>
+        <file>icons/constraints/Constraint_Diameter.svg</file>
+        <file>icons/constraints/Constraint_Diameter_Driven.svg</file>
+        <file>icons/constraints/Constraint_Ellipse_Axis_Angle.svg</file>
+        <file>icons/constraints/Constraint_Ellipse_Major_Radius.svg</file>
+        <file>icons/constraints/Constraint_Ellipse_Minor_Radius.svg</file>
+        <file>icons/constraints/Constraint_Ellipse_Radii.svg</file>
+        <file>icons/constraints/Constraint_EqualLength.svg</file>
+        <file>icons/constraints/Constraint_ExternalAngle.svg</file>
+        <file>icons/constraints/Constraint_Horizontal.svg</file>
+        <file>icons/constraints/Constraint_HorizontalDistance.svg</file>
+        <file>icons/constraints/Constraint_HorizontalDistance_Driven.svg</file>
+        <file>icons/constraints/Constraint_InternalAlignment.svg</file>
+        <file>icons/constraints/Constraint_InternalAlignment_Ellipse_Focus1.svg</file>
+        <file>icons/constraints/Constraint_InternalAlignment_Ellipse_Focus2.svg</file>
+        <file>icons/constraints/Constraint_InternalAlignment_Ellipse_MajorAxis.svg</file>
+        <file>icons/constraints/Constraint_InternalAlignment_Ellipse_MinorAxis.svg</file>
+        <file>icons/constraints/Constraint_InternalAngle.svg</file>
+        <file>icons/constraints/Constraint_InternalAngle_Driven.svg</file>
+        <file>icons/constraints/Constraint_Length.svg</file>
+        <file>icons/constraints/Constraint_Length_Driven.svg</file>
+        <file>icons/constraints/Constraint_Lock.svg</file>
+        <file>icons/constraints/Constraint_Lock_Driven.svg</file>
+        <file>icons/constraints/Constraint_Parallel.svg</file>
+        <file>icons/constraints/Constraint_Perpendicular.svg</file>
+        <file>icons/constraints/Constraint_PointOnEnd.svg</file>
+        <file>icons/constraints/Constraint_PointOnMidPoint.svg</file>
+        <file>icons/constraints/Constraint_PointOnObject.svg</file>
+        <file>icons/constraints/Constraint_PointOnPoint.svg</file>
+        <file>icons/constraints/Constraint_PointOnStart.svg</file>
+        <file>icons/constraints/Constraint_PointToObject.svg</file>
+        <file>icons/constraints/Constraint_Radius.svg</file>
+        <file>icons/constraints/Constraint_Radius_Driven.svg</file>
+        <file>icons/constraints/Constraint_SnellsLaw.svg</file>
+        <file>icons/constraints/Constraint_SnellsLaw_Driven.svg</file>
+        <file>icons/constraints/Constraint_Symmetric.svg</file>
+        <file>icons/constraints/Constraint_Tangent.svg</file>
+        <file>icons/constraints/Constraint_TangentToEnd.svg</file>
+        <file>icons/constraints/Constraint_TangentToStart.svg</file>
+        <file>icons/constraints/Constraint_Vertical.svg</file>
+        <file>icons/constraints/Constraint_VerticalDistance.svg</file>
+        <file>icons/constraints/Constraint_VerticalDistance_Driven.svg</file>
     </qresource>
     <qresource>
         <file>icons/Sketcher_AlterFillet.svg</file>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Block.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Block.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Block.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Block.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Concentric.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Concentric.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Concentric.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Concentric.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Diameter.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Diameter.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Diameter.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Diameter.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Diameter_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Diameter_Driven.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Diameter_Driven.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Diameter_Driven.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Axis_Angle.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Ellipse_Axis_Angle.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Axis_Angle.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Ellipse_Axis_Angle.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Major_Radius.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Ellipse_Major_Radius.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Major_Radius.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Ellipse_Major_Radius.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Minor_Radius.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Ellipse_Minor_Radius.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Minor_Radius.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Ellipse_Minor_Radius.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Radii.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Ellipse_Radii.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Ellipse_Radii.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Ellipse_Radii.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_EqualLength.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_EqualLength.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_EqualLength.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_EqualLength.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_ExternalAngle.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_ExternalAngle.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_ExternalAngle.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_ExternalAngle.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Horizontal.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Horizontal.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Horizontal.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Horizontal.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_HorizontalDistance.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_HorizontalDistance.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_HorizontalDistance_Driven.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_HorizontalDistance_Driven.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_HorizontalDistance_Driven.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAlignment.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAlignment.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus1.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAlignment_Ellipse_Focus1.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus1.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAlignment_Ellipse_Focus1.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus2.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAlignment_Ellipse_Focus2.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_Focus2.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAlignment_Ellipse_Focus2.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MajorAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAlignment_Ellipse_MajorAxis.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MajorAxis.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAlignment_Ellipse_MajorAxis.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MinorAxis.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAlignment_Ellipse_MinorAxis.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAlignment_Ellipse_MinorAxis.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAlignment_Ellipse_MinorAxis.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAngle.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAngle.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAngle_Driven.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_InternalAngle_Driven.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_InternalAngle_Driven.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Length.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Length.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Length_Driven.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Length_Driven.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Length_Driven.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Lock.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Lock.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Lock.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Lock.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Lock_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Lock_Driven.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Lock_Driven.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Lock_Driven.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Parallel.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Parallel.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Parallel.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Parallel.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Perpendicular.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Perpendicular.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Perpendicular.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Perpendicular.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnEnd.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointOnEnd.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnEnd.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointOnEnd.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnMidPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointOnMidPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnMidPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointOnMidPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnObject.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointOnObject.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnObject.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointOnObject.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnPoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointOnPoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnPoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointOnPoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnStart.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointOnStart.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointOnStart.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointOnStart.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointToObject.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointToObject.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_PointToObject.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_PointToObject.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Radius.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Radius.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Radius_Driven.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Radius_Driven.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Radius_Driven.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_SnellsLaw.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_SnellsLaw.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_SnellsLaw_Driven.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_SnellsLaw_Driven.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_SnellsLaw_Driven.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Symmetric.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Symmetric.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Symmetric.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Symmetric.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Tangent.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Tangent.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Tangent.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Tangent.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToEnd.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_TangentToEnd.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToEnd.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_TangentToEnd.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToStart.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_TangentToStart.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_TangentToStart.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_TangentToStart.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_Vertical.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Vertical.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_Vertical.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_Vertical.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_VerticalDistance.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_VerticalDistance.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_VerticalDistance_Driven.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Constraint_VerticalDistance_Driven.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Constraint_VerticalDistance_Driven.svg
diff --git a/src/Mod/Sketcher/InitGui.py b/src/Mod/Sketcher/InitGui.py
index 33d3231e45..b34178b6f3 100644
--- a/src/Mod/Sketcher/InitGui.py
+++ b/src/Mod/Sketcher/InitGui.py
@@ -42,6 +42,7 @@ class SketcherWorkbench ( Workbench ):
         # load the module
         import SketcherGui
         import Sketcher
+        Gui.addIconPath(":/icons/constraints")
         # Gui.addIconPath(":/icons/obsolete")
         try:
             import Profiles