diff --git a/rtdata/images/themed/png/dark/crosshair1-adjust.png b/rtdata/images/themed/png/dark/crosshair-adjust.png
similarity index 100%
rename from rtdata/images/themed/png/dark/crosshair1-adjust.png
rename to rtdata/images/themed/png/dark/crosshair-adjust.png
diff --git a/rtdata/images/themed/png/dark/crosshair.png b/rtdata/images/themed/png/dark/crosshair.png
new file mode 100644
index 000000000..078512803
Binary files /dev/null and b/rtdata/images/themed/png/dark/crosshair.png differ
diff --git a/rtdata/images/themed/png/dark/crosshair1.png b/rtdata/images/themed/png/dark/crosshair1.png
deleted file mode 100644
index e824f00aa..000000000
Binary files a/rtdata/images/themed/png/dark/crosshair1.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/crosshair1-adjust.png b/rtdata/images/themed/png/light/crosshair-adjust.png
similarity index 100%
rename from rtdata/images/themed/png/light/crosshair1-adjust.png
rename to rtdata/images/themed/png/light/crosshair-adjust.png
diff --git a/rtdata/images/themed/png/light/crosshair.png b/rtdata/images/themed/png/light/crosshair.png
new file mode 100644
index 000000000..078512803
Binary files /dev/null and b/rtdata/images/themed/png/light/crosshair.png differ
diff --git a/rtdata/images/themed/png/light/crosshair1.png b/rtdata/images/themed/png/light/crosshair1.png
deleted file mode 100644
index e824f00aa..000000000
Binary files a/rtdata/images/themed/png/light/crosshair1.png and /dev/null differ
diff --git a/rtdata/images/themed/svg/crosshair1-adjust.svg b/rtdata/images/themed/svg/crosshair-adjust.svg
similarity index 100%
rename from rtdata/images/themed/svg/crosshair1-adjust.svg
rename to rtdata/images/themed/svg/crosshair-adjust.svg
diff --git a/rtdata/images/themed/svg/crosshair1.svg b/rtdata/images/themed/svg/crosshair.svg
similarity index 71%
rename from rtdata/images/themed/svg/crosshair1.svg
rename to rtdata/images/themed/svg/crosshair.svg
index 25205e84e..a4dcc2592 100644
--- a/rtdata/images/themed/svg/crosshair1.svg
+++ b/rtdata/images/themed/svg/crosshair.svg
@@ -18,7 +18,7 @@
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="crosshair1.svg">
+   sodipodi:docname="crosshair.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#E0E1E2"
@@ -126,8 +126,9 @@
        inkscape:connector-curvature="0" />
     <path
        style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
