diff --git a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp
index b53b551e91..f1f35539d8 100644
--- a/src/Mod/Sketcher/Gui/AppSketcherGui.cpp
+++ b/src/Mod/Sketcher/Gui/AppSketcherGui.cpp
@@ -109,6 +109,7 @@ PyMOD_INIT_FUNC(SketcherGui)
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/pointers"));
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/splines"));
     Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/tools"));
+    Gui::BitmapFactory().addPath(QString::fromLatin1(":/icons/overlay"));
 
     // instantiating the commands
     CreateSketcherCommands();
diff --git a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
index 617c3fb158..ae46a831bc 100644
--- a/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
+++ b/src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
@@ -1,10 +1,7 @@
 <RCC>
     <qresource>
-        <file>icons/Sketcher_Sketch.svg</file>
         <file>icons/SketcherWorkbench.svg</file>
-        <file alias="icons/preferences-sketcher.svg">icons/SketcherWorkbench.svg</file>
-    </qresource>
-    <qresource>
+        <file>icons/Sketcher_Sketch.svg</file>
         <file>icons/constraints/Constraint_Block.svg</file>
         <file>icons/constraints/Constraint_Concentric.svg</file>
         <file>icons/constraints/Constraint_Diameter.svg</file>
@@ -37,10 +34,10 @@
         <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_Radiam.svg</file>
         <file>icons/constraints/Constraint_Radiam_Driven.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>
@@ -55,8 +52,7 @@
         <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/dialogs/Sketcher_Settings.svg</file>
         <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>
@@ -91,28 +87,24 @@
         <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/general/Sketcher_EditSketch.svg</file>
+        <file>icons/general/Sketcher_GridToggle.svg</file>
+        <file>icons/general/Sketcher_GridToggle_Deactivated.svg</file>
         <file>icons/general/Sketcher_LeaveSketch.svg</file>
         <file>icons/general/Sketcher_MapSketch.svg</file>
         <file>icons/general/Sketcher_MergeSketch.svg</file>
         <file>icons/general/Sketcher_MirrorSketch.svg</file>
         <file>icons/general/Sketcher_NewSketch.svg</file>
+        <file>icons/general/Sketcher_RenderingOrder_Construction.svg</file>
+        <file>icons/general/Sketcher_RenderingOrder_External.svg</file>
+        <file>icons/general/Sketcher_RenderingOrder_Normal.svg</file>
         <file>icons/general/Sketcher_ReorientSketch.svg</file>
+        <file>icons/general/Sketcher_Snap.svg</file>
+        <file>icons/general/Sketcher_Snap_Deactivated.svg</file>
         <file>icons/general/Sketcher_SwitchVirtualSpace.svg</file>
         <file>icons/general/Sketcher_ValidateSketch.svg</file>
         <file>icons/general/Sketcher_ViewSection.svg</file>
         <file>icons/general/Sketcher_ViewSketch.svg</file>
-        <file>icons/general/Sketcher_GridToggle.svg</file>
-        <file>icons/general/Sketcher_GridToggle_Deactivated.svg</file>
-        <file>icons/general/Sketcher_RenderingOrder_Construction.svg</file>
-        <file>icons/general/Sketcher_RenderingOrder_External.svg</file>
-        <file>icons/general/Sketcher_RenderingOrder_Normal.svg</file>
-        <file>icons/general/Sketcher_Snap.svg</file>
-        <file>icons/general/Sketcher_Snap_Deactivated.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>
@@ -127,21 +119,18 @@
         <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_CreateBSplineByInterpolation.svg</file>
         <file>icons/geometry/Sketcher_CreateBSplineByInterpolation_Constr.svg</file>
-        <file>icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation.svg</file>
-        <file>icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation_Constr.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_3points.svg</file>
-        <file>icons/geometry/Sketcher_CreateEllipse_3points_Constr.svg</file>
         <file>icons/geometry/Sketcher_CreateEllipseByCenter.svg</file>
         <file>icons/geometry/Sketcher_CreateEllipseByCenter_Constr.svg</file>
