diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index 979930c60f..04f4f274ab 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -3196,7 +3196,7 @@ CmdSketcherCreateArcOfEllipse::CmdSketcherCreateArcOfEllipse()
     sToolTipText    = QT_TR_NOOP("Create an arc of ellipse in the sketch");
     sWhatsThis      = "Sketcher_CreateArcOfEllipse";
     sStatusTip      = sToolTipText;
-    sPixmap         = "Sketcher_Elliptical_Arc";
+    sPixmap         = "Sketcher_CreateElliptical_Arc";
     eType           = ForEdit;
 }
 
@@ -3539,7 +3539,7 @@ CmdSketcherCreateArcOfHyperbola::CmdSketcherCreateArcOfHyperbola()
     sToolTipText    = QT_TR_NOOP("Create an arc of hyperbola in the sketch");
     sWhatsThis      = "Sketcher_CreateArcOfHyperbola";
     sStatusTip      = sToolTipText;
-    sPixmap         = "Sketcher_Hyperbolic_Arc";
+    sPixmap         = "Sketcher_CreateHyperbolic_Arc";
     eType           = ForEdit;
 }
 
@@ -3837,7 +3837,7 @@ CmdSketcherCreateArcOfParabola::CmdSketcherCreateArcOfParabola()
     sToolTipText    = QT_TR_NOOP("Create an arc of parabola in the sketch");
     sWhatsThis      = "Sketcher_CreateArcOfParabola";
     sStatusTip      = sToolTipText;
-    sPixmap         = "Sketcher_Parabolic_Arc";
+    sPixmap         = "Sketcher_CreateParabolic_Arc";
     eType           = ForEdit;
 }
 
@@ -3914,13 +3914,13 @@ Gui::Action * CmdSketcherCompCreateConic::createAction(void)
     ellipseBy3Points->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_3points"));
 
     QAction* arcofellipse = pcAction->addAction(QString());
-    arcofellipse->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Elliptical_Arc"));
+    arcofellipse->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateElliptical_Arc"));
 
     QAction* arcofhyperbola = pcAction->addAction(QString());
-    arcofhyperbola->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Hyperbolic_Arc"));
+    arcofhyperbola->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHyperbolic_Arc"));
 
     QAction* arcofparabola = pcAction->addAction(QString());
-    arcofparabola->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Parabolic_Arc"));
+    arcofparabola->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateParabolic_Arc"));
 
     _pcAction = pcAction;
     languageChange();
@@ -3945,17 +3945,17 @@ void CmdSketcherCompCreateConic::updateAction(int mode)
     case Normal:
         a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse"));
         a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_3points"));
-        a[2]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Elliptical_Arc"));
-        a[3]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Hyperbolic_Arc"));
-        a[4]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Parabolic_Arc"));
+        a[2]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateElliptical_Arc"));
+        a[3]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHyperbolic_Arc"));
+        a[4]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateParabolic_Arc"));
         getAction()->setIcon(a[index]->icon());
         break;
     case Construction:
         a[0]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_Constr"));
         a[1]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateEllipse_3points_Constr"));
-        a[2]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Elliptical_Arc_Constr"));
-        a[3]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Hyperbolic_Arc_Constr"));
-        a[4]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_Parabolic_Arc_Constr"));
+        a[2]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateElliptical_Arc_Constr"));
+        a[3]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateHyperbolic_Arc_Constr"));
+        a[4]->setIcon(Gui::BitmapFactory().iconFromTheme("Sketcher_CreateParabolic_Arc_Constr"));
         getAction()->setIcon(a[index]->icon());
         break;
     }
@@ -3980,16 +3980,16 @@ void CmdSketcherCompCreateConic::languageChange()
     ellipseBy3Points->setStatusTip(QApplication::translate("Sketcher_CreateEllipseBy3Points","Create a ellipse by periapsis, apoapsis, and minor radius"));
     QAction* arcofellipse = a[2];
     arcofellipse->setText(QApplication::translate("CmdSketcherCompCreateConic","Arc of ellipse by center, major radius, endpoints"));
-    arcofellipse->setToolTip(QApplication::translate("Sketcher_CreateArcOfEllipse","Create an arc of ellipse by its center, major radius, endpoints"));
-    arcofellipse->setStatusTip(QApplication::translate("Sketcher_CreateArcOfEllipse","Create an arc of ellipse by its center, major radius, endpoints"));
+    arcofellipse->setToolTip(QApplication::translate("Sketcher_CreateArcOfEllipse","Create an arc of ellipse by its center, major radius, and endpoints"));
+    arcofellipse->setStatusTip(QApplication::translate("Sketcher_CreateArcOfEllipse","Create an arc of ellipse by its center, major radius, and endpoints"));
     QAction* arcofhyperbola = a[3];
     arcofhyperbola->setText(QApplication::translate("CmdSketcherCompCreateConic","Arc of hyperbola by center, major radius, endpoints"));
