diff --git a/rtdata/images/non-themed/png/empty.png b/rtdata/images/non-themed/png/empty.png
new file mode 100644
index 000000000..534ddcb72
Binary files /dev/null and b/rtdata/images/non-themed/png/empty.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker-add-hicontrast.png b/rtdata/images/themed/png/dark/color-picker-add-hicontrast.png
new file mode 100644
index 000000000..53eaabf60
Binary files /dev/null and b/rtdata/images/themed/png/dark/color-picker-add-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/color-picker-hicontrast.png b/rtdata/images/themed/png/dark/color-picker-hicontrast.png
new file mode 100644
index 000000000..c2592a8b7
Binary files /dev/null and b/rtdata/images/themed/png/dark/color-picker-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/crosshair.png b/rtdata/images/themed/png/dark/crosshair-hicontrast.png
similarity index 100%
rename from rtdata/images/themed/png/dark/crosshair.png
rename to rtdata/images/themed/png/dark/crosshair-hicontrast.png
diff --git a/rtdata/images/themed/png/dark/hand-closed.png b/rtdata/images/themed/png/dark/hand-closed-hicontrast.png
similarity index 100%
rename from rtdata/images/themed/png/dark/hand-closed.png
rename to rtdata/images/themed/png/dark/hand-closed-hicontrast.png
diff --git a/rtdata/images/themed/png/dark/node-move-x-hicontrast.png b/rtdata/images/themed/png/dark/node-move-x-hicontrast.png
new file mode 100644
index 000000000..92a1c49e2
Binary files /dev/null and b/rtdata/images/themed/png/dark/node-move-x-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/node-move-xy-hicontrast.png b/rtdata/images/themed/png/dark/node-move-xy-hicontrast.png
new file mode 100644
index 000000000..3984385af
Binary files /dev/null and b/rtdata/images/themed/png/dark/node-move-xy-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/node-move-y-hicontrast.png b/rtdata/images/themed/png/dark/node-move-y-hicontrast.png
new file mode 100644
index 000000000..e2fc55da8
Binary files /dev/null and b/rtdata/images/themed/png/dark/node-move-y-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png b/rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png
new file mode 100644
index 000000000..d8929ac42
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-aroundnode-hicontrast.png differ
diff --git a/rtdata/images/themed/png/dark/rotate-aroundnode.png b/rtdata/images/themed/png/dark/rotate-aroundnode.png
new file mode 100644
index 000000000..50db200a6
Binary files /dev/null and b/rtdata/images/themed/png/dark/rotate-aroundnode.png differ
diff --git a/rtdata/images/themed/png/light/color-picker-add-hicontrast.png b/rtdata/images/themed/png/light/color-picker-add-hicontrast.png
new file mode 100644
index 000000000..53eaabf60
Binary files /dev/null and b/rtdata/images/themed/png/light/color-picker-add-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/color-picker-hicontrast.png b/rtdata/images/themed/png/light/color-picker-hicontrast.png
new file mode 100644
index 000000000..c2592a8b7
Binary files /dev/null and b/rtdata/images/themed/png/light/color-picker-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/crosshair.png b/rtdata/images/themed/png/light/crosshair-hicontrast.png
similarity index 100%
rename from rtdata/images/themed/png/light/crosshair.png
rename to rtdata/images/themed/png/light/crosshair-hicontrast.png
diff --git a/rtdata/images/themed/png/light/hand-closed.png b/rtdata/images/themed/png/light/hand-closed-hicontrast.png
similarity index 100%
rename from rtdata/images/themed/png/light/hand-closed.png
rename to rtdata/images/themed/png/light/hand-closed-hicontrast.png
diff --git a/rtdata/images/themed/png/light/node-move-x-hicontrast.png b/rtdata/images/themed/png/light/node-move-x-hicontrast.png
new file mode 100644
index 000000000..92a1c49e2
Binary files /dev/null and b/rtdata/images/themed/png/light/node-move-x-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/node-move-xy-hicontrast.png b/rtdata/images/themed/png/light/node-move-xy-hicontrast.png
new file mode 100644
index 000000000..3984385af
Binary files /dev/null and b/rtdata/images/themed/png/light/node-move-xy-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/node-move-y-hicontrast.png b/rtdata/images/themed/png/light/node-move-y-hicontrast.png
new file mode 100644
index 000000000..e2fc55da8
Binary files /dev/null and b/rtdata/images/themed/png/light/node-move-y-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png b/rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png
new file mode 100644
index 000000000..d8929ac42
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-aroundnode-hicontrast.png differ
diff --git a/rtdata/images/themed/png/light/rotate-aroundnode.png b/rtdata/images/themed/png/light/rotate-aroundnode.png
new file mode 100644
index 000000000..5da406b64
Binary files /dev/null and b/rtdata/images/themed/png/light/rotate-aroundnode.png differ
diff --git a/rtdata/images/themed/svg/color-picker-add-hicontrast.svg b/rtdata/images/themed/svg/color-picker-add-hicontrast.svg
new file mode 100644
index 000000000..3d51dd31f
--- /dev/null
+++ b/rtdata/images/themed/svg/color-picker-add-hicontrast.svg
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24px"
+   height="24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="color-picker-add-hicontrast.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false"
+     showguides="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="11"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       style="opacity:1;vector-effect:none;fill:#ffffff;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"
+       d="M 12.369141 7.6308594 L 12.355469 7.6445312 C 12.400621 7.7323546 12.447821 7.8202652 12.5 7.9042969 C 12.446294 7.8178115 12.415438 7.7214331 12.369141 7.6308594 z M 12.5 7.9042969 C 12.532594 7.9568256 12.569086 8.0059476 12.603516 8.0566406 C 10.543158 10.130725 8.464698 12.187696 6.40625 14.263672 C 5.98786 14.567629 5.8417996 15.084168 5.7285156 15.564453 C 5.6684986 16.024284 5.3749515 16.392738 5.0546875 16.708984 C 4.7498425 16.936274 4.8948611 17.415952 5.1894531 17.583984 C 5.4400251 17.794308 5.8183299 17.631953 5.9824219 17.382812 C 6.4514969 16.80595 7.2841769 16.874578 7.8886719 16.525391 C 10.141772 14.361831 12.326317 12.123666 14.542969 9.9179688 C 14.580345 9.9405797 14.61838 9.962954 14.65625 9.984375 C 13.990271 9.6109813 13.418603 9.0306231 12.917969 8.4765625 C 12.772802 8.3038722 12.62799 8.1104053 12.5 7.9042969 z M 14.65625 9.984375 C 14.722858 10.021716 14.790855 10.056934 14.859375 10.089844 C 14.918117 10.118074 14.976903 10.143271 15.037109 10.167969 C 14.906675 10.114483 14.779985 10.053749 14.65625 9.984375 z "
+       id="path821" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 18.579453,1.0075536 c -1.554926,0.1300032 -2.703169,1.3389592 -3.565119,2.5328961 -0.297193,0.4062347 -0.675928,0.7772333 -1.183927,0.8760479 -0.61792,0.3531279 -1.12911,0.8985135 -1.540188,1.4726505 -0.536147,0.8806044 0.04744,1.8961857 0.628105,2.5869467 0.801015,0.8864969 1.782652,1.8435682 3.044172,1.9053642 0.871909,-0.02755 1.474522,-0.7945343 2.042174,-1.3694171 C 18.237168,8.4860765 18.437016,7.9019922 18.962802,7.5967834 20.028203,6.6710757 21.239314,5.6878307 21.513988,4.2203147 21.830732,3.0197716 21.174098,1.640498 19.986166,1.2166988 19.541587,1.0325979 19.056998,0.98699335 18.579453,1.0075383 Z"
+       id="path9921-9-3-9-8"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-opacity:0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 12.145865,7.1196973 c -1.194372,1.241453 -2.4427668,2.4398764 -3.639359,3.6767417 -1.112238,1.116963 -2.230995,2.228811 -3.297629,3.388107 -0.363075,0.661929 -0.411182,1.51837 -1.021454,2.02868 -0.501036,0.673434 -0.214249,1.687403 0.4382,2.149811 0.505753,0.420823 1.287153,0.349033 1.775935,-0.06432 0.447791,-0.317122 0.92539,-0.618196 1.471594,-0.712615 1.125789,-0.457134 1.8045802,-1.525557 2.682222,-2.300859 1.655822,-1.65475 3.311861,-3.309332 4.968127,-4.963643 -0.0069,-0.0016 -0.01416,-0.0022 -0.02105,-0.0038 -0.07457,-0.01684 -0.1481,-0.03635 -0.220599,-0.05908 -0.0725,-0.02257 -0.144121,-0.04821 -0.214594,-0.07629 -0.07048,-0.02793 -0.140103,-0.05904 -0.208625,-0.09197 -0.06852,-0.03291 -0.136047,-0.0681 -0.202655,-0.1054414 -0.03787,-0.021421 -0.0748,-0.044691 -0.112176,-0.067302 -2.216652,2.2056974 -4.40272,4.4444564 -6.65582,6.6080164 -0.604495,0.349187 -1.43697,0.280818 -1.906045,0.857681 -0.164092,0.24914 -0.541307,0.409995 -0.791879,0.199671 -0.294592,-0.168032 -0.440931,-0.647591 -0.136086,-0.874881 0.320264,-0.316246 0.613715,-0.684242 0.673732,-1.144073 0.113284,-0.480285 0.26058,-0.997148 0.67897,-1.301105 2.058448,-2.075976 4.136343,-4.133082 6.196701,-6.2071661 -0.03443,-0.050693 -0.07135,-0.099282 -0.103944,-0.1518107 -0.064,-0.1030692 -0.123346,-0.2090839 -0.176488,-0.3178151 -0.0264,-0.054366 -0.05177,-0.1090756 -0.07476,-0.1645125 -0.02296,-0.055437 -0.04389,-0.111945 -0.06282,-0.1682617 -0.01492,-0.044381 -0.02755,-0.089028 -0.03964,-0.1338291 z"
+       id="path17041"
+       inkscape:connector-curvature="0" />
+    <path
+       id="_133551936-9-3-8-2"
+       class="fil20"
+       d="m 4.129308,18.153873 c -0.737551,0.717709 -1.510683,1.491258 -1.762349,2.522384 -0.255568,1.046027 0.128166,2.208702 1.423913,2.287084 1.25536,0.07602 1.933258,-0.920964 1.714158,-2.012045 -0.152691,-0.768768 -1.017544,-2.003859 -1.375722,-2.79744 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-opacity:0;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       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"
+       d="m 16.5,12.5 v 4 h -4 v 1.999999 h 4 v 4 h 1.999999 v -4 h 4 V 16.5 h -4 v -4 z"
+       id="rect2927"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccccs"
+       id="path6419-3-9-4-4"
+       d="m 14.298531,5.7373975 c -0.902534,0.8846139 -0.0133,-0.011442 -0.656369,0.6418409 -0.390601,0.4526304 -0.216395,0.5661627 -0.07453,0.9008311 0.519621,0.8896906 1.088659,1.4152881 1.781426,1.722639 0.24404,0.071758 0.40344,0.1624361 0.672113,-0.052948 C 16.347151,8.7210477 16.848569,8.316384 16.887622,8.0644527 16.820521,6.6960088 14.77021,5.27508 14.298521,5.7373981 Z"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#f9fbff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       d="m 4.0400197,19.132932 c -0.4258004,0.43408 -0.8721422,0.901932 -1.0174332,1.525571 -0.1475436,0.632651 0.073992,1.335852 0.8220485,1.383259 0.7247401,0.04598 1.1161018,-0.557012 0.9896118,-1.216912 -0.088151,-0.464961 -0.587445,-1.21196 -0.7942271,-1.691929 z"
+       class="fil20"
+       id="path829" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/color-picker-hicontrast.svg b/rtdata/images/themed/svg/color-picker-hicontrast.svg
new file mode 100644
index 000000000..867f9730b
--- /dev/null
+++ b/rtdata/images/themed/svg/color-picker-hicontrast.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24px"
+   height="24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="color-picker-hicontrast.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false"
+     showguides="true"
+     inkscape:snap-global="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="11"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       style="opacity:1;vector-effect:none;fill:#ffffff;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"
+       d="M 12.369141 7.6308594 L 12.355469 7.6445312 C 12.400621 7.7323546 12.447821 7.8202652 12.5 7.9042969 C 12.446294 7.8178115 12.415438 7.7214331 12.369141 7.6308594 z M 12.5 7.9042969 C 12.532594 7.9568256 12.569086 8.0059476 12.603516 8.0566406 C 10.543158 10.130725 8.464698 12.187696 6.40625 14.263672 C 5.98786 14.567629 5.8417996 15.084168 5.7285156 15.564453 C 5.6684986 16.024284 5.3749515 16.392738 5.0546875 16.708984 C 4.7498425 16.936274 4.8948611 17.415952 5.1894531 17.583984 C 5.4400251 17.794308 5.8183299 17.631953 5.9824219 17.382812 C 6.4514969 16.80595 7.2841769 16.874578 7.8886719 16.525391 C 10.141772 14.361831 12.326317 12.123666 14.542969 9.9179688 C 14.580345 9.9405797 14.61838 9.962954 14.65625 9.984375 C 13.990271 9.6109813 13.418603 9.0306231 12.917969 8.4765625 C 12.772802 8.3038722 12.62799 8.1104053 12.5 7.9042969 z M 14.65625 9.984375 C 14.722858 10.021716 14.790855 10.056934 14.859375 10.089844 C 14.918117 10.118074 14.976903 10.143271 15.037109 10.167969 C 14.906675 10.114483 14.779985 10.053749 14.65625 9.984375 z "
+       id="path821" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-opacity:0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 18.579453,1.0075536 c -1.554926,0.1300032 -2.703169,1.3389592 -3.565119,2.5328961 -0.297193,0.4062347 -0.675928,0.7772333 -1.183927,0.8760479 -0.61792,0.3531279 -1.12911,0.8985135 -1.540188,1.4726505 -0.536147,0.8806044 0.04744,1.8961857 0.628105,2.5869467 0.801015,0.8864969 1.782652,1.8435682 3.044172,1.9053642 0.871909,-0.02755 1.474522,-0.7945343 2.042174,-1.3694171 C 18.237168,8.4860765 18.437016,7.9019922 18.962802,7.5967834 20.028203,6.6710757 21.239314,5.6878307 21.513988,4.2203147 21.830732,3.0197716 21.174098,1.640498 19.986166,1.2166988 19.541587,1.0325979 19.056998,0.98699335 18.579453,1.0075383 Z"
+       id="path9921-9-3-9-8"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-opacity:0;stroke-miterlimit:4;stroke-dasharray:none"
+       d="m 12.145865,7.1196973 c -1.194372,1.241453 -2.4427668,2.4398764 -3.639359,3.6767417 -1.112238,1.116963 -2.230995,2.228811 -3.297629,3.388107 -0.363075,0.661929 -0.411182,1.51837 -1.021454,2.02868 -0.501036,0.673434 -0.214249,1.687403 0.4382,2.149811 0.505753,0.420823 1.287153,0.349033 1.775935,-0.06432 0.447791,-0.317122 0.92539,-0.618196 1.471594,-0.712615 1.125789,-0.457134 1.8045802,-1.525557 2.682222,-2.300859 1.655822,-1.65475 3.311861,-3.309332 4.968127,-4.963643 -0.0069,-0.0016 -0.01416,-0.0022 -0.02105,-0.0038 -0.07457,-0.01684 -0.1481,-0.03635 -0.220599,-0.05908 -0.0725,-0.02257 -0.144121,-0.04821 -0.214594,-0.07629 -0.07048,-0.02793 -0.140103,-0.05904 -0.208625,-0.09197 -0.06852,-0.03291 -0.136047,-0.0681 -0.202655,-0.1054414 -0.03787,-0.021421 -0.0748,-0.044691 -0.112176,-0.067302 -2.216652,2.2056974 -4.40272,4.4444564 -6.65582,6.6080164 -0.604495,0.349187 -1.43697,0.280818 -1.906045,0.857681 -0.164092,0.24914 -0.541307,0.409995 -0.791879,0.199671 -0.294592,-0.168032 -0.440931,-0.647591 -0.136086,-0.874881 0.320264,-0.316246 0.613715,-0.684242 0.673732,-1.144073 0.113284,-0.480285 0.26058,-0.997148 0.67897,-1.301105 2.058448,-2.075976 4.136343,-4.133082 6.196701,-6.2071661 -0.03443,-0.050693 -0.07135,-0.099282 -0.103944,-0.1518107 -0.064,-0.1030692 -0.123346,-0.2090839 -0.176488,-0.3178151 -0.0264,-0.054366 -0.05177,-0.1090756 -0.07476,-0.1645125 -0.02296,-0.055437 -0.04389,-0.111945 -0.06282,-0.1682617 -0.01492,-0.044381 -0.02755,-0.089028 -0.03964,-0.1338291 z"
+       id="path17041"
+       inkscape:connector-curvature="0" />
+    <path
+       id="_133551936-9-3-8-2"
+       class="fil20"
+       d="m 4.129308,18.153873 c -0.737551,0.717709 -1.510683,1.491258 -1.762349,2.522384 -0.255568,1.046027 0.128166,2.208702 1.423913,2.287084 1.25536,0.07602 1.933258,-0.920964 1.714158,-2.012045 -0.152691,-0.768768 -1.017544,-2.003859 -1.375722,-2.79744 z"
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-opacity:0;stroke-miterlimit:4;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccccccs"
+       id="path6419-3-9-4-4"
+       d="m 14.298531,5.7373975 c -0.902534,0.8846139 -0.0133,-0.011442 -0.656369,0.6418409 -0.390601,0.4526304 -0.216395,0.5661627 -0.07453,0.9008311 0.519621,0.8896906 1.088659,1.4152881 1.781426,1.722639 0.24404,0.071758 0.40344,0.1624361 0.672113,-0.052948 C 16.347151,8.7210477 16.848569,8.316384 16.887622,8.0644527 16.820521,6.6960088 14.77021,5.27508 14.298521,5.7373981 Z"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:0;stroke-dasharray:none"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:1;fill:#f9fbff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0"
+       d="m 4.0400197,19.132932 c -0.4258004,0.43408 -0.8721422,0.901932 -1.0174332,1.525571 -0.1475436,0.632651 0.073992,1.335852 0.8220485,1.383259 0.7247401,0.04598 1.1161018,-0.557012 0.9896118,-1.216912 -0.088151,-0.464961 -0.587445,-1.21196 -0.7942271,-1.691929 z"
+       class="fil20"
+       id="path829" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/crosshair.svg b/rtdata/images/themed/svg/crosshair-hicontrast.svg
similarity index 100%
rename from rtdata/images/themed/svg/crosshair.svg
rename to rtdata/images/themed/svg/crosshair-hicontrast.svg
diff --git a/rtdata/images/themed/svg/hand-closed.svg b/rtdata/images/themed/svg/hand-closed-hicontrast.svg
similarity index 100%
rename from rtdata/images/themed/svg/hand-closed.svg
rename to rtdata/images/themed/svg/hand-closed-hicontrast.svg
diff --git a/rtdata/images/themed/svg/node-move-x-hicontrast.svg b/rtdata/images/themed/svg/node-move-x-hicontrast.svg
new file mode 100644
index 000000000..6e6079901
--- /dev/null
+++ b/rtdata/images/themed/svg/node-move-x-hicontrast.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24px"
+   height="24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="node-move-x-hicontrast.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-bbox-edge-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="11"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 17.494308,15.514232 22.17236,12.005696 17.494308,8.4971547 Z"
+       id="path2866-6"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path840"
+       d="M 6.505693,15.514232 1.827641,12.005696 6.505693,8.4971548 Z"
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="path1820"
+       cx="12"
+       cy="12"
+       r="2" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/node-move-xy-hicontrast.svg b/rtdata/images/themed/svg/node-move-xy-hicontrast.svg
new file mode 100644
index 000000000..9c3915804
--- /dev/null
+++ b/rtdata/images/themed/svg/node-move-xy-hicontrast.svg
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24px"
+   height="24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="node-move-xy-hicontrast.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-bbox-edge-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="11"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.508539,6.5113851 12.000003,1.8333333 8.4914617,6.511385 Z"
+       id="path2866-6"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path840"
+       d="M 15.508539,17.5 12.000003,22.178052 8.4914618,17.5 Z"
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <path
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 17.494308,15.514232 22.17236,12.005696 17.494308,8.4971544 Z"
+       id="path2866-6-7"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path840-5"
+       d="M 6.505693,15.514232 1.827641,12.005696 6.505693,8.4971545 Z"
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="path1820"
+       cx="12"
+       cy="12"
+       r="2" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/node-move-y-hicontrast.svg b/rtdata/images/themed/svg/node-move-y-hicontrast.svg
new file mode 100644
index 000000000..fe7b285e7
--- /dev/null
+++ b/rtdata/images/themed/svg/node-move-y-hicontrast.svg
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24px"
+   height="24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="node-move-y-hicontrast.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.25"
+     inkscape:cx="12"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-bbox-edge-midpoints="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="11"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 15.508539,6.5113851 12.000003,1.8333333 8.4914617,6.511385 Z"
+       id="path2866-6"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path840"
+       d="M 15.508539,17.5 12.000003,22.178052 8.4914618,17.5 Z"
+       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="path1820"
+       cx="12"
+       cy="12"
+       r="2" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/rotate-aroundnode-hicontrast.svg b/rtdata/images/themed/svg/rotate-aroundnode-hicontrast.svg
new file mode 100644
index 000000000..fda645c55
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-aroundnode-hicontrast.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24px"
+   height="24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="rotate-aroundnode-hicontrast.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="22.102715"
+     inkscape:cy="31.162988"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="11"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <circle
+       style="opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal"
+       id="path1820"
+       cx="12"
+       cy="12"
+       r="2" />
+    <path
+       style="opacity:0.9;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.566406 2.3359375 C 10.819703 2.3432825 10.072565 2.4400037 9.3457031 2.6347656 C 4.2949366 3.9881143 1.2755574 9.2187648 2.6289062 14.269531 C 2.9649255 15.523572 3.6875584 16.81275 4.4941406 17.830078 L 2.71875 19.617188 L 10.447266 21.664062 L 8.3554688 13.947266 L 6.5800781 15.734375 C 6.0281832 15.03828 5.7572614 14.352206 5.5273438 13.494141 C 4.5936235 10.00945 6.6383552 6.4669233 10.123047 5.5332031 C 12.114565 4.9995774 14.099173 5.3436706 15.712891 6.6269531 L 13.966797 8.3847656 L 21.695312 10.431641 L 19.603516 2.7148438 L 17.820312 4.5078125 C 16.053394 3.1027013 13.806516 2.3139026 11.566406 2.3359375 z "
+       id="path1597" />
+  </g>
+</svg>
diff --git a/rtdata/images/themed/svg/rotate-aroundnode.svg b/rtdata/images/themed/svg/rotate-aroundnode.svg
new file mode 100644
index 000000000..67ac406fa
--- /dev/null
+++ b/rtdata/images/themed/svg/rotate-aroundnode.svg
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="24px"
+   height="24px"
+   viewBox="0 0 24 24"
+   version="1.1"
+   id="SVGRoot"
+   inkscape:export-filename="/tmp/template.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11"
+   sodipodi:docname="rotate-aroundnode.svg">
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#E0E1E2"
+     bordercolor="#666768"
+     borderopacity="1.0"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="33.75"
+     inkscape:cx="7.6740741"
+     inkscape:cy="12"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1019"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:grid-bbox="true"
+     inkscape:pagecheckerboard="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:snap-intersection-paths="false"
+     inkscape:object-paths="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-nodes="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid1374"
+       originx="1"
+       originy="1"
+       empspacing="11"
+       dotted="false" />
+  </sodipodi:namedview>
+  <defs
+     id="defs815" />
+  <metadata
+     id="metadata818">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Maciej Dworak</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title />
+          </cc:Agent>
+        </dc:rights>
+        <dc:description>RawTherapee icon.</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <g
+       id="g1836"
+       transform="rotate(-15,11.187498,12.645885)">
+      <path
+         sodipodi:nodetypes="cccc"
+         style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1"
+         d="m 21.88633,5.2315666 -6.912134,4.0181032 6.935146,3.9777132 z"
+         id="path1597"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ssccssccs"
+         inkscape:connector-curvature="0"
+         id="path1818"
+         d="m 12,2.5 c -5.2289382,0 -9.5,4.2710618 -9.5,9.5 0,1.298279 0.3655524,2.729874 0.8813472,3.921296 l 2.555622,-1.485613 C 5.5840422,13.620466 5.5,12.888334 5.5,12 5.5,8.3923822 8.3923822,5.5 12,5.5 c 2.061772,1e-7 3.89068,0.8466571 5.117274,2.5038738 L 19.700981,6.5019353 C 17.910258,4.0825417 15.010009,2.5000001 12,2.5 Z"
+         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:0.5;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;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" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path1824"
+         d="m 8.1147226,13.16973 -6.912135,4.018104 6.935147,3.977712 z"
+         style="opacity:0.9;fill:#2a7fff;fill-opacity:1;stroke:none;stroke-width:1"
+         sodipodi:nodetypes="cccc" />
+    </g>
+    <circle
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:normal"
+       id="path3756"
+       cx="12"
+       cy="12"
+       r="3" />
+  </g>
+</svg>
diff --git a/rtgui/cursormanager.cc b/rtgui/cursormanager.cc
index d1973dcca..6c280ee8c 100644
--- a/rtgui/cursormanager.cc
+++ b/rtgui/cursormanager.cc
@@ -51,15 +51,15 @@ 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 ("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");
+    Glib::RefPtr<Gdk::Pixbuf> hand = RTImage::createFromFile ("crosshair-hicontrast.png");
+    Glib::RefPtr<Gdk::Pixbuf> close_hand = RTImage::createFromFile ("hand-closed-hicontrast.png");
+    Glib::RefPtr<Gdk::Pixbuf> wbpick = RTImage::createFromFile ("color-picker-hicontrast.png");
+    Glib::RefPtr<Gdk::Pixbuf> cpick = RTImage::createFromFile ("color-picker-add-hicontrast.png");
     Glib::RefPtr<Gdk::Pixbuf> empty = RTImage::createFromFile ("empty.png");