-       d="M 12 1.5 C 11.169 1.5 10.5 2.169 10.5 3 L 10.5 10.007812 C 10.918164 9.69301 11.433952 9.5 12 9.5 C 12.566048 9.5 13.081836 9.69301 13.5 10.007812 L 13.5 3 C 13.5 2.169 12.831 1.5 12 1.5 z M 3 10.5 C 2.169 10.5 1.5 11.169 1.5 12 C 1.5 12.831 2.169 13.5 3 13.5 L 10.007812 13.5 C 9.69301 13.081836 9.5 12.566048 9.5 12 C 9.5 11.433952 9.69301 10.918164 10.007812 10.5 L 3 10.5 z M 13.992188 10.5 C 14.30699 10.918164 14.5 11.433952 14.5 12 C 14.5 12.566048 14.30699 13.081836 13.992188 13.5 L 21 13.5 C 21.831 13.5 22.5 12.831 22.5 12 C 22.5 11.169 21.831 10.5 21 10.5 L 13.992188 10.5 z M 10.5 13.992188 L 10.5 21 C 10.5 21.831 11.169 22.5 12 22.5 C 12.831 22.5 13.5 21.831 13.5 21 L 13.5 13.992188 C 13.081836 14.30699 12.566048 14.5 12 14.5 C 11.433952 14.5 10.918164 14.30699 10.5 13.992188 z "
-       id="rect1440" />
+       d="m 12,-26.5 c -0.831,0 -1.5,0.669 -1.5,1.5 v 7.007812 C 10.918164,-18.30699 11.433952,-18.5 12,-18.5 c 0.566048,0 1.081836,0.19301 1.5,0.507812 V -25 c 0,-0.831 -0.669,-1.5 -1.5,-1.5 z m -9,9 c -0.831,0 -1.5,0.669 -1.5,1.5 0,0.831 0.669,1.5 1.5,1.5 h 7.007812 C 9.69301,-14.918164 9.5,-15.433952 9.5,-16 c 0,-0.566048 0.19301,-1.081836 0.507812,-1.5 z m 10.992188,0 C 14.30699,-17.081836 14.5,-16.566048 14.5,-16 c 0,0.566048 -0.19301,1.081836 -0.507812,1.5 H 21 c 0.831,0 1.5,-0.669 1.5,-1.5 0,-0.831 -0.669,-1.5 -1.5,-1.5 z M 10.5,-14.007812 V -7 c 0,0.831 0.669,1.5 1.5,1.5 0.831,0 1.5,-0.669 1.5,-1.5 v -7.007812 C 13.081836,-13.69301 12.566048,-13.5 12,-13.5 c -0.566048,0 -1.081836,-0.19301 -1.5,-0.507812 z"
+       id="rect1440"
+       inkscape:connector-curvature="0" />
     <path
        d="m 48.5,12 c 0,0.831 -0.669,1.5 -1.5,1.5 H 29 c -0.831,0 -1.5,-0.669 -1.5,-1.5 0,-0.831 0.669,-1.5 1.5,-1.5 h 18 c 0.831,0 1.5,0.669 1.5,1.5 z M 38,1.5 c 0.831,0 1.5,0.669 1.5,1.5 v 18 c 0,0.831 -0.669,1.5 -1.5,1.5 -0.831,0 -1.5,-0.669 -1.5,-1.5 V 3 c 0,-0.831 0.669,-1.5 1.5,-1.5 z"
        style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
@@ -144,7 +145,17 @@
        style="opacity:1;fill:#ff0000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
     <path
        style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       d="M 12 1 C 10.900649 1 10 1.900649 10 3 L 10 10 L 3 10 C 1.900649 10 1 10.900649 1 12 C 1 13.099351 1.900649 14 3 14 L 10 14 L 10 21 C 10 22.099351 10.900649 23 12 23 C 13.099351 23 14 22.099351 14 21 L 14 14 L 21 14 C 22.099351 14 23 13.099351 23 12 C 23 10.900649 22.099351 10 21 10 L 14 10 L 14 3 C 14 1.900649 13.099351 1 12 1 z M 12 2 C 12.562649 2 13 2.437351 13 3 L 13 9.7089844 C 13.577268 9.9603186 14.039681 10.422732 14.291016 11 L 21 11 C 21.562649 11 22 11.437351 22 12 C 22 12.562649 21.562649 13 21 13 L 14.291016 13 C 14.039681 13.577268 13.577268 14.039681 13 14.291016 L 13 21 C 13 21.562649 12.562649 22 12 22 C 11.437351 22 11 21.562649 11 21 L 11 14.291016 C 10.422732 14.039681 9.9603186 13.577268 9.7089844 13 L 3 13 C 2.437351 13 2 12.562649 2 12 C 2 11.437351 2.437351 11 3 11 L 9.7089844 11 C 9.9603186 10.422732 10.422732 9.9603186 11 9.7089844 L 11 3 C 11 2.437351 11.437351 2 12 2 z "