-    arcofhyperbola->setToolTip(QApplication::translate("Sketcher_CreateArcOfHyperbola","Create an arc of hyperbola by its center, major radius, endpoints"));
-    arcofhyperbola->setStatusTip(QApplication::translate("Sketcher_CreateArcOfHyperbola","Create an arc of hyperbola by its center, major radius, endpoints"));
+    arcofhyperbola->setToolTip(QApplication::translate("Sketcher_CreateArcOfHyperbola","Create an arc of hyperbola by its center, major radius, and endpoints"));
+    arcofhyperbola->setStatusTip(QApplication::translate("Sketcher_CreateArcOfHyperbola","Create an arc of hyperbola by its center, major radius, and endpoints"));
     QAction* arcofparabola = a[4];
     arcofparabola->setText(QApplication::translate("CmdSketcherCompCreateConic","Arc of parabola by focus, vertex, endpoints"));
-    arcofparabola->setToolTip(QApplication::translate("Sketcher_CreateArcOfParabola","Create an arc of parabola by its focus, vertex, endpoints"));
-    arcofparabola->setStatusTip(QApplication::translate("Sketcher_CreateArcOfParabola","Create an arc of parabola by its focus, vertex, endpoints"));
+    arcofparabola->setToolTip(QApplication::translate("Sketcher_CreateArcOfParabola","Create an arc of parabola by its focus, vertex, and endpoints"));
+    arcofparabola->setStatusTip(QApplication::translate("Sketcher_CreateArcOfParabola","Create an arc of parabola by its focus, vertex, and endpoints"));
 }
 
 bool CmdSketcherCompCreateConic::isActive(void)
diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
index 967f49f7ce..8cbe1c0d02 100644
--- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
+++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
@@ -59,53 +59,63 @@
         <file>icons/Sketcher_CarbonCopy_Constr.svg</file>
         <file>icons/Sketcher_Clone.svg</file>
         <file>icons/Sketcher_CloseShape.svg</file>
-        <file>icons/Sketcher_Conics.svg</file>
-        <file>icons/Sketcher_Conics_Constr.svg</file>
-        <file>icons/Sketcher_Conics_Ellipse_3points.svg</file>
-        <file>icons/Sketcher_Conics_Ellipse_Center.svg</file>
         <file>icons/Sketcher_ConnectLines.svg</file>
         <file>icons/Sketcher_Copy.svg</file>
