diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
index 4f427a4391..1732eb626a 100644
--- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
@@ -911,25 +911,26 @@ protected:
     { return isCreateGeoActive(getActiveGuiDocument()); }
 };
 
+extern char cursor_crosshair_color[];
+
 /* XPM */
 static const char *cursor_genericconstraint[]={
-"32 32 3 1",
+"32 32 2 1",
 "  c None",
-". c #FFFFFF",
-"+ c #FF0000",
-"      .                         ",
-"      .                         ",
-"      .                         ",
-"      .                         ",
-"      .                         ",
+cursor_crosshair_color,
+"      +                         ",
+"      +                         ",
+"      +                         ",
+"      +                         ",
+"      +                         ",
 "                                ",
-".....   .....                   ",
+"+++++   +++++                   ",
 "                                ",
-"      .                         ",
-"      .                         ",
-"      .                         ",
-"      .                         ",
-"      .                         ",
+"      +                         ",
+"      +                         ",
+"      +                         ",
+"      +                         ",
+"      +                         ",
 "                                ",
 "                                ",
 "                                ",
@@ -971,6 +972,8 @@ public:
         Gui::Selection().rmvSelectionGate();
         Gui::Selection().addSelectionGate(selFilterGate);
 
+        setCrosshairColor();
+
         // Constrain icon size in px
         int iconSize = 16;
         QPixmap cursorPixmap(cursor_genericconstraint),
diff --git a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
index 898b74b459..c75c090c58 100644
--- a/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
+++ b/src/Mod/Sketcher/Gui/CommandCreateGeo.cpp
@@ -231,7 +231,7 @@ void removeRedundantHorizontalVertical(Sketcher::SketchObject* psketch,
 /* Sketch commands =======================================================*/
 
 static const char cursor_crosshair_color_fmt[] = "+ c #%06lX";
-static char cursor_crosshair_color[12];
+char cursor_crosshair_color[12];
 
 void DrawSketchHandler::setCrosshairColor()
 {