-       id="path1481" />
+       d="m 12,-27 c -1.099351,0 -2,0.900649 -2,2 v 7 H 3 c -1.099351,0 -2,0.900649 -2,2 0,1.099351 0.900649,2 2,2 h 7 v 7 c 0,1.099351 0.900649,2 2,2 1.099351,0 2,-0.900649 2,-2 v -7 h 7 c 1.099351,0 2,-0.900649 2,-2 0,-1.099351 -0.900649,-2 -2,-2 h -7 v -7 c 0,-1.099351 -0.900649,-2 -2,-2 z m 0,1 c 0.562649,0 1,0.437351 1,1 v 6.708984 c 0.577268,0.251335 1.039681,0.713748 1.291016,1.291016 H 21 c 0.562649,0 1,0.437351 1,1 0,0.562649 -0.437351,1 -1,1 H 14.291016 C 14.039681,-14.422732 13.577268,-13.960319 13,-13.708984 V -7 c 0,0.562649 -0.437351,1 -1,1 -0.562649,0 -1,-0.437351 -1,-1 v -6.708984 C 10.422732,-13.960319 9.9603186,-14.422732 9.7089844,-15 H 3 c -0.562649,0 -1,-0.437351 -1,-1 0,-0.562649 0.437351,-1 1,-1 H 9.7089844 C 9.9603186,-17.577268 10.422732,-18.039681 11,-18.291016 V -25 c 0,-0.562649 0.437351,-1 1,-1 z"
+       id="path1481"
+       inkscape:connector-curvature="0" />
+    <g
+       id="g1013"
+       transform="translate(12.5,-14.5)">
+      <path
+         inkscape:connector-curvature="0"
+         id="path1448-3"
+         d="M -0.5,16 C -1.331,16 -2,16.669 -2,17.5 v 5.845703 C -1.544436,23.129409 -1.039612,23 -0.5,23 0.039612,23 0.544436,23.129409 1,23.345703 V 17.5 C 1,16.669 0.331,16 -0.5,16 Z m -9,9 c -0.831,0 -1.5,0.669 -1.5,1.5 0,0.831 0.669,1.5 1.5,1.5 h 5.845703 C -3.870591,27.544436 -4,27.039612 -4,26.5 -4,25.960388 -3.870591,25.455564 -3.654297,25 Z M 2.654297,25 C 2.870591,25.455564 3,25.960388 3,26.5 3,27.039612 2.870591,27.544436 2.654297,28 H 8.5 C 9.331,28 10,27.331 10,26.5 10,25.669 9.331,25 8.5,25 Z M -2,29.654297 V 35.5 C -2,36.331 -1.331,37 -0.5,37 0.331,37 1,36.331 1,35.5 V 29.654297 C 0.544436,29.870591 0.039612,30 -0.5,30 -1.039612,30 -1.544436,29.870591 -2,29.654297 Z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal" />
+    </g>
   </g>
 </svg>
diff --git a/rtgui/cursormanager.cc b/rtgui/cursormanager.cc
index 9f6884c5c..d1973dcca 100644
--- a/rtgui/cursormanager.cc
+++ b/rtgui/cursormanager.cc
@@ -51,7 +51,7 @@ void CursorManager::init (Glib::RefPtr<Gdk::Window> mainWindow)
     cAdd = Gdk::Cursor::create (display, Gdk::PLUS);
     cWait = Gdk::Cursor::create (display, Gdk::CLOCK);
 
-    Glib::RefPtr<Gdk::Pixbuf> hand = RTImage::createFromFile ("crosshair1.png");
+    Glib::RefPtr<Gdk::Pixbuf> hand = RTImage::createFromFile ("crosshair.png");
     Glib::RefPtr<Gdk::Pixbuf> close_hand = RTImage::createFromFile ("hand-closed.png");
     Glib::RefPtr<Gdk::Pixbuf> wbpick = RTImage::createFromFile ("color-picker.png");
     Glib::RefPtr<Gdk::Pixbuf> cpick = RTImage::createFromFile ("color-picker-add.png");
diff --git a/rtgui/diagonalcurveeditorsubgroup.cc b/rtgui/diagonalcurveeditorsubgroup.cc
index eb61d8b45..e7599b502 100644
--- a/rtgui/diagonalcurveeditorsubgroup.cc
+++ b/rtgui/diagonalcurveeditorsubgroup.cc
@@ -69,7 +69,7 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt,
     editPointCustom = Gtk::manage (new Gtk::ToggleButton ());
     initButton(*editPointCustom, Glib::ustring("edit-point.png"), Gtk::ALIGN_START, false, "CURVEEDITOR_EDITPOINT_HINT");
     editCustom = Gtk::manage (new Gtk::ToggleButton());