+        <file>icons/geometry/Sketcher_CreateEllipse_3points.svg</file>
+        <file>icons/geometry/Sketcher_CreateEllipse_3points_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_CreatePointFillet.svg</file>
         <file>icons/geometry/Sketcher_CreateHeptagon.svg</file>
         <file>icons/geometry/Sketcher_CreateHeptagon_Constr.svg</file>
         <file>icons/geometry/Sketcher_CreateHexagon.svg</file>
@@ -158,15 +147,14 @@
         <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_CreatePointFillet.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_CreateRectangle_Center.svg</file>
         <file>icons/geometry/Sketcher_CreateRectangle_Center_Constr.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>
@@ -176,13 +164,15 @@
         <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_Create_Periodic_BSpline.svg</file>
+        <file>icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation.svg</file>
+        <file>icons/geometry/Sketcher_Create_Periodic_BSplineByInterpolation_Constr.svg</file>
+        <file>icons/geometry/Sketcher_Create_Periodic_BSpline_Constr.svg</file>
         <file>icons/geometry/Sketcher_Extend.svg</file>
         <file>icons/geometry/Sketcher_External.svg</file>
         <file>icons/geometry/Sketcher_Split.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>
         <file>icons/obsolete/Sketcher_ConstrainDistance_old.svg</file>
         <file>icons/obsolete/Sketcher_ConstrainHorizontal_old.svg</file>
@@ -192,8 +182,12 @@
         <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/overlay/Sketcher_ArcOverlay.svg</file>
+        <file>icons/overlay/Sketcher_BSplineComb.svg</file>
+        <file>icons/overlay/Sketcher_BSplineDegree.svg</file>
+        <file>icons/overlay/Sketcher_BSplineKnotMultiplicity.svg</file>
+        <file>icons/overlay/Sketcher_BSplinePoleWeight.svg</file>
+        <file>icons/overlay/Sketcher_BSplinePolygon.svg</file>
         <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>
@@ -201,8 +195,8 @@
         <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_Box.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>
@@ -217,22 +211,13 @@
         <file>icons/pointers/Sketcher_Pointer_Slot.svg</file>
         <file>icons/pointers/Sketcher_Pointer_Splitting.svg</file>
         <file>icons/pointers/Sketcher_Pointer_Trimming.svg</file>
-    </qresource>
-    <qresource>
         <file>icons/splines/Sketcher_BSplineApproximate.svg</file>
-        <file>icons/splines/Sketcher_BSplineComb.svg</file>
         <file>icons/splines/Sketcher_BSplineDecreaseDegree.svg</file>
         <file>icons/splines/Sketcher_BSplineDecreaseKnotMultiplicity.svg</file>
-        <file>icons/splines/Sketcher_BSplineDegree.svg</file>
         <file>icons/splines/Sketcher_BSplineIncreaseDegree.svg</file>
         <file>icons/splines/Sketcher_BSplineIncreaseKnotMultiplicity.svg</file>
         <file>icons/splines/Sketcher_BSplineInsertKnot.svg</file>
         <file>icons/splines/Sketcher_JoinCurves.svg</file>
-        <file>icons/splines/Sketcher_BSplineKnotMultiplicity.svg</file>
-        <file>icons/splines/Sketcher_BSplinePoleWeight.svg</file>
-        <file>icons/splines/Sketcher_BSplinePolygon.svg</file>
-    </qresource>
-    <qresource>
         <file>icons/tools/Sketcher_Clone.svg</file>
         <file>icons/tools/Sketcher_Copy.svg</file>
         <file>icons/tools/Sketcher_DeleteConstraints.svg</file>
@@ -250,7 +235,4 @@
         <file>icons/tools/Sketcher_SelectVerticalAxis.svg</file>
         <file>icons/tools/Sketcher_Symmetry.svg</file>
     </qresource>
-    <qresource>
-        <file>icons/dialogs/Sketcher_Settings.svg</file>
-    </qresource>
 </RCC>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_ArcOverlay.svg b/src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_ArcOverlay.svg