-        <file>icons/Sketcher_Create3PointArc.svg</file>
-        <file>icons/Sketcher_Create3PointArc_Constr.svg</file>
-        <file>icons/Sketcher_Create3PointCircle.svg</file>
-        <file>icons/Sketcher_Create3PointCircle_Constr.svg</file>
-        <file>icons/Sketcher_CreateArc.svg</file>
-        <file>icons/Sketcher_CreateArc_Constr.svg</file>
-        <file>icons/Sketcher_CreateBSpline.svg</file>
-        <file>icons/Sketcher_CreateBSpline_Constr.svg</file>
-        <file>icons/Sketcher_CreateCircle.svg</file>
-        <file>icons/Sketcher_CreateCircle_Constr.svg</file>
-        <file>icons/Sketcher_CreateEllipse.svg</file>
-        <file>icons/Sketcher_CreateEllipse_3points.svg</file>
-        <file>icons/Sketcher_CreateEllipse_3points_Constr.svg</file>
-        <file>icons/Sketcher_CreateEllipse_Constr.svg</file>
-        <file>icons/Sketcher_CreateFillet.svg</file>
-        <file>icons/Sketcher_CreateHeptagon.svg</file>
-        <file>icons/Sketcher_CreateHeptagon_Constr.svg</file>
-        <file>icons/Sketcher_CreateHexagon.svg</file>
-        <file>icons/Sketcher_CreateHexagon_Constr.svg</file>
-        <file>icons/Sketcher_CreateLine.svg</file>
-        <file>icons/Sketcher_CreateLine_Constr.svg</file>
-        <file>icons/Sketcher_CreateOctagon.svg</file>
-        <file>icons/Sketcher_CreateOctagon_Constr.svg</file>
-        <file>icons/Sketcher_CreatePentagon.svg</file>
-        <file>icons/Sketcher_CreatePentagon_Constr.svg</file>
-        <file>icons/Sketcher_Create_Periodic_BSpline.svg</file>
-        <file>icons/Sketcher_Create_Periodic_BSpline_Constr.svg</file>
-        <file>icons/Sketcher_CreatePoint.svg</file>
-        <file>icons/Sketcher_CreatePolyline.svg</file>
-        <file>icons/Sketcher_CreatePolyline_Constr.svg</file>
-        <file>icons/Sketcher_CreateRectangle.svg</file>
-        <file>icons/Sketcher_CreateRectangle_Constr.svg</file>
-        <file>icons/Sketcher_CreateRegularPolygon.svg</file>
-        <file>icons/Sketcher_CreateRegularPolygon_Constr.svg</file>
-        <file>icons/Sketcher_CreateSlot.svg</file>
-        <file>icons/Sketcher_CreateSlot_Constr.svg</file>
-        <file>icons/Sketcher_CreateSquare.svg</file>
-        <file>icons/Sketcher_CreateSquare_Constr.svg</file>
-        <file>icons/Sketcher_CreateText.svg</file>
-        <file>icons/Sketcher_CreateTriangle.svg</file>
-        <file>icons/Sketcher_CreateTriangle_Constr.svg</file>
+    </qresource>
+    <qresource>
+        <file>icons/geometry/Sketcher_Conics.svg</file>
+        <file>icons/geometry/Sketcher_Conics_Constr.svg</file>
+        <file>icons/geometry/Sketcher_Conics_Ellipse_3points.svg</file>
+        <file>icons/geometry/Sketcher_Conics_Ellipse_Center.svg</file>
+        <file>icons/geometry/Sketcher_Create3PointArc.svg</file>
+        <file>icons/geometry/Sketcher_Create3PointArc_Constr.svg</file>
+        <file>icons/geometry/Sketcher_Create3PointCircle.svg</file>
+        <file>icons/geometry/Sketcher_Create3PointCircle_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateArc.svg</file>
+        <file>icons/geometry/Sketcher_CreateArc_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateBSpline.svg</file>
+        <file>icons/geometry/Sketcher_CreateBSpline_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateCircle.svg</file>
+        <file>icons/geometry/Sketcher_CreateCircle_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateEllipse.svg</file>
+        <file>icons/geometry/Sketcher_CreateEllipse_3points.svg</file>
+        <file>icons/geometry/Sketcher_CreateEllipse_3points_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateEllipse_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateElliptical_Arc.svg</file>
+        <file>icons/geometry/Sketcher_CreateElliptical_Arc_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateFillet.svg</file>
+        <file>icons/geometry/Sketcher_CreateHeptagon.svg</file>
+        <file>icons/geometry/Sketcher_CreateHeptagon_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateHexagon.svg</file>
+        <file>icons/geometry/Sketcher_CreateHexagon_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateHyperbolic_Arc.svg</file>
+        <file>icons/geometry/Sketcher_CreateHyperbolic_Arc_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateLine.svg</file>
+        <file>icons/geometry/Sketcher_CreateLine_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateOctagon.svg</file>
+        <file>icons/geometry/Sketcher_CreateOctagon_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateParabolic_Arc.svg</file>
+        <file>icons/geometry/Sketcher_CreateParabolic_Arc_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreatePentagon.svg</file>
+        <file>icons/geometry/Sketcher_CreatePentagon_Constr.svg</file>
+        <file>icons/geometry/Sketcher_Create_Periodic_BSpline.svg</file>
+        <file>icons/geometry/Sketcher_Create_Periodic_BSpline_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreatePoint.svg</file>
+        <file>icons/geometry/Sketcher_CreatePolyline.svg</file>
+        <file>icons/geometry/Sketcher_CreatePolyline_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateRectangle.svg</file>
+        <file>icons/geometry/Sketcher_CreateRectangle_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateRegularPolygon.svg</file>
+        <file>icons/geometry/Sketcher_CreateRegularPolygon_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateSlot.svg</file>
+        <file>icons/geometry/Sketcher_CreateSlot_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateSquare.svg</file>
+        <file>icons/geometry/Sketcher_CreateSquare_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateText.svg</file>
+        <file>icons/geometry/Sketcher_CreateTriangle.svg</file>
+        <file>icons/geometry/Sketcher_CreateTriangle_Constr.svg</file>
+    </qresource>
+    <qresource>
         <file>icons/Sketcher_Crosshair.svg</file>
         <file>icons/Sketcher_DraftLine.svg</file>
         <file>icons/Sketcher_EditSketch.svg</file>