-    initButton(*editCustom, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
+    initButton(*editCustom, Glib::ustring("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
     editCustom->hide();
     copyCustom = Gtk::manage (new Gtk::Button ());
     initButton(*copyCustom, Glib::ustring("copy.png"), Gtk::ALIGN_END, true);
@@ -146,7 +146,7 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt,
     editPointNURBS = Gtk::manage (new Gtk::ToggleButton ());
     initButton(*editPointNURBS, Glib::ustring("edit-point.png"), Gtk::ALIGN_START, false, "CURVEEDITOR_EDITPOINT_HINT");
     editNURBS = Gtk::manage (new Gtk::ToggleButton());
-    initButton(*editNURBS, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
+    initButton(*editNURBS, Glib::ustring("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
     editNURBS->hide();
     copyNURBS = Gtk::manage (new Gtk::Button ());
     initButton(*copyNURBS, Glib::ustring("copy.png"), Gtk::ALIGN_END, true);
@@ -224,7 +224,7 @@ DiagonalCurveEditorSubGroup::DiagonalCurveEditorSubGroup (CurveEditorGroup* prt,
     shcSelector->set_name("CurveSHCSelector");  // To handle the 4px gap between the SHCSelector and the curve through CSS
 
     editParam = Gtk::manage (new Gtk::ToggleButton());
-    initButton(*editParam, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
+    initButton(*editParam, Glib::ustring("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
     editParam->hide();
     copyParam = Gtk::manage (new Gtk::Button ());
     initButton(*copyParam, Glib::ustring("copy.png"), Gtk::ALIGN_END, true);
diff --git a/rtgui/flatcurveeditorsubgroup.cc b/rtgui/flatcurveeditorsubgroup.cc
index c6028b32d..055a8a92f 100644
--- a/rtgui/flatcurveeditorsubgroup.cc
+++ b/rtgui/flatcurveeditorsubgroup.cc
@@ -63,7 +63,7 @@ FlatCurveEditorSubGroup::FlatCurveEditorSubGroup (CurveEditorGroup* prt, Glib::u
     }
 
     editCPoints = Gtk::manage (new Gtk::ToggleButton());
-    initButton(*editCPoints, Glib::ustring("crosshair1-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
+    initButton(*editCPoints, Glib::ustring("crosshair-adjust.png"), Gtk::ALIGN_START, false, "EDIT_PIPETTE_TOOLTIP");
     editPointCPoints = Gtk::manage (new Gtk::ToggleButton ());
     initButton(*editPointCPoints,  Glib::ustring("edit-point.png"), Gtk::ALIGN_START, false, "CURVEEDITOR_EDITPOINT_HINT");
     copyCPoints = Gtk::manage (new Gtk::Button ());
diff --git a/rtgui/gradient.cc b/rtgui/gradient.cc
index 34d1f81bd..10cc30054 100644
--- a/rtgui/gradient.cc
+++ b/rtgui/gradient.cc
@@ -13,7 +13,7 @@ Gradient::Gradient () : FoldableToolPanel(this, "gradient", M("TP_GRADIENT_LABEL
 
     editHBox = Gtk::manage (new Gtk::HBox());
     edit = Gtk::manage (new Gtk::ToggleButton());
-    edit->add (*Gtk::manage (new RTImage ("crosshair1-adjust.png")));
+    edit->add (*Gtk::manage (new RTImage ("crosshair-adjust.png")));
     edit->set_tooltip_text(M("EDIT_OBJECT_TOOLTIP"));
     editConn = edit->signal_toggled().connect( sigc::mem_fun(*this, &Gradient::editToggled) );
     editHBox->pack_start(*edit, Gtk::PACK_SHRINK, 0);
diff --git a/rtgui/toolbar.cc b/rtgui/toolbar.cc
index f586cb70d..f82911e80 100644
--- a/rtgui/toolbar.cc
+++ b/rtgui/toolbar.cc
@@ -27,7 +27,7 @@ ToolBar::ToolBar () : showColPickers(true), listener (nullptr), pickerListener(n
     editingMode = false;
 
     handimg.reset(new RTImage("hand-open.png"));
-    editinghandimg.reset(new RTImage("crosshair1-adjust.png"));
+    editinghandimg.reset(new RTImage("crosshair-adjust.png"));
 
     handTool = Gtk::manage (new Gtk::ToggleButton ());
     handTool->add (*handimg);