-    Glib::RefPtr<Gdk::Pixbuf> move2D = RTImage::createFromFile ("node-move-xy.png");
-    Glib::RefPtr<Gdk::Pixbuf> move1DH = RTImage::createFromFile ("node-move-x.png");
-    Glib::RefPtr<Gdk::Pixbuf> move1DV = RTImage::createFromFile ("node-move-y.png");
-    Glib::RefPtr<Gdk::Pixbuf> moveRotate = RTImage::createFromFile ("move-rotate.png");
+    Glib::RefPtr<Gdk::Pixbuf> move2D = RTImage::createFromFile ("node-move-xy-hicontrast.png");
+    Glib::RefPtr<Gdk::Pixbuf> move1DH = RTImage::createFromFile ("node-move-x-hicontrast.png");
+    Glib::RefPtr<Gdk::Pixbuf> move1DV = RTImage::createFromFile ("node-move-y-hicontrast.png");
+    Glib::RefPtr<Gdk::Pixbuf> moveRotate = RTImage::createFromFile ("rotate-aroundnode-hicontrast.png");
 
     cHand = hand ? Gdk::Cursor::create (cAdd->get_display(), hand, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::HAND2);
     cClosedHand = close_hand ? Gdk::Cursor::create (cAdd->get_display(), close_hand, 12, 12) : Gdk::Cursor::create (cAdd->get_display(), Gdk::HAND2);