new file mode 100644
index 0000000000..64053c3a9a
--- /dev/null
+++ b/src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_ArcOverlay.svg
@@ -0,0 +1,435 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="64px"
+   height="64px"
+   id="svg2918"
+   sodipodi:version="0.32"
+   inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
+   sodipodi:docname="Sketcher_ArcOverlay.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   xml:space="preserve"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><defs
+     id="defs2920"><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3191"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient3144"><stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3146" /><stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop3148" /></linearGradient><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3183"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" /><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2926" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3892"
+       id="linearGradient3898"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient3892"><stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3894" /><stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop3896" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3850"
+       id="linearGradient3856"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient3850"><stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0"
+         id="stop3852" /><stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1"
+         id="stop3854" /></linearGradient><linearGradient
+       id="linearGradient3836-0-7"><stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4" /><stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0" /></linearGradient><linearGradient
+       id="linearGradient3836-0"><stop
+         style="stop-color:#c4a000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2" /><stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="1"
+         id="stop3840-5" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3836-0-7-7"
+       id="linearGradient3801-1-1-6"
+       gradientUnits="userSpaceOnUse"
+       x1="-18"
+       y1="18"
+       x2="-22"
+       y2="5" /><linearGradient
+       id="linearGradient3836-0-7-7"><stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5" /><stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3" /></linearGradient><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080"
+       xlink:href="#linearGradient3836-0-7-7"
+       inkscape:collect="always" /><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080-3"
+       xlink:href="#linearGradient3836-0-7-7-6"
+       inkscape:collect="always" /><linearGradient
+       id="linearGradient3836-0-7-7-6"><stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-7" /><stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-5" /></linearGradient><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080-2"
+       xlink:href="#linearGradient3836-0-7-7-9"
+       inkscape:collect="always" /><linearGradient
+       id="linearGradient3836-0-7-7-9"><stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-1" /><stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-2" /></linearGradient><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3123"
+       xlink:href="#linearGradient3836-0-7-7-9"
+       inkscape:collect="always" /><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3080-36"
+       xlink:href="#linearGradient3836-0-7-7-0"
+       inkscape:collect="always" /><linearGradient
+       id="linearGradient3836-0-7-7-0"><stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-2-4-5-6" /><stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-5-0-3-26" /></linearGradient><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3123-1"
+       xlink:href="#linearGradient3836-0-7-7-0"
+       inkscape:collect="always" /><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" /><linearGradient
+       id="linearGradient3836-9-3-6"><stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7" /><stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5" /></linearGradient><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4013"
+       xlink:href="#linearGradient3836-9-3-6"
+       inkscape:collect="always" /><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857-0"
+       xlink:href="#linearGradient3836-9-3-6-6"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" /><linearGradient
+       id="linearGradient3836-9-3-6-6"><stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-2" /><stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-6" /></linearGradient><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3857-2"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)" /><linearGradient
+       id="linearGradient3836-9-3-6-0"><stop
+         style="stop-color:#a40000;stop-opacity:1"
+         offset="0"
+         id="stop3838-8-5-7-23" /><stop
+         style="stop-color:#ef2929;stop-opacity:1"
+         offset="1"
+         id="stop3840-1-6-5-7" /></linearGradient><linearGradient
+       y2="5"
+       x2="-22"
+       y1="18"
+       x1="-18"
+       gradientTransform="matrix(0.89262616,0,0,0.89258466,72.894067,1.2176306)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4013-5"
+       xlink:href="#linearGradient3836-9-3-6-0"
+       inkscape:collect="always" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3191-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" /><radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3144"
+       id="radialGradient3183-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
+       cx="225.26402"
+       cy="672.79736"
+       fx="225.26402"
+       fy="672.79736"
+       r="34.345188" /><inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2926-6" /><linearGradient
+       inkscape:collect="always"
+       id="linearGradient3892-9"><stop
+         style="stop-color:#8ae234;stop-opacity:1"
+         offset="0"
+         id="stop3894-1" /><stop
+         style="stop-color:#4e9a06;stop-opacity:1"
+         offset="1"
+         id="stop3896-2" /></linearGradient><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3892-9"
+       id="linearGradient3856-7-9"
+       x1="22.84341"
+       y1="4.8241611"
+       x2="30.783579"
+       y2="28.644661"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.899293,0,0,6.8992932,1020.5813,416.86466)" /><linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3892-9"
+       id="linearGradient3898-2-4"
+       x1="37.429146"
+       y1="41.590584"
+       x2="24.483221"
+       y2="4.9104676"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(6.34735,0,0,6.34735,1036.4765,432.6749)" /></defs><sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="3.094998"
+     inkscape:cx="32.633301"
+     inkscape:cy="36.348973"
+     inkscape:current-layer="g4428-3-5"
+     showgrid="false"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1600"
+     inkscape:window-height="973"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="false"
+     inkscape:showpageshadow="2"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"><inkscape:grid
+       type="xygrid"
+       id="grid2998"
+       empspacing="2"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" /></sodipodi:namedview><metadata
+     id="metadata2923"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:creator><cc:Agent><dc:title>[wmayer]</dc:title></cc:Agent></dc:creator><dc:title>Sketcher_Create3PointCircle</dc:title><dc:date>2014-03-29</dc:date><dc:relation>http://www.freecadweb.org/wiki/index.php?title=Artwork</dc:relation><dc:publisher><cc:Agent><dc:title>FreeCAD</dc:title></cc:Agent></dc:publisher><dc:identifier>FreeCAD/src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Create3PointCircle.svg</dc:identifier><dc:rights><cc:Agent><dc:title>FreeCAD LGPL2+</dc:title></cc:Agent></dc:rights><cc:license>https://www.gnu.org/copyleft/lesser.html</cc:license><dc:contributor><cc:Agent><dc:title>[agryson] Alexander Gryson</dc:title></cc:Agent></dc:contributor></cc:Work></rdf:RDF></metadata><g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"><g
+       id="g4470"
+       inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+       inkscape:export-xdpi="6.7850704"
+       inkscape:export-ydpi="6.7850704"
+       transform="matrix(0.1460346,0,0,0.1460346,-220.10298,-56.296235)"><g
+         id="g4428" /><g
+         transform="translate(5.1846337e-7,13.695387)"
+         id="g4428-3"><path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#2e3436;stroke-width:8.27354717;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" /><path
+           sodipodi:type="arc"
+           style="fill:none;stroke:#d3d7cf;stroke-width:4.13677359;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.6234045,0,0,6.6191713,1521.886,414.91855)" /><path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3898);stroke-width:2.15765381;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4-1"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.34735,0,0,6.34735,1529.8339,422.80776)" /><path
+           sodipodi:type="arc"
+           style="fill:none;stroke:url(#linearGradient3856);stroke-width:1.98504162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path3044-2-4"
+           sodipodi:cx="28.798531"
+           sodipodi:cy="28.644661"
+           sodipodi:rx="24.813021"
+           sodipodi:ry="24.813021"
+           d="m 53.611551,28.644661 c 0,13.703853 -11.109167,24.813021 -24.81302,24.813021 -13.703853,0 -24.8130211,-11.109168 -24.8130211,-24.813021 0,-13.703853 11.1091681,-24.8130208 24.8130211,-24.8130208 13.703853,0 24.81302,11.1091678 24.81302,24.8130208 z"
+           transform="matrix(6.899293,0,0,6.8992932,1513.9387,406.99753)" /></g><g
+         id="g4470-2"
+         inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
+         inkscape:export-xdpi="6.7850704"
+         inkscape:export-ydpi="6.7850704"
+         transform="translate(312.18799,22.861584)"><g
+           id="g4428-37" /><g
+           id="g4428-3-5"
+           transform="translate(181.16941,-19.033348)"><path
+             style="fill:none;stroke:url(#linearGradient3856-7-9);stroke-width:13.6954;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="path3044-2-4-8-9"
+             sodipodi:type="arc"
+             sodipodi:cx="1219.2708"
+             sodipodi:cy="614.49261"
+             sodipodi:rx="171.19231"
+             sodipodi:ry="171.19231"
+             sodipodi:start="0"
+             sodipodi:end="4.7996554"
+             sodipodi:arc-type="arc"
+             d="M 1390.4631,614.49261 A 171.19231,171.19231 0 0 1 1281.3174,774.04519 171.19231,171.19231 0 0 1 1093.0545,730.14846 171.19231,171.19231 0 0 1 1065.733,538.7762 171.19231,171.19231 0 0 1 1234.1911,443.95175"
+             sodipodi:open="true" /><path
+             style="fill:none;stroke:url(#linearGradient3898-2-4);stroke-width:13.6954;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="path3044-2-4-1-2-4"
+             sodipodi:type="arc"
+             sodipodi:cx="1219.2709"
+             sodipodi:cy="614.49261"
+             sodipodi:rx="157.49693"
+             sodipodi:ry="157.49693"
+             sodipodi:start="0"
+             sodipodi:end="4.7996554"
+             sodipodi:arc-type="arc"
+             d="M 1376.7678,614.49261 A 157.49693,157.49693 0 0 1 1276.3538,761.281 157.49693,157.49693 0 0 1 1103.152,720.896 157.49693,157.49693 0 0 1 1078.0162,544.83351 157.49693,157.49693 0 0 1 1232.9976,457.595"
+             sodipodi:open="true" /></g></g><g
+         transform="matrix(5.4797266,0,0,5.4796456,1407.6624,391.33054)"
+         id="g3797-7-2-3-9"><path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930072;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5-2"
+           d="M 49.011949,5.7450981 A 8.7441901,8.743766 0.01920999 1 1 62.295154,17.119951 8.7441901,8.743766 0.01920999 1 1 49.011949,5.7450981 z" /><path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient4013-5);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930024;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6-2"
+           d="m 50.905481,7.3707415 a 6.2483828,6.2480927 0 1 1 9.49182,8.1282445 6.2483828,6.2480927 0 0 1 -9.49182,-8.1282445 z" /></g><g
+         transform="matrix(5.4797266,0,0,5.4796456,1572.007,555.67515)"
+         id="g3797-7-2-3"><path
+           inkscape:connector-curvature="0"
+           style="fill:#ef2929;stroke:#280000;stroke-width:2.49930072;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-6-9-5"
+           d="M 49.011949,5.7450981 A 8.7441901,8.743766 0.01920999 1 1 62.295154,17.119951 8.7441901,8.743766 0.01920999 1 1 49.011949,5.7450981 z" /><path
+           inkscape:connector-curvature="0"
+           style="fill:url(#linearGradient4013);fill-opacity:1;stroke:#ef2929;stroke-width:2.49930024;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4250-7-0-1-6"
+           d="m 50.905481,7.3707415 a 6.2483828,6.2480927 0 1 1 9.49182,8.1282445 6.2483828,6.2480927 0 0 1 -9.49182,-8.1282445 z" /></g></g></g></svg>
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineComb.svg b/src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_BSplineComb.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineComb.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_BSplineComb.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineDegree.svg b/src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_BSplineDegree.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineDegree.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_BSplineDegree.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineKnotMultiplicity.svg b/src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_BSplineKnotMultiplicity.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplineKnotMultiplicity.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_BSplineKnotMultiplicity.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplinePoleWeight.svg b/src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_BSplinePoleWeight.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplinePoleWeight.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_BSplinePoleWeight.svg
diff --git a/src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplinePolygon.svg b/src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_BSplinePolygon.svg
similarity index 100%
rename from src/Mod/Sketcher/Gui/Resources/icons/splines/Sketcher_BSplinePolygon.svg
rename to src/Mod/Sketcher/Gui/Resources/icons/overlay/Sketcher_BSplinePolygon.svg