@@ -147,12 +157,8 @@
         <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>
         <file>icons/Sketcher_External.svg</file>
-        <file>icons/Sketcher_Hyperbolic_Arc.svg</file>
-        <file>icons/Sketcher_Hyperbolic_Arc_Constr.svg</file>
         <file>icons/Sketcher_LeaveSketch.svg</file>
         <file>icons/Sketcher_MapSketch.svg</file>
         <file>icons/Sketcher_MergeSketch.svg</file>
@@ -160,8 +166,6 @@
         <file>icons/Sketcher_Move.svg</file>
         <file>icons/Sketcher_NewSketch.svg</file>
         <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>
     </qresource>
     <qresource>
         <file>icons/pointers/Sketcher_Pointer_CarbonCopy.svg</file>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Conics.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Conics.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Conics_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Conics_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_3points.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Conics_Ellipse_3points.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_3points.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Conics_Ellipse_3points.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_Center.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Conics_Ellipse_Center.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Conics_Ellipse_Center.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Conics_Ellipse_Center.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create3PointArc.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create3PointArc.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create3PointArc_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointArc_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create3PointArc_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create3PointCircle.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create3PointCircle.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create3PointCircle_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create3PointCircle_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateArc.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateArc.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateArc_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateArc_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateArc_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateBSpline.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateBSpline.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateBSpline_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateBSpline_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateBSpline_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateCircle.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateCircle.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateCircle_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateCircle_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateCircle_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse_3points.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse_3points.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse_3points_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_3points_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse_3points_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateEllipse_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateEllipse_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateElliptical_Arc.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateElliptical_Arc.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateElliptical_Arc_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Elliptical_Arc_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateElliptical_Arc_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateFillet.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateFillet.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateFillet.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateFillet.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHeptagon.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHeptagon.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHeptagon_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHeptagon_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHeptagon_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHexagon.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHexagon.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHexagon_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateHexagon_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHexagon_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHyperbolic_Arc.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHyperbolic_Arc.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHyperbolic_Arc_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Hyperbolic_Arc_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateHyperbolic_Arc_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateLine.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateLine.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateLine_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateLine_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateLine_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateOctagon.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateOctagon.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateOctagon_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateOctagon_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateOctagon_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateParabolic_Arc.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateParabolic_Arc.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateParabolic_Arc_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Parabolic_Arc_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateParabolic_Arc_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePentagon.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePentagon.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePentagon_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePentagon_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePentagon_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePoint.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePoint.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePoint.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePoint.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePolyline.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePolyline.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePolyline_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreatePolyline_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreatePolyline_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateRectangle.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateRectangle.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateRectangle_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRectangle_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateRectangle_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRegularPolygon.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateRegularPolygon.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRegularPolygon.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateRegularPolygon.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRegularPolygon_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateRegularPolygon_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateRegularPolygon_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateRegularPolygon_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateSlot.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateSlot.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateSlot_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSlot_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateSlot_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateSquare.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateSquare.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateSquare_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateSquare_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateSquare_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateText.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateText.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateText.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateText.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateTriangle.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateTriangle.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateTriangle_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_CreateTriangle_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_CreateTriangle_Constr.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create_Periodic_BSpline.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create_Periodic_BSpline.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline_Constr.svg b/src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create_Periodic_BSpline_Constr.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create_Periodic_BSpline_Constr.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/geometry/Sketcher_Create_Periodic_BSpline_Constr.svg
diff --git a/src/Mod/Sketcher/InitGui.py b/src/Mod/Sketcher/InitGui.py
index e4bfba14c8..db2d5f69a3 100644
--- a/src/Mod/Sketcher/InitGui.py
+++ b/src/Mod/Sketcher/InitGui.py
@@ -44,6 +44,7 @@ class SketcherWorkbench ( Workbench ):
         import Sketcher
         Gui.addIconPath(":/icons/constraints")
         Gui.addIconPath(":/icons/elements")
+        Gui.addIconPath(":/icons/geometry")
         # Gui.addIconPath(":/icons/obsolete")
         Gui.addIconPath(":/icons/pointers")
         try: