diff --git a/rtdata/images/themed/png/dark/contrastmask-full-off.png b/rtdata/images/themed/png/dark/contrastmask-full-off.png
deleted file mode 100644
index 5be95b8b1..000000000
Binary files a/rtdata/images/themed/png/dark/contrastmask-full-off.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/contrastmask-full-on.png b/rtdata/images/themed/png/dark/contrastmask-full-on.png
deleted file mode 100644
index 685e6ee9e..000000000
Binary files a/rtdata/images/themed/png/dark/contrastmask-full-on.png and /dev/null differ
diff --git a/rtdata/images/themed/png/dark/contrastmask-off.png b/rtdata/images/themed/png/dark/contrastmask-off.png
index 89baeaba6..8d7f5f417 100644
Binary files a/rtdata/images/themed/png/dark/contrastmask-off.png and b/rtdata/images/themed/png/dark/contrastmask-off.png differ
diff --git a/rtdata/images/themed/png/dark/contrastmask-on.png b/rtdata/images/themed/png/dark/contrastmask-on.png
index 3eeaa6590..dce3ce99e 100644
Binary files a/rtdata/images/themed/png/dark/contrastmask-on.png and b/rtdata/images/themed/png/dark/contrastmask-on.png differ
diff --git a/rtdata/images/themed/png/light/contrastmask-full-off.png b/rtdata/images/themed/png/light/contrastmask-full-off.png
deleted file mode 100644
index 5f2d769f9..000000000
Binary files a/rtdata/images/themed/png/light/contrastmask-full-off.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/contrastmask-full-on.png b/rtdata/images/themed/png/light/contrastmask-full-on.png
deleted file mode 100644
index 9b6b45b02..000000000
Binary files a/rtdata/images/themed/png/light/contrastmask-full-on.png and /dev/null differ
diff --git a/rtdata/images/themed/png/light/contrastmask-off.png b/rtdata/images/themed/png/light/contrastmask-off.png
index 89baeaba6..b3df60148 100644
Binary files a/rtdata/images/themed/png/light/contrastmask-off.png and b/rtdata/images/themed/png/light/contrastmask-off.png differ
diff --git a/rtdata/images/themed/png/light/contrastmask-on.png b/rtdata/images/themed/png/light/contrastmask-on.png
index 135c9f8bc..064ed7e9b 100644
Binary files a/rtdata/images/themed/png/light/contrastmask-on.png and b/rtdata/images/themed/png/light/contrastmask-on.png differ
diff --git a/rtdata/images/themed/svg/contrastmask-full-off.svg b/rtdata/images/themed/svg/contrastmask-full-off.svg
deleted file mode 100644
index 7e380f8c5..000000000
--- a/rtdata/images/themed/svg/contrastmask-full-off.svg
+++ /dev/null
@@ -1,155 +0,0 @@
-<?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="contrastmask-full-off.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="34.25"
-     inkscape:cx="7.6502533"
-     inkscape:cy="12.184881"
-     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-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">
-    <path
-       sodipodi:nodetypes="cccccccscccccccccc"
-       inkscape:connector-curvature="0"
-       id="path2172"
-       d="M 11.565386,12.845447 C 11.046791,11.871863 10.964998,10.506631 9.962724,9.8878773 8.9691347,9.392113 8.0238733,10.450905 7.2304174,10.924575 7.1448103,10.514262 7.4129042,10.069471 7.3918432,9.7331342 7.2478354,7.4197209 5.2949265,9.9547399 5.3176431,10.729894 4.6527218,10.283166 5.1001555,8.5893543 5.4127669,7.7276949 5.0009138,7.006614 4.8018317,5.5688227 4.8750724,5.1099624 5.2547347,5.9591824 5.5138761,5.8297042 5.6523013,4.9572684 5.9054238,3.3619451 7.2602164,1.95791 8.8816333,1.60994 8.4067872,2.0696386 7.3017419,3.6758159 8.0638563,3.9491179 8.4263443,3.4871206 10.467532,2.2188619 9.4334907,3.4873747 8.972673,3.9498063 8.7762244,5.6493277 9.6840698,4.6279284 10.010496,4.2313562 11.040542,3.5780175 10.39453,4.4545388 10.073814,5.020704 10.191817,6.8931669 10.939933,6.5442357 11.260435,6.059979 11.852643,4.442341 11.876578,5.8433476 c 0.183051,1.1204807 -0.160414,2.2282995 0.05449,3.3447551 -0.0054,1.1947723 -0.152273,2.3855773 -0.233458,3.5778923 0.05824,0.169048 -0.07877,0.175313 -0.132225,0.07945 z"
-       style="opacity:0.3;fill:#252525;fill-opacity:1;stroke:none;stroke-width:0.09060963" />
-    <path
-       sodipodi:nodetypes="cccccccccsccccccscccc"
-       inkscape:connector-curvature="0"
-       id="path2142"
-       d="m 12.421191,12.882414 c -0.04831,-1.559973 -0.384828,-3.119848 -0.145368,-4.6765432 -0.0099,-0.9966384 -0.302452,-2.0809762 0.174863,-3.0183179 0.234663,0.6863363 0.941374,1.9773874 1.361542,0.7994035 0.150774,-0.7513135 -1.028486,-2.4179082 0.273639,-1.6722991 0.43259,0.3250802 0.797808,0.7025347 0.84025,-0.066447 0.03361,-0.453757 -1.192591,-1.4130608 -0.875455,-1.6648438 0.683689,0.1236335 1.586686,1.2049673 1.939116,1.0631887 0.08596,-0.8561267 -1.106655,-1.7611386 -1.192483,-2.1127443 1.706111,0.4284615 2.908897,2.0815637 3.076674,3.758264 0.135404,1.3531799 0.547788,-0.072451 0.82199,-0.059918 0.153278,0.8837486 -0.401849,1.8415068 -0.07062,2.6642842 0.59924,0.84392 0.66137,2.0449216 0.257564,2.9818209 C 18.462722,9.6618873 18.24796,9.5226275 17.796205,9.0173674 17.150262,8.5518822 16.628242,8.9649324 16.711164,9.7026408 c 0.280458,0.6075682 0.194357,0.9042142 0.152505,1.2353662 -0.14508,-0.08176 -0.390426,-0.387077 -0.63491,-0.580854 -0.68022,-0.5391399 -2.009945,-0.9552827 -2.616961,-0.01732 -0.481142,0.808817 -0.655618,1.78993 -1.144181,2.572574 l -0.04642,-0.02997 z"
-       style="opacity:0.3;fill:#252525;fill-opacity:1;stroke:none;stroke-width:0.09060963" />
-    <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
-       id="path2078"
-       d="M 12.00081,4.9590739 C 11.426933,3.7832754 11.10367,2.4737306 10.35697,1.3837706 11.579911,0.58635957 13.421797,1.1374832 13.881501,1.3188037 13.108741,2.4790111 12.479062,4.1033689 12.00081,4.9590739 Z"
-       style="opacity:0.3;fill:#252525;fill-opacity:1;stroke:none;stroke-width:0.09060963" />
-    <path
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.0239738px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.7"
-       d="m 7.4608299,5.9399004 c 0,0 1.1986899,1.5411725 2.9796001,1.9864007 1.780911,0.4452276 -2.6028691,-0.034249 -2.6028691,-0.034249 0,0 -0.5822207,-0.8219588 -0.376731,-1.9521517 z"
-       id="path2274"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path2276"
-       d="m 16.623808,5.9399004 c 0,0 -1.19869,1.5411725 -2.979602,1.9864007 -1.780911,0.4452276 2.602871,-0.034249 2.602871,-0.034249 0,0 0.582221,-0.8219588 0.376731,-1.9521517 z"
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.0239738px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.7" />
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#2a7fff;stroke-width:0.09060963;fill-opacity:1;opacity:0.7"
-       d="m 11.121094,14.503906 c -0.831,0 -1.5000002,0.669 -1.5000002,1.5 v 0.708985 c -0.00299,-0.0022 -0.00484,-0.0056 -0.00781,-0.0078 0.057134,0.211816 0.1046909,0.396512 0.1796876,0.666016 0.3160296,1.135668 0.6384366,2.516513 0.8535156,3.767578 0.04214,0.76397 0.423697,1.609487 1.210938,1.84375 0.25138,0.01626 0.523658,0.046 0.763672,-0.04492 0.846439,-0.381926 0.903968,-1.408432 1.050781,-2.207031 0.246807,-0.883184 0.314922,-1.786956 0.453125,-2.689453 0.223863,-1.021175 0.259674,-1.248889 0.287109,-1.47461 l -0.0039,-0.5625 c -0.0048,-0.830986 -0.669,-1.5 -1.5,-1.5 z"
-       id="path2084" />
-    <path
-       style="opacity:0.3;fill:#252525;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
-       d="M 10.5,14 C 9.669,14 9,14.669 9,15.5 c 0,0.501292 0.2454935,0.940797 0.6210938,1.212891 v -0.708985 c 0,-0.831 0.6690002,-1.5 1.5000002,-1.5 h 1.787109 c 0.831,0 1.495169,0.669014 1.5,1.5 l 0.0039,0.671875 C 14.769949,16.402126 15,15.987284 15,15.5 15,14.669 14.331,14 13.5,14 Z"
-       id="rect938"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscsssscsss" />
-    <path
-       style="opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
-       d="m 14.169922,15.185547 c -0.05571,-0.08444 -0.130088,-0.172896 -0.201172,-0.244141 -0.270521,-0.271126 -0.645047,-0.4375 -1.060547,-0.4375 h -1.787109 c -0.4155,0 -0.791375,0.166375 -1.0625,0.4375 -0.071291,0.07129 -0.1493038,0.159639 -0.2050788,0.244141 C 10.524025,15.367557 11.305233,15.496602 12,15.5 c 0.703924,-10e-4 1.490573,-0.130074 2.169922,-0.314453 z"
-       id="path960"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsscccc" />
-    <path
-       sodipodi:nodetypes="ccsscccc"
-       inkscape:connector-curvature="0"
-       id="path28"
-       d="m 14.169922,15.185547 c -0.05571,-0.08444 -0.130088,-0.172896 -0.201172,-0.244141 -0.270521,-0.271126 -0.645047,-0.4375 -1.060547,-0.4375 h -1.787109 c -0.4155,0 -0.791375,0.166375 -1.0625,0.4375 -0.071291,0.07129 -0.1493038,0.159639 -0.2050788,0.244141 C 10.524025,15.367557 11.305233,15.496602 12,15.5 c 0.703924,-10e-4 1.490573,-0.130074 2.169922,-0.314453 z"
-       style="opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
-  </g>
-</svg>
diff --git a/rtdata/images/themed/svg/contrastmask-full-on.svg b/rtdata/images/themed/svg/contrastmask-full-on.svg
deleted file mode 100644
index b423235c8..000000000
--- a/rtdata/images/themed/svg/contrastmask-full-on.svg
+++ /dev/null
@@ -1,155 +0,0 @@
-<?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="contrastmask-full-on.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#E0E1E2"
-     bordercolor="#666768"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="34.25"
-     inkscape:cx="7.7372263"
-     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="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-nodes="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: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="fill:#cb6472;stroke-width:0.09060963;opacity:0.7"
-       d="M 11.121094 14.503906 C 10.290094 14.503906 9.6210938 15.172906 9.6210938 16.003906 L 9.6210938 16.712891 C 9.6181067 16.710727 9.6162518 16.707263 9.6132812 16.705078 C 9.6704152 16.916894 9.7179721 17.10159 9.7929688 17.371094 C 10.108998 18.506762 10.431405 19.887607 10.646484 21.138672 C 10.688622 21.902642 11.070181 22.748159 11.857422 22.982422 C 12.108802 22.998682 12.38108 23.02842 12.621094 22.9375 C 13.467533 22.555574 13.525062 21.529068 13.671875 20.730469 C 13.918682 19.847285 13.986797 18.943513 14.125 18.041016 C 14.348863 17.019841 14.384674 16.792127 14.412109 16.566406 L 14.408203 16.003906 C 14.403372 15.17292 13.739203 14.503906 12.908203 14.503906 L 11.121094 14.503906 z "
-       id="path2084" />
-    <path
-       sodipodi:nodetypes="cccccccscccccccccc"
-       inkscape:connector-curvature="0"
-       id="path2172"
-       d="M 11.565386,12.845447 C 11.046791,11.871863 10.964998,10.506631 9.962724,9.8878773 8.9691347,9.392113 8.0238733,10.450905 7.2304174,10.924575 7.1448103,10.514262 7.4129042,10.069471 7.3918432,9.7331342 7.2478354,7.4197209 5.2949265,9.9547399 5.3176431,10.729894 4.6527218,10.283166 5.1001555,8.5893543 5.4127669,7.7276949 5.0009138,7.006614 4.8018317,5.5688227 4.8750724,5.1099624 5.2547347,5.9591824 5.5138761,5.8297042 5.6523013,4.9572684 5.9054238,3.3619451 7.2602164,1.95791 8.8816333,1.60994 8.4067872,2.0696386 7.3017419,3.6758159 8.0638563,3.9491179 8.4263443,3.4871206 10.467532,2.2188619 9.4334907,3.4873747 8.972673,3.9498063 8.7762244,5.6493277 9.6840698,4.6279284 10.010496,4.2313562 11.040542,3.5780175 10.39453,4.4545388 10.073814,5.020704 10.191817,6.8931669 10.939933,6.5442357 11.260435,6.059979 11.852643,4.442341 11.876578,5.8433476 c 0.183051,1.1204807 -0.160414,2.2282995 0.05449,3.3447551 -0.0054,1.1947723 -0.152273,2.3855773 -0.233458,3.5778923 0.05824,0.169048 -0.07877,0.175313 -0.132225,0.07945 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke-width:0.09060963" />
-    <path
-       sodipodi:nodetypes="cccccccccsccccccscccc"
-       inkscape:connector-curvature="0"
-       id="path2142"
-       d="m 12.421191,12.882414 c -0.04831,-1.559973 -0.384828,-3.119848 -0.145368,-4.6765432 -0.0099,-0.9966384 -0.302452,-2.0809762 0.174863,-3.0183179 0.234663,0.6863363 0.941374,1.9773874 1.361542,0.7994035 0.150774,-0.7513135 -1.028486,-2.4179082 0.273639,-1.6722991 0.43259,0.3250802 0.797808,0.7025347 0.84025,-0.066447 0.03361,-0.453757 -1.192591,-1.4130608 -0.875455,-1.6648438 0.683689,0.1236335 1.586686,1.2049673 1.939116,1.0631887 0.08596,-0.8561267 -1.106655,-1.7611386 -1.192483,-2.1127443 1.706111,0.4284615 2.908897,2.0815637 3.076674,3.758264 0.135404,1.3531799 0.547788,-0.072451 0.82199,-0.059918 0.153278,0.8837486 -0.401849,1.8415068 -0.07062,2.6642842 0.59924,0.84392 0.66137,2.0449216 0.257564,2.9818209 C 18.462722,9.6618873 18.24796,9.5226275 17.796205,9.0173674 17.150262,8.5518822 16.628242,8.9649324 16.711164,9.7026408 c 0.280458,0.6075682 0.194357,0.9042142 0.152505,1.2353662 -0.14508,-0.08176 -0.390426,-0.387077 -0.63491,-0.580854 -0.68022,-0.5391399 -2.009945,-0.9552827 -2.616961,-0.01732 -0.481142,0.808817 -0.655618,1.78993 -1.144181,2.572574 l -0.04642,-0.02997 z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke-width:0.09060963" />
-    <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
-       id="path2078"
-       d="M 12.00081,4.9590739 C 11.426933,3.7832754 11.10367,2.4737306 10.35697,1.3837706 11.579911,0.58635957 13.421797,1.1374832 13.881501,1.3188037 13.108741,2.4790111 12.479062,4.1033689 12.00081,4.9590739 Z"
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke-width:0.09060963" />
-    <path
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.0239738px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.7"
-       d="m 7.4608299,5.9399004 c 0,0 1.1986899,1.5411725 2.9796001,1.9864007 1.780911,0.4452276 -2.6028691,-0.034249 -2.6028691,-0.034249 0,0 -0.5822207,-0.8219588 -0.376731,-1.9521517 z"
-       id="path2274"
-       inkscape:connector-curvature="0" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path2276"
-       d="m 16.623808,5.9399004 c 0,0 -1.19869,1.5411725 -2.979602,1.9864007 -1.780911,0.4452276 2.602871,-0.034249 2.602871,-0.034249 0,0 0.582221,-0.8219588 0.376731,-1.9521517 z"
-       style="fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:0.0239738px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.7" />
-    <path
-       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
-       d="M 10.5,14 C 9.669,14 9,14.669 9,15.5 c 0,0.501292 0.2454935,0.940797 0.6210938,1.212891 v -0.708985 c 0,-0.831 0.6690002,-1.5 1.5000002,-1.5 h 1.787109 c 0.831,0 1.495169,0.669014 1.5,1.5 l 0.0039,0.671875 C 14.769949,16.402126 15,15.987284 15,15.5 15,14.669 14.331,14 13.5,14 Z"
-       id="rect938"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscsssscsss" />
-    <path
-       style="opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
-       d="m 14.169922,15.185547 c -0.05571,-0.08444 -0.130088,-0.172896 -0.201172,-0.244141 -0.270521,-0.271126 -0.645047,-0.4375 -1.060547,-0.4375 h -1.787109 c -0.4155,0 -0.791375,0.166375 -1.0625,0.4375 -0.071291,0.07129 -0.1493038,0.159639 -0.2050788,0.244141 C 10.524025,15.367557 11.305233,15.496602 12,15.5 c 0.703924,-10e-4 1.490573,-0.130074 2.169922,-0.314453 z"
-       id="path960"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsscccc" />
-    <path
-       sodipodi:nodetypes="ccsscccc"
-       inkscape:connector-curvature="0"
-       id="path28"
-       d="m 14.169922,15.185547 c -0.05571,-0.08444 -0.130088,-0.172896 -0.201172,-0.244141 -0.270521,-0.271126 -0.645047,-0.4375 -1.060547,-0.4375 h -1.787109 c -0.4155,0 -0.791375,0.166375 -1.0625,0.4375 -0.071291,0.07129 -0.1493038,0.159639 -0.2050788,0.244141 C 10.524025,15.367557 11.305233,15.496602 12,15.5 c 0.703924,-10e-4 1.490573,-0.130074 2.169922,-0.314453 z"
-       style="opacity:0.7;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
-  </g>
-</svg>
diff --git a/rtdata/images/themed/svg/contrastmask-off.svg b/rtdata/images/themed/svg/contrastmask-off.svg
index 5ae21b2b2..ed76efbbb 100644
--- a/rtdata/images/themed/svg/contrastmask-off.svg
+++ b/rtdata/images/themed/svg/contrastmask-off.svg
@@ -26,7 +26,7 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="34.25"
+     inkscape:zoom="33.75"
      inkscape:cx="12"
      inkscape:cy="12"
      inkscape:document-units="px"
@@ -42,11 +42,11 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true"
      inkscape:snap-others="false"
-     inkscape:object-nodes="true"
+     inkscape:object-nodes="false"
      inkscape:snap-grids="true"
      inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-global="true">
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="true">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -102,32 +102,54 @@
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
     <path
-       sodipodi:nodetypes="cccccccscccccccccc"
-       inkscape:connector-curvature="0"
-       id="path2172"
-       d="M 11.33041,21.100868 C 10.531438,19.600917 10.405423,17.497575 8.8612715,16.544293 7.3304996,15.780494 5.8741841,17.411721 4.6517474,18.141479 4.519857,17.509331 4.9328954,16.824065 4.9004478,16.305888 4.6785824,12.741731 1.6698363,16.647304 1.7048346,17.841544 0.68042456,17.153294 1.3697626,14.543725 1.8513869,13.216211 1.216866,12.105279 0.91015051,9.8901477 1.0229887,9.1832053 1.6079148,10.491555 2.0071606,10.292074 2.2204252,8.9479575 2.610398,6.4901251 4.6976572,4.3270005 7.1956907,3.790901 6.4641198,4.499135 4.7616334,6.9736897 5.9357838,7.394752 6.4942504,6.6829765 9.6390032,4.7290357 8.045909,6.683368 7.3359509,7.3958126 7.0332927,10.014178 8.4319633,8.4405603 8.9348713,7.829582 10.52181,6.8230167 9.5265328,8.1734279 9.0324221,9.0456895 9.2142233,11.930497 10.366807,11.392916 c 0.493781,-0.746069 1.406165,-3.2382806 1.443041,-1.079822 0.282017,1.726267 -0.247142,3.433026 0.08395,5.153092 -0.0083,1.840724 -0.234599,3.675336 -0.359677,5.512274 0.08973,0.260444 -0.121357,0.270096 -0.203712,0.122405 z"
-       style="opacity:0.3;fill:#252525;fill-opacity:1;stroke-width:0.13959759" />
+       sodipodi:type="star"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="path851"
+       sodipodi:sides="3"
+       sodipodi:cx="-28"
+       sodipodi:cy="15"
+       sodipodi:r1="12"
+       sodipodi:r2="6"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:arg2="-0.52359878"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m -28,3 10.392305,18 -20.78461,0 z"
+       inkscape:transform-center-y="-3" />
+    <circle
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="path1662"
+       cx="-28"
+       cy="15"
+       r="3.5" />
     <path
