diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index 04f4f274ab..90ef44ee5a 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -183,7 +183,8 @@ void removeRedundantHorizontalVertical(Sketcher::SketchObject* psketch,
                     const std::map<int, Sketcher::PointPos> coincidents = psketch->getAllCoincidentPoints((*it).GeoId, (*it).PosId);
 
                     if(!coincidents.empty()) {
-                        ext = coincidents.begin()->first < 0; // the keys are ordered, so if the first is negative, it is coincident with external
+                        // the keys are ordered, so if the first is negative, it is coincident with external
+                        ext = coincidents.begin()->first < 0;
 
                         std::map<int, Sketcher::PointPos>::const_iterator geoId1iterator;
 
@@ -6083,7 +6084,7 @@ namespace SketcherGui {
     {
         sAppModule      = "Sketcher";
         sGroup          = QT_TR_NOOP("Sketcher");
-        sMenuText       = QT_TR_NOOP("CarbonCopy");
+        sMenuText       = QT_TR_NOOP("Carbon copy");
         sToolTipText    = QT_TR_NOOP("Copies the geometry of another sketch");
         sWhatsThis      = "Sketcher_CarbonCopy";
         sStatusTip      = sToolTipText;
diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
index 644a5f62ce..e7a1464207 100644
--- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
+++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
@@ -1,31 +1,15 @@
 <RCC>
     <qresource>
-        <file>icons/Sketcher_AlterFillet.svg</file>
-        <file>icons/Sketcher_CarbonCopy.svg</file>
-        <file>icons/Sketcher_CarbonCopy_Constr.svg</file>
-        <file>icons/Sketcher_Crosshair.svg</file>
-        <file>icons/Sketcher_DraftLine.svg</file>
         <file>icons/Sketcher_EditSketch.svg</file>
-        <file>icons/Sketcher_Extend.svg</file>
-        <file>icons/Sketcher_External.svg</file>
         <file>icons/Sketcher_LeaveSketch.svg</file>
         <file>icons/Sketcher_MapSketch.svg</file>
         <file>icons/Sketcher_MergeSketch.svg</file>
         <file>icons/Sketcher_MirrorSketch.svg</file>
         <file>icons/Sketcher_NewSketch.svg</file>
         <file alias="icons/preferences-sketcher.svg">icons/Sketcher_NewSketch.svg</file>
-        <file>icons/Sketcher_ProfilesHexagon1.svg</file>
         <file>icons/Sketcher_ReorientSketch.svg</file>
         <file>icons/Sketcher_Sketch.svg</file>
         <file>icons/Sketcher_SwitchVirtualSpace.svg</file>
-        <file>icons/Sketcher_ToggleActiveConstraint.svg</file>
-        <file>icons/Sketcher_ToggleConstraint.svg</file>
-        <file>icons/Sketcher_Toggle_Constraint_Driven.svg</file>
-        <file>icons/Sketcher_Toggle_Constraint_Driving.svg</file>
-        <file>icons/Sketcher_ToggleConstruction.svg</file>
-        <file>icons/Sketcher_ToggleConstruction_old.svg</file>
-        <file>icons/Sketcher_ToggleNormal.svg</file>
-        <file>icons/Sketcher_Trimming.svg</file>
         <file>icons/Sketcher_ValidateSketch.svg</file>
         <file>icons/Sketcher_ViewSection.svg</file>
         <file>icons/Sketcher_ViewSketch.svg</file>
@@ -75,6 +59,11 @@
         <file>icons/constraints/Constraint_Vertical.svg</file>
         <file>icons/constraints/Constraint_VerticalDistance.svg</file>
         <file>icons/constraints/Constraint_VerticalDistance_Driven.svg</file>
+        <file>icons/constraints/Sketcher_Crosshair.svg</file>
+        <file>icons/constraints/Sketcher_ToggleActiveConstraint.svg</file>
+        <file>icons/constraints/Sketcher_ToggleConstraint.svg</file>
+        <file>icons/constraints/Sketcher_Toggle_Constraint_Driven.svg</file>
+        <file>icons/constraints/Sketcher_Toggle_Constraint_Driving.svg</file>
     </qresource>
     <qresource>
         <file>icons/elements/Sketcher_Element_Arc_Edge.svg</file>
@@ -113,6 +102,9 @@
         <file>icons/elements/Sketcher_Element_SelectionTypeInvalid.svg</file>
     </qresource>
     <qresource>
+        <file>icons/geometry/Sketcher_AlterFillet.svg</file>
+        <file>icons/geometry/Sketcher_CarbonCopy.svg</file>
+        <file>icons/geometry/Sketcher_CarbonCopy_Constr.svg</file>
         <file>icons/geometry/Sketcher_Conics.svg</file>
         <file>icons/geometry/Sketcher_Conics_Constr.svg</file>
         <file>icons/geometry/Sketcher_Conics_Ellipse_3points.svg</file>
@@ -164,6 +156,10 @@
         <file>icons/geometry/Sketcher_CreateText.svg</file>
         <file>icons/geometry/Sketcher_CreateTriangle.svg</file>
         <file>icons/geometry/Sketcher_CreateTriangle_Constr.svg</file>
+        <file>icons/geometry/Sketcher_Extend.svg</file>
+        <file>icons/geometry/Sketcher_External.svg</file>
+        <file>icons/geometry/Sketcher_ToggleConstruction.svg</file>
+        <file>icons/geometry/Sketcher_Trimming.svg</file>
     </qresource>
     <qresource>
         <file>icons/obsolete/Sketcher_ConstrainCoincident_old.svg</file>
@@ -171,6 +167,10 @@
         <file>icons/obsolete/Sketcher_ConstrainHorizontal_old.svg</file>
         <file>icons/obsolete/Sketcher_ConstrainParallel_old.svg</file>
         <file>icons/obsolete/Sketcher_ConstrainVertical_old.svg</file>
+        <file>icons/obsolete/Sketcher_DraftLine.svg</file>
+        <file>icons/obsolete/Sketcher_ProfilesHexagon1.svg</file>
+        <file>icons/obsolete/Sketcher_ToggleConstruction_old.svg</file>
+        <file>icons/obsolete/Sketcher_ToggleNormal.svg</file>
     </qresource>
     <qresource>
         <file>icons/pointers/Sketcher_Pointer_CarbonCopy.svg</file>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Crosshair.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Crosshair.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Crosshair.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Crosshair.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleActiveConstraint.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_ToggleActiveConstraint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleActiveConstraint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_ToggleActiveConstraint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstraint.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_ToggleConstraint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstraint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_ToggleConstraint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driven.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Toggle_Constraint_Driven.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driven.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Toggle_Constraint_Driven.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driving.svg b/src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Toggle_Constraint_Driving.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Toggle_Constraint_Driving.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/constraints/Sketcher_Toggle_Constraint_Driving.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterFillet.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_AlterFillet.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_AlterFillet.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_AlterFillet.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CarbonCopy.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CarbonCopy.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CarbonCopy.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CarbonCopy.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CarbonCopy_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CarbonCopy_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CarbonCopy_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CarbonCopy_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Extend.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Extend.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Extend.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Extend.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_External.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_External.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_External.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_External.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_ToggleConstruction.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_ToggleConstruction.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Trimming.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Trimming.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Trimming.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Trimming.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_DraftLine.svg b/src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_DraftLine.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_DraftLine.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_DraftLine.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ProfilesHexagon1.svg b/src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ProfilesHexagon1.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ProfilesHexagon1.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ProfilesHexagon1.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction_old.svg b/src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ToggleConstruction_old.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleConstruction_old.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ToggleConstruction_old.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleNormal.svg b/src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ToggleNormal.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_ToggleNormal.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/obsolete/Sketcher_ToggleNormal.svg