-       sodipodi:nodetypes="cccccccccsccccccscccc"
-       inkscape:connector-curvature="0"
-       id="path2142"
-       d="m 12.648905,21.157821 c -0.07443,-2.40337 -0.592885,-4.806589 -0.223961,-7.204909 -0.01525,-1.53547 -0.465972,-3.206053 0.269402,-4.650167 0.361534,1.057403 1.450327,3.046459 2.097658,1.2316 0.23229,-1.1575102 -1.584535,-3.7251468 0.421582,-2.5764253 0.666469,0.5008343 1.229141,1.082359 1.294529,-0.1023715 0.05178,-0.69908 -1.837363,-2.17703 -1.348768,-2.5649391 1.053324,0.1904758 2.444525,1.8564311 2.987496,1.6380001 0.132434,-1.3189903 -1.704966,-2.7132955 -1.837197,-3.2549963 2.628517,0.6601085 4.481588,3.206958 4.740073,5.7901638 0.20861,2.0847743 0.843949,-0.1116216 1.266398,-0.092313 0.236147,1.3615463 -0.619108,2.8371153 -0.108801,4.1047263 0.923218,1.300184 1.018939,3.150505 0.396816,4.593937 -0.647351,-1.874005 -0.978224,-2.088556 -1.67422,-2.866984 -0.995171,-0.717149 -1.79942,-0.08078 -1.671667,1.055765 0.432088,0.936049 0.299436,1.393077 0.234957,1.903265 -0.223517,-0.125963 -0.601509,-0.596349 -0.978173,-0.894891 -1.04798,-0.830625 -3.096619,-1.471755 -4.031817,-0.02668 -0.741271,1.246102 -1.010077,2.757653 -1.762781,3.963432 l -0.07152,-0.04617 z"
-       style="opacity:0.3;fill:#252525;fill-opacity:1;stroke-width:0.13959759" />
-    <path
-       sodipodi:nodetypes="cccc"
-       inkscape:connector-curvature="0"
-       id="path2078"
-       d="M 12.001246,8.9507392 C 11.117103,7.139247 10.619068,5.1216987 9.468666,3.4424535 11.352788,2.2139234 14.190487,3.0630112 14.898729,3.3423623 13.708178,5.1298341 12.738064,7.6323985 12.001246,8.9507392 Z"
-       style="opacity:0.3;fill:#252525;fill-opacity:1;stroke-width:0.13959759" />
-    <path
-       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0369352px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 5.0067321,10.461848 c 0,0 1.8467598,2.374405 4.5905164,3.060345 2.7437575,0.68594 -4.0101064,-0.05276 -4.0101064,-0.05276 0,0 -0.8969974,-1.26635 -0.58041,-3.00758 z"
-       id="path2274"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       d="m -28,18 a 2.9999988,2.9999988 0 0 0 3,-3 2.9999988,2.9999988 0 0 0 -3,-3 z"
+       id="path1669"
        inkscape:connector-curvature="0" />
+    <circle
+       r="9"
+       cy="12.000001"
+       cx="12"
+       id="circle1690"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
     <path
-       inkscape:connector-curvature="0"
-       id="path2276"
-       d="m 19.123661,10.461848 c 0,0 -1.84676,2.374405 -4.59052,3.060345 -2.743758,0.68594 4.01011,-0.05276 4.01011,-0.05276 0,0 0.896997,-1.26635 0.58041,-3.00758 z"
-       style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0369352px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+       inkscape:transform-center-y="-1.5243173"
+       d="M 55,2.9998999 65.392305,20.9999 l -20.78461,0 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="true"
+       sodipodi:arg2="-0.52359878"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:r2="6"
+       sodipodi:r1="12"
+       sodipodi:cy="14.9999"
+       sodipodi:cx="55"
+       sodipodi:sides="3"
+       id="path1702"
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:3.91079855;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       sodipodi:type="star"
+       transform="matrix(0.5147247,0,0,0.50810573,-16.312048,4.4711921)" />
   </g>
 </svg>
diff --git a/rtdata/images/themed/svg/contrastmask-on.svg b/rtdata/images/themed/svg/contrastmask-on.svg
index d57f46c8d..9e3504128 100644
--- a/rtdata/images/themed/svg/contrastmask-on.svg
+++ b/rtdata/images/themed/svg/contrastmask-on.svg
@@ -18,7 +18,7 @@
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96"
    inkscape:version="0.92.2 2405546, 2018-03-11"
-   sodipodi:docname="contrastmask2-on.svg">
+   sodipodi:docname="contrastmask-on.svg">
   <sodipodi:namedview
      id="base"
      pagecolor="#E0E1E2"
@@ -26,12 +26,12 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="23.923779"
-     inkscape:cx="8.9515513"
-     inkscape:cy="12.731794"
+     inkscape:zoom="11.313708"
+     inkscape:cx="-0.36719427"
+     inkscape:cy="0.21859217"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
-     showgrid="true"
+     showgrid="false"
      inkscape:window-width="1920"
      inkscape:window-height="1019"
      inkscape:window-x="0"
@@ -42,11 +42,11 @@
      inkscape:snap-bbox="true"
      inkscape:bbox-nodes="true"
      inkscape:snap-others="false"
-     inkscape:object-nodes="true"
+     inkscape:object-nodes="false"
      inkscape:snap-grids="true"
-     inkscape:snap-bbox-midpoints="false"
-     inkscape:snap-nodes="false"
-     inkscape:snap-global="true">
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:bbox-paths="false"
+     inkscape:snap-bbox-edge-midpoints="true">
     <inkscape:grid
        type="xygrid"
        id="grid1374"
@@ -101,37 +101,55 @@
      id="layer1"
      inkscape:groupmode="layer"
      inkscape:label="Layer 1">
-    <g
-       id="g30"
-       transform="matrix(1.5406485,0,0,1.5406485,-6.4877843,1.3105494)">
-      <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke-width:0.09060963"
-         d="M 11.565386,12.845447 C 11.046791,11.871863 10.964998,10.506631 9.962724,9.8878773 8.9691347,9.392113 8.0238733,10.450905 7.2304174,10.924575 7.1448103,10.514262 7.4129042,10.069471 7.3918432,9.7331342 7.2478354,7.4197209 5.2949265,9.9547399 5.3176431,10.729894 4.6527218,10.283166 5.1001555,8.5893543 5.4127669,7.7276949 5.0009138,7.006614 4.8018317,5.5688227 4.8750724,5.1099624 5.2547347,5.9591824 5.5138761,5.8297042 5.6523013,4.9572684 5.9054238,3.3619451 7.2602164,1.95791 8.8816333,1.60994 8.4067872,2.0696386 7.3017419,3.6758159 8.0638563,3.9491179 8.4263443,3.4871206 10.467532,2.2188619 9.4334907,3.4873747 8.972673,3.9498063 8.7762244,5.6493277 9.6840698,4.6279284 10.010496,4.2313562 11.040542,3.5780175 10.39453,4.4545388 10.073814,5.020704 10.191817,6.8931669 10.939933,6.5442357 11.260435,6.059979 11.852643,4.442341 11.876578,5.8433476 c 0.183051,1.1204807 -0.160414,2.2282995 0.05449,3.3447551 -0.0054,1.1947723 -0.152273,2.3855773 -0.233458,3.5778923 0.05824,0.169048 -0.07877,0.175313 -0.132225,0.07945 z"
-         id="path2172"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccscccccccccc" />
-      <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke-width:0.09060963"
-         d="m 12.421191,12.882414 c -0.04831,-1.559973 -0.384828,-3.119848 -0.145368,-4.6765432 -0.0099,-0.9966384 -0.302452,-2.0809762 0.174863,-3.0183179 0.234663,0.6863363 0.941374,1.9773874 1.361542,0.7994035 0.150774,-0.7513135 -1.028486,-2.4179082 0.273639,-1.6722991 0.43259,0.3250802 0.797808,0.7025347 0.84025,-0.066447 0.03361,-0.453757 -1.192591,-1.4130608 -0.875455,-1.6648438 0.683689,0.1236335 1.586686,1.2049673 1.939116,1.0631887 0.08596,-0.8561267 -1.106655,-1.7611386 -1.192483,-2.1127443 1.706111,0.4284615 2.908897,2.0815637 3.076674,3.758264 0.135404,1.3531799 0.547788,-0.072451 0.82199,-0.059918 0.153278,0.8837486 -0.401849,1.8415068 -0.07062,2.6642842 0.59924,0.84392 0.66137,2.0449216 0.257564,2.9818209 C 18.462722,9.6618873 18.24796,9.5226275 17.796205,9.0173674 17.150262,8.5518822 16.628242,8.9649324 16.711164,9.7026408 c 0.280458,0.6075682 0.194357,0.9042142 0.152505,1.2353662 -0.14508,-0.08176 -0.390426,-0.387077 -0.63491,-0.580854 -0.68022,-0.5391399 -2.009945,-0.9552827 -2.616961,-0.01732 -0.481142,0.808817 -0.655618,1.78993 -1.144181,2.572574 l -0.04642,-0.02997 z"
-         id="path2142"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccccccccsccccccscccc" />
-      <path
-         style="opacity:0.7;fill:#2a7fff;fill-opacity:1;stroke-width:0.09060963"
-         d="M 12.00081,4.9590739 C 11.426933,3.7832754 11.10367,2.4737306 10.35697,1.3837706 11.579911,0.58635957 13.421797,1.1374832 13.881501,1.3188037 13.108741,2.4790111 12.479062,4.1033689 12.00081,4.9590739 Z"
-         id="path2078"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="cccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path2274"
-         d="m 7.4608299,5.9399004 c 0,0 1.1986899,1.5411725 2.9796001,1.9864007 1.780911,0.4452276 -2.6028691,-0.034249 -2.6028691,-0.034249 0,0 -0.5822207,-0.8219588 -0.376731,-1.9521517 z"
-         style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0239738px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         style="opacity:0.7;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.0239738px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 16.623808,5.9399004 c 0,0 -1.19869,1.5411725 -2.979602,1.9864007 -1.780911,0.4452276 2.602871,-0.034249 2.602871,-0.034249 0,0 0.582221,-0.8219588 0.376731,-1.9521517 z"
-         id="path2276"
-         inkscape:connector-curvature="0" />
-    </g>
+    <path
+       sodipodi:type="star"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="path851"
+       sodipodi:sides="3"
+       sodipodi:cx="-28"
+       sodipodi:cy="15"
+       sodipodi:r1="12"
+       sodipodi:r2="6"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:arg2="-0.52359878"
+       inkscape:flatsided="true"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="m -28,3 10.392305,18 -20.78461,0 z"
+       inkscape:transform-center-y="-3" />
+    <circle
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       id="path1662"
+       cx="-28"
+       cy="15"
+       r="3.5" />
+    <path
+       style="opacity:0.7;fill:#2a7fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       d="m -28,18 a 2.9999988,2.9999988 0 0 0 3,-3 2.9999988,2.9999988 0 0 0 -3,-3 z"
+       id="path1669"
+       inkscape:connector-curvature="0" />
+    <circle
+       r="9"
+       cy="12.000001"
+       cx="12"
+       id="circle1690"
+       style="opacity:0.7;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#2a7fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal" />
+    <path
+       inkscape:transform-center-y="-1.5243173"
+       d="M 55,2.9998999 65.392305,20.9999 l -20.78461,0 z"
+       inkscape:randomized="0"
+       inkscape:rounded="0"
+       inkscape:flatsided="true"
+       sodipodi:arg2="-0.52359878"
+       sodipodi:arg1="-1.5707963"
+       sodipodi:r2="6"
+       sodipodi:r1="12"
+       sodipodi:cy="14.9999"
+       sodipodi:cx="55"
+       sodipodi:sides="3"
+       id="path1702"
+       style="opacity:0.7;fill:#ffcc00;fill-opacity:1;fill-rule:nonzero;stroke:#ffcc00;stroke-width:3.91079855;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:2.00314951;stroke-opacity:1;paint-order:normal"
+       sodipodi:type="star"
+       transform="matrix(0.5147247,0,0,0.50810573,-16.312048,4.4711921)" />
   </g>
 </svg>
diff --git a/rtgui/indclippedpanel.cc b/rtgui/indclippedpanel.cc
index 233562ecf..aff5035fe 100644
--- a/rtgui/indclippedpanel.cc
+++ b/rtgui/indclippedpanel.cc
@@ -28,8 +28,8 @@ IndicateClippedPanel::IndicateClippedPanel (ImageArea* ia) : imageArea(ia)
     iFoff = new RTImage ("focusscreen-off.png");
 
     // for previewSharpMask, needs to be replaced with different icons
-    iSon  = new RTImage ("previewmodeF-focusScreen-on.png");
-    iSoff = new RTImage ("previewmodeF-focusScreen-off.png");
+    iSon  = new RTImage ("contrastmask-on.png");
+    iSoff = new RTImage ("contrastmask-off.png");
 
     previewFocusMask = Gtk::manage (new Gtk::ToggleButton ());
     previewFocusMask->set_relief(Gtk::RELIEF